From fe8babaef77f0bc1469ebc149b55fed361682239 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Wed, 22 Jan 2025 17:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=A1=A8=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouPlaninfofileController.java | 18 +++++++++++------- .../service/IHuzhouPlaninfofileService.java | 6 +++++- .../impl/HuzhouContractinfoServiceImpl.java | 2 +- .../impl/HuzhouPlaninfofileServiceImpl.java | 10 ++++++++-- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java index cb31e69..6152905 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java +++ b/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 contractList = mapper.readValue(contractinfoList, new TypeReference>(){}); + planinfofileService.submitPlanUploadFile(files, planinfoid, approvalMoneyFieldsValue, contractMoneyFieldsValue,contractList); + return Result.ok(); } @PostMapping("/planREUploadFile") public Result planREUploadFile(@RequestParam(value = "file") diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java index 2b48d2c..1b04bfb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java +++ b/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 Page 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 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; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 4a85696..5606d29 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -94,7 +94,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl 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); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 7db264a..c0ad4ef 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/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 contractList) throws IOException { //立项审批和合同签订 金额输入 HuzhouProjectinfoMoney huzhouProjectinfoMoney = new HuzhouProjectinfoMoney(); if(approvalMoneyFieldsValue!=null){ @@ -113,7 +114,6 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl