异常修复

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;
 }

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){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -356,7 +356,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         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());
             }

src/main/resources/mapper/vtb/VtbVerReportMapper.xml

@@ -309,8 +309,8 @@
             and c.act_end_date &gt;= #{query.queryStartActivityEndTime} </if>
         <if test="query.queryEndActivityEndTime != null ">
             and c.act_end_date &lt;= #{query.queryEndActivityEndTime} </if>
-        <if test="query.activityCode != null and query.activityCode != ''"> and `tbs_activity`.`activity_code` like concat('%',#{query.activityCode},'%')</if>
+        <if test="query.activityCode != null and query.activityCode != ''"> and c.`activity_code` like concat('%',#{query.activityCode},'%')</if>
-        <if test="query.activityTitle != null and query.activityTitle != ''"> and `tbs_activity`.`act_title` like concat('%',#{query.activityTitle},'%')</if>
+        <if test="query.activityTitle != null and query.activityTitle != ''"> and c.`act_title` like concat('%',#{query.activityTitle},'%')</if>
         <if test="query.supplierCode != null and query.supplierCode != ''"> and `tbs_cost_apply`.`supplier_code` like concat('%',#{query.supplierCode},'%') </if>
         <if test="query.supplierName != null and query.supplierName != ''"> and `tbs_cost_apply`.`supplier_name` like concat('%',#{query.supplierName},'%') </if>
         <if test="query.costApplyCode != null and query.costApplyCode != ''"> and `tbs_cost_apply`.`code` like concat('%',#{query.costApplyCode},'%') </if>