1.生成文书异步执行保存下载接口

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectDocumentManagerImpl.java

@@ -42,6 +42,7 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.tools.ant.util.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -393,14 +394,28 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
 
                 arrayList.add(costProjectDocumentFile);
             });
+            asyncMethod(projectDocument.getId());
             costProjectDocumentFileManager.saveBatch(arrayList);
         }
 
         //保存解析出的文件内容
         costProjectDocumentFileManager.saveBatch(req.getCostProjectDocumentFiles());
+
+        asyncMethod(costProjectDocument.getId());
+
         return costProjectDocument.getId();
     }
 
+    @Async  // 标记为异步方法
+    public void asyncMethod(String id) {
+        try {
+            this.createDocument(id);
+        } catch (Exception  e) {
+            e.printStackTrace();
+        }
+
+    }
+
     public synchronized String getWH(CostDocumentWh costDocumentWh){
         if("incremental".equals(costDocumentWh.getGenerateType())){
             costDocumentWh.setCurrentValue(costDocumentWh.getCurrentValue()+1);
@@ -624,7 +639,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                 throw new RuntimeException("处理Word文档时出错", e);
             }
             costProjectDocument.setActUrl(EipConfig.getImgUrl() + FileUploadUtil.getPathFileName(outputPath, fileName));
+            this.updateById(costProjectDocument);
         }
+
         return costProjectDocument.getActUrl() ;
     }
 

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

@@ -235,11 +235,12 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
      */
     @GetMapping(value = "/listFixedEnabled")
     @ApiOperation(value = "获取所有模板类型为固定表的所有启用成本调查表数据", httpMethod = "GET", notes = "获取所有模板类型为固定表的所有启用成本调查表数据")
-    public CommonResult<List<CostSurveyTemplate>> listFixedEnabled() throws Exception {
+    public CommonResult<List<CostSurveyTemplate>> listFixedEnabled(
+            @ApiParam(name = "catalogId", value = "模板ID", required = false) @RequestParam (value="catalogId") String catalogId) throws Exception {
         CostSurveyTemplate queryCondition = new CostSurveyTemplate();
         queryCondition.setStatus("0"); // 启用状态
         queryCondition.setTemplateType("2"); // 模板类型为固定表
-
+        queryCondition.setCatalogId(catalogId);
         List<CostSurveyTemplate> templates = costSurveyTemplateDao.selectByCondition(queryCondition);
         return CommonResult.<List<CostSurveyTemplate>>ok().value(templates);
     }

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

@@ -5,9 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.controller.BaseController;
+import com.hotent.base.exception.BaseException;
 import com.hotent.base.model.CommonResult;
 import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
+import com.hotent.baseInfo.manager.CostCatalogManager;
+import com.hotent.baseInfo.manager.CostDistrictManager;
+import com.hotent.baseInfo.model.CostCatalog;
+import com.hotent.baseInfo.model.CostDistrict;
 import com.hotent.common.CrudService;
 import com.hotent.resp.PageResp;
 import com.hotent.surveyinfo.dao.*;
@@ -57,6 +62,9 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 
 	@Autowired
 	CostVerifyTemplateDao costSurveyTemplateDao;
+
+	@Autowired
+	private CostCatalogManager costCatalogManager;
 	@Autowired
 	CostVerifyTemplateItemsDao costVerifyTemplateItemsDao;
 	@Autowired
@@ -121,8 +129,11 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 			 String taskId,@ApiParam(name="taskId", value="任务id", required = false)
 			@RequestParam String catalogId) throws Exception {
 
-
-        //根据模板ID获取核定模板数据
+		CostCatalog costCatalog = costCatalogManager.getById(catalogId);
+		if (costCatalog==null) {
+			throw new BaseException("根据监审id未查询到实体信息");
+		}
+		//根据模板ID获取核定模板数据
 		CostVerifyTemplate template = costSurveyTemplateDao.selectById(templateId);
 		String tid = UUID.randomUUID().toString();
 		template.setIsDelete("0");
@@ -135,6 +146,8 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 		template.setCatalogId(catalogId);
 		template.setCreatemode("2");
 		template.setCreatetemplateid(templateId);
+		template.setAreaCode(costCatalog.getCode());
+
 		//新增修改后的模板数据
 		costSurveyTemplateDao.insert(template);
 		List<CostVerifyTemplateItems> itemsList = costVerifyTemplateItemsDao.selectByVerifyTemplateId(templateId,taskId);

assistMg/src/main/resources/mapper/CostProjectDocumentMapper.xml

@@ -27,11 +27,12 @@
         <result column="update_time" property="updateTime"/>
         <result column="update_by" property="updateBy"/>
         <result column="order_num" property="orderNum"/>
+        <result column="act_url" property="actUrl"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id
+        id,act_url
         , project_id, document_id,document_name,document_type,document_type_name,document_alias,document_number,document_wh_id, enterprise_id, generate_time, electronic_document_url, scan_document_url, feedback_document_url, is_pushed, push_time, feedback_time, is_deleted, create_time, create_by, update_time, update_by, order_num
     </sql>