1.成本核定表BUG优化

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateController.java

@@ -4,8 +4,11 @@ package com.hotent.surveyinfo.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
+import com.hotent.base.exception.BaseException;
 import com.hotent.base.query.PageList;
 import com.hotent.base.util.PinyinUtil;
+import com.hotent.baseInfo.manager.CostCatalogManager;
+import com.hotent.baseInfo.model.CostCatalog;
 import com.hotent.common.CrudService;
 import com.hotent.resp.PageResp;
 import com.hotent.surveyinfo.dao.CostSurveyTemplateDao;
@@ -56,6 +59,9 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
     CostSurveyTemplateManager constbaseService;
 
     @Autowired
+    private CostCatalogManager costCatalogManager;
+
+    @Autowired
     CostSurveyTemplateDao costSurveyTemplateDao;
 
     @Autowired
@@ -268,6 +274,12 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
                             .eq("task_id", taskId)
             );
         }
+
+        CostCatalog costCatalog = costCatalogManager.getById(catalogId);
+        if (costCatalog==null) {
+            throw new BaseException("根据监审id未查询到实体信息");
+        }
+
         CostSurveyTemplate queryCondition = new CostSurveyTemplate();
         queryCondition.setSurveyTemplateId(templateId);
         queryCondition.setStatus("0"); // 启用状态
@@ -300,7 +312,7 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
             costVerifyTemplate.setType(sourceTemplate.getType());
             costVerifyTemplate.setIsDelete("0");
             costVerifyTemplate.setTaskId(taskId);
-
+            costVerifyTemplate.setAreaCode(costCatalog.getCode());
             //			costVerifyTemplate.setCatalogId(sourceTemplate.getCatalogId());
 
             // 设置与源模板的关联关系

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostVerifyTemplateManagerImpl.java

@@ -171,6 +171,8 @@ public class CostVerifyTemplateManagerImpl extends BaseManagerImpl<CostVerifyTem
 		param.setProvinceCode(user.getProvinceCode());
 		param.setCityCode(user.getCityCode());
 		param.setCountyCode(user.getCountyCode());
+
+
 		Page<CostVerifyTemplate> objectPage = new Page<>(param.getPage(),param.getPageSize());
 		//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
 		Page<CostVerifyTemplate> page =baseMapper.getConstVerifyPage(objectPage,param.getContentType()