From d8ff8d5c1a734886cd9908d0d40c6e5d9ff8c6af Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Mon, 13 May 2024 13:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E9=87=91=E6=89=BF?=
 =?UTF-8?q?=E8=8B=A5=E5=87=BD=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/controller/HuzhouProjectController.java        | 4 ++--
 .../modules/huzhou/service/IHuzhouProjectinfoService.java | 2 +-
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java | 8 ++++++--
 .../easy/admin/modules/huzhou/vo/ProjectApproveOV.java    | 3 +--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
index 2416d96..168c124 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
@@ -65,8 +65,8 @@ public class HuzhouProjectController {
      * @return 返回值
      */
     @PostMapping("/approveProjectInfo")
-    public Result<?> approveProjectInfo(@RequestBody ProjectApproveOV projectApproveOV){
-        projectinfoService.approveProjectInfo(projectApproveOV);
+    public Result<?> approveProjectInfo(@RequestParam(value = "file",required = false) MultipartFile[] multipartFile,ProjectApproveOV projectApproveOV) throws IOException {
+        projectinfoService.approveProjectInfo(projectApproveOV,multipartFile);
         return Result.ok("审批成功");
     }
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
index d23ee5c..5e3c035 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
@@ -87,7 +87,7 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo> {
      *
      * @param projectApproveOV 项目入库信息
      */
-    void approveProjectInfo(ProjectApproveOV projectApproveOV);
+    void approveProjectInfo(ProjectApproveOV projectApproveOV,MultipartFile[] multipartFile) throws IOException;
 
     /**
      * 修改项目联系人
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 6edb8db..fdaa484 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -285,9 +285,10 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         }
     }
     @Override
-    public void approveProjectInfo(ProjectApproveOV projectApproveOV) {
+    public void approveProjectInfo(ProjectApproveOV projectApproveOV,MultipartFile[] multipartFile) throws IOException {
         String taskId = projectApproveOV.getTaskId();
-        HuzhouProjectinfo projectinfo = projectApproveOV.getProjectInfo();
+        HuzhouProjectinfo projectinfo = new HuzhouProjectinfo();
+        BeanUtils.copyProperties(projectApproveOV,projectinfo);
         String comment = projectApproveOV.getComment();
         String projectid = projectApproveOV.getProjectid();
         String flag = projectApproveOV.getFlag();
@@ -315,6 +316,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                 //保存新的人员和项目对应信息
                 userprojectService.saveFromProject(projectinfo,"0");
             }
+            if(multipartFile!=null){
+                uploadfileinfoService.modifyUploadFile(multipartFile,projectid,"5");
+            }
         }
         WorkFlow workFlow = workflowService.approveProjectInfo(taskId, flag, comment);
         //暂时没有作废的说法
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectApproveOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectApproveOV.java
index caf0e3e..e647bbf 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectApproveOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectApproveOV.java
@@ -7,12 +7,11 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Data
-public class ProjectApproveOV {
+public class ProjectApproveOV extends HuzhouProjectinfo{
     private String taskId;
     private String flag;
     private String comment;
     private String projectid;
     private String stage;
     private String isEdit;
-    private HuzhouProjectinfo projectInfo;
 }