修复资金承若函无法修改的问题

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("审批成功");
     }
 

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;
 
     /**
      * 修改项目联系人

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);
         //暂时没有作废的说法

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;
 }