diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateSo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateSo.java index b33d0d09..2b6dabdb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateSo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateSo.java @@ -34,6 +34,8 @@ public class TbsActivityTemplateSo implements Serializable { /** 模板状态 */ private Integer templateState; + private Integer contractFlag; + /** 备注 */ private String remark; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java index 27e7af06..43b5d467 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java @@ -113,7 +113,7 @@ public class TbsBudgetMatchApplication { //跳过预算指定的模板 TbsActivity activity = activityMap.get(centerGoods.getActivityId()); - String templateId = activity.getTenantId(); + String templateId = activity.getTemplateId()==null?null:activity.getTemplateId().toString(); TbsBudget budget = allBudgetMap.get(itemBudget.getBudgetId()); if (budget.getTemplateFlag().equals(1)) { if(templateId==null||budget.getTemplateIds()==null||budget.getTemplateIds().length<1){ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 35d61418..8f032d9f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -356,7 +356,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl TbsBudget budget = new TbsBudget(); budget.setId(tempBo.getId()); budget.setTemplateIds(new String[]{}); - if(budget.getTemplateFlag()!=null&&budget.getTemplateFlag().equals(1)){ + if(tempBo.getTemplateFlag()!=null&&tempBo.getTemplateFlag().equals(1)){ if(tempBo.getTemplateIds()!=null&&tempBo.getTemplateIds().length>0){ budget.setTemplateIds(tempBo.getTemplateIds()); } diff --git a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml index e3cbc3a0..4019fb8d 100644 --- a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml @@ -309,8 +309,8 @@ and c.act_end_date >= #{query.queryStartActivityEndTime} and c.act_end_date <= #{query.queryEndActivityEndTime} - and `tbs_activity`.`activity_code` like concat('%',#{query.activityCode},'%') - and `tbs_activity`.`act_title` like concat('%',#{query.activityTitle},'%') + and c.`activity_code` like concat('%',#{query.activityCode},'%') + and c.`act_title` like concat('%',#{query.activityTitle},'%') and `tbs_cost_apply`.`supplier_code` like concat('%',#{query.supplierCode},'%') and `tbs_cost_apply`.`supplier_name` like concat('%',#{query.supplierName},'%') and `tbs_cost_apply`.`code` like concat('%',#{query.costApplyCode},'%')