提交表单中增加合同信息校验逻辑

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java

@@ -10,6 +10,8 @@ import com.easy.admin.modules.huzhou.dao.HuzhouContractinfoMapper;
 import com.easy.admin.sys.model.SysDict;
 import com.easy.admin.sys.service.SysDictService;
 import com.easy.admin.util.ShiroUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -36,13 +38,15 @@ public class HuzhouPlaninfofileController {
     private IHuzhouPlaninfoService planinfoService;
 
     @PostMapping("/planUploadFile")
-    public Result<?> planUploadFile(@RequestParam(value = "file",required = false)
-                                    MultipartFile[] files, @RequestParam(value = "planinfoid") String planinfoid,
-                                    @RequestParam(value = "approvalMoneyFieldsValue" ,required = false) String approvalMoneyFieldsValue,
-                                     @RequestParam(value = "contractMoneyFieldsValue" ,required = false) String contractMoneyFieldsValue) throws IOException {
-
-        planinfofileService.submitPlanUploadFile(files,planinfoid,approvalMoneyFieldsValue,contractMoneyFieldsValue);
-        return  Result.ok();
+    public Result<?> planUploadFile(@RequestParam(value = "file", required = false)
+                                            MultipartFile[] files, @RequestParam(value = "planinfoid") String planinfoid,
+                                    @RequestParam(value = "approvalMoneyFieldsValue", required = false) String approvalMoneyFieldsValue,
+                                    @RequestParam(value = "contractMoneyFieldsValue", required = false) String contractMoneyFieldsValue,
+                                    @RequestParam(value = "contractMoneyFieldsValue", required = false) String contractinfoList) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        List<HuzhouContractinfo> contractList = mapper.readValue(contractinfoList, new TypeReference<List<HuzhouContractinfo>>(){});
+        planinfofileService.submitPlanUploadFile(files, planinfoid, approvalMoneyFieldsValue, contractMoneyFieldsValue,contractList);
+        return Result.ok();
     }
     @PostMapping("/planREUploadFile")
     public Result<?> planREUploadFile(@RequestParam(value = "file")

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java

@@ -2,6 +2,7 @@ package com.easy.admin.modules.huzhou.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.easy.admin.modules.huzhou.entity.HuzhouContractinfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfofile;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -13,7 +14,10 @@ public interface IHuzhouPlaninfofileService extends IService<HuzhouPlaninfofile>
     Page<HuzhouPlaninfofile> getplanFilePageList(HuzhouPlaninfofile planinfofile, Integer pageNo, Integer pageSize);
     void modifyStatusByPlaninfoid(String status,String planinfo);
 
-    void submitPlanUploadFile(MultipartFile[] files, String planinfoid,String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException;
+    void submitPlanUploadFile(MultipartFile[] files,
+                              String planinfoid, String approvalMoneyFieldsValue,
+                              String contractMoneyFieldsValue,
+                              List<HuzhouContractinfo> contractList) throws IOException;
 
     void approvePlanFile(MultipartFile[] files, String taskId, String flag, String planinfoid, String comment, String modifyNum,MultipartFile[] adviceFiles,String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException;
 

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java

@@ -94,7 +94,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
     @Override
     public void addContractinfo(MultipartFile[] file, List<HuzhouContractinfo> contractinfoList) throws IOException {
         String projectid = contractinfoList.get(0).getProjectId();
-        //uploadfileinfoService.saveFileAndFileInfo(file, projectid, "4");
+        uploadfileinfoService.saveFileAndFileInfo(file, projectid, "4");
         WorkFlow workFlow = workflowService.createFlow("createContract",projectid);
         String projectId = contractinfoList.get(0).getProjectId();
         HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java

@@ -1,5 +1,6 @@
 package com.easy.admin.modules.huzhou.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -99,7 +100,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
     }
 
     @Override
-    public void submitPlanUploadFile(MultipartFile[] files, String planinfoid,String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException {
+    public void submitPlanUploadFile(MultipartFile[] files, String planinfoid,String approvalMoneyFieldsValue,String contractMoneyFieldsValue,List<HuzhouContractinfo> contractList) throws IOException {
         //立项审批和合同签订 金额输入
         HuzhouProjectinfoMoney huzhouProjectinfoMoney = new HuzhouProjectinfoMoney();
         if(approvalMoneyFieldsValue!=null){
@@ -113,7 +114,6 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             if(data!=null){
                 projectinfoMoneyMapper.updateById(huzhouProjectinfoMoney);
             }else{
-                // TODO 1.校验修改 2.插入:huzhou_projectinfo_money表 3.插入:huzhou_contractinfo表
                 projectinfoMoneyMapper.insert(huzhouProjectinfoMoney);
             }
         }
@@ -341,6 +341,12 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         if(list.size()==0){
             projectinfoService.modifyStageById(pid,"6");
         }
+
+        // 1.校验修改  2插入:huzhou_contractinfo表
+        if (CollectionUtil.isEmpty(contractList)){
+            throw new EasyException("合同信息不能为空！");
+        }
+        contractinfoService.addContractinfo(files,contractList);
     }
 
     /**