Browse Source

上传附件代码优化

zjc 11 tháng trước cách đây
mục cha
commit
80a5800267

+ 25 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectApprovalController.java

@@ -9,6 +9,8 @@ import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sms.SmsSenderUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectPoolService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.tool.domain.TUnifyFile;
@@ -57,6 +59,9 @@ public class TProjectApprovalController extends BaseController
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
     /**
      * 查询立项申请列表
      */
@@ -104,18 +109,14 @@ public class TProjectApprovalController extends BaseController
     public AjaxResult add(@RequestBody TProjectApproval tProjectApproval)
     {
         tProjectApproval.setId(IdUtils.fastSimpleUUID());
+
         // todo 保存立项资料
-        List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectApproval.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectApproval.getId());
-                tUnifyFile.setUploadType(String.valueOf(FileType.APPROVAL.ordinal()));//文件类型:立项资料
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectApproval.getListFile(),
+                tProjectApproval.getProjectPoolId(),
+                tProjectApproval.getId(),
+                String.valueOf(FileType.APPROVAL.ordinal()),
+                getNickName());
+
         // todo 更改立项状态
         tProjectPoolService.updateTProjectPoolByApprovalFlag(tProjectApproval.getProjectPoolId(),"1");
 
@@ -132,6 +133,13 @@ public class TProjectApprovalController extends BaseController
             });
         }
 
+        // todo 增加项目创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectApproval.getProjectPoolId());
+        tProjectCirculation.setStageName("立项申请");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectApprovalService.insertTProjectApproval(tProjectApproval));
     }
 
@@ -145,19 +153,12 @@ public class TProjectApprovalController extends BaseController
     public AjaxResult edit(@RequestBody TProjectApproval tProjectApproval)
     {
         // todo 保存立项资料
-        List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectApproval.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectApproval.getId());
-                    tUnifyFile.setUploadType(String.valueOf(FileType.APPROVAL.ordinal()));//文件类型:立项资料
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectApproval.getListFile(),
+                tProjectApproval.getProjectPoolId(),
+                tProjectApproval.getId(),
+                String.valueOf(FileType.APPROVAL.ordinal()),
+                getNickName());
+
         return toAjax(tProjectApprovalService.updateTProjectApproval(tProjectApproval));
     }
 

+ 12 - 22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectChannelController.java

@@ -113,16 +113,12 @@ public class TProjectChannelController extends BaseController
         int number = tProjectChannelService.selectTProjectChannelCode(DateUtils.lastTwoDigits()+"");
         tProjectChannel.setChannelCode(tProjectChannel.getChannelGroup()+"-"+ DateUtils.lastTwoDigits() +"-"+ String.format("%03d",number+1));
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectChannel.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileBusinessId(tProjectChannel.getId());//渠道ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.CHANNEL.ordinal()));//文件类型:渠道
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectChannel.getListFile(),
+                null,
+                tProjectChannel.getId(),//渠道ID
+                String.valueOf(FileType.CHANNEL.ordinal()),//文件类型:渠道
+                getNickName());
+
         return toAjax(tProjectChannelService.insertTProjectChannel(tProjectChannel));
     }
 
@@ -136,18 +132,12 @@ public class TProjectChannelController extends BaseController
     public AjaxResult edit(@RequestBody TProjectChannel tProjectChannel)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectChannel.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileBusinessId(tProjectChannel.getId());//渠道ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.CHANNEL.ordinal()));//文件类型:渠道
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectChannel.getListFile(),
+                null,
+                tProjectChannel.getId(),//渠道ID
+                String.valueOf(FileType.CHANNEL.ordinal()),//文件类型:渠道
+                getNickName());
+
         return toAjax(tProjectChannelService.updateTProjectChannel(tProjectChannel));
     }
 

+ 11 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCompanyController.java

@@ -103,17 +103,12 @@ public class TProjectCompanyController extends BaseController
         tProjectCompany.setId(IdUtils.fastSimpleUUID());
         tProjectCompany.setCreateBy(getNickName());
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectCompany.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectCompany.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectCompany.getListFile(),
+                tProjectCompany.getProjectPoolId(),
+                tProjectCompany.getId(),//公司ID
+                String.valueOf(FileType.COMPANY.ordinal()),//文件类型:公司信息
+                getNickName());
+
         return toAjax(tProjectCompanyService.insertTProjectCompany(tProjectCompany));
     }
 
@@ -127,19 +122,11 @@ public class TProjectCompanyController extends BaseController
     public AjaxResult edit(@RequestBody TProjectCompany tProjectCompany)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectCompany.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectCompany.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectCompany.getListFile(),
+                tProjectCompany.getProjectPoolId(),
+                tProjectCompany.getId(),//公司ID
+                String.valueOf(FileType.COMPANY.ordinal()),//文件类型:公司信息
+                getNickName());
         return toAjax(tProjectCompanyService.updateTProjectCompany(tProjectCompany));
     }
 

+ 11 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContractController.java

@@ -118,17 +118,11 @@ public class TProjectContractController extends BaseController
         tProjectContract.setCreateBy(getNickName());
 
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectContract.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectContract.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectContract.getId());//合同ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.CONTRACT.ordinal()));//文件类型:合同
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectContract.getListFile(),
+                tProjectContract.getProjectPoolId(),
+                tProjectContract.getId(),//合同ID
+                String.valueOf(FileType.CONTRACT.ordinal()),//文件类型:合同
+                getNickName());
 
         // todo 增加合同创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
@@ -150,19 +144,12 @@ public class TProjectContractController extends BaseController
     public AjaxResult edit(@RequestBody TProjectContract tProjectContract)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectContract.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectContract.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectContract.getId());//合同ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.CONTRACT.ordinal()));//文件类型:合同
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectContract.getListFile(),
+                tProjectContract.getProjectPoolId(),
+                tProjectContract.getId(),//合同ID
+                String.valueOf(FileType.CONTRACT.ordinal()),//文件类型:合同
+                getNickName());
+
         return toAjax(tProjectContractService.updateTProjectContract(tProjectContract));
     }
 

+ 24 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectDecisionController.java

@@ -9,6 +9,8 @@ import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sms.SmsSenderUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectPoolService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.tool.domain.TUnifyFile;
@@ -57,6 +59,9 @@ public class TProjectDecisionController extends BaseController
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
     /**
      * 查询投决申请列表
      */
@@ -105,17 +110,12 @@ public class TProjectDecisionController extends BaseController
     {
         tProjectDecision.setId(IdUtils.fastSimpleUUID());
         // todo 保存投决资料
-        List<TUnifyFile> tUnifyFileList = tProjectDecision.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectDecision.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectDecision.getId());
-                tUnifyFile.setUploadType(String.valueOf(FileType.DECISION.ordinal()));//文件类型:投决资料
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectDecision.getListFile(),
+                tProjectDecision.getProjectPoolId(),
+                tProjectDecision.getId(),
+                String.valueOf(FileType.DECISION.ordinal()),
+                getNickName());
+
         // todo 更改投决状态
         tProjectPoolService.updateTProjectPoolByDecisionFlag(tProjectDecision.getProjectPoolId(),"1");
 
@@ -132,6 +132,13 @@ public class TProjectDecisionController extends BaseController
             });
         }
 
+        // todo 增加项目创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectDecision.getProjectPoolId());
+        tProjectCirculation.setStageName("投决申请");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectDecisionService.insertTProjectDecision(tProjectDecision));
     }
 
@@ -145,19 +152,12 @@ public class TProjectDecisionController extends BaseController
     public AjaxResult edit(@RequestBody TProjectDecision tProjectDecision)
     {
         // todo 保存投决资料
-        List<TUnifyFile> tUnifyFileList = tProjectDecision.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectDecision.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectDecision.getId());
-                    tUnifyFile.setUploadType(String.valueOf(FileType.DECISION.ordinal()));//文件类型:投决资料
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectDecision.getListFile(),
+                tProjectDecision.getProjectPoolId(),
+                tProjectDecision.getId(),
+                String.valueOf(FileType.DECISION.ordinal()),
+                getNickName());
+
         return toAjax(tProjectDecisionService.updateTProjectDecision(tProjectDecision));
     }
 

+ 11 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -117,17 +117,11 @@ public class TProjectInformationController extends BaseController
         tProjectInformation.setId(IdUtils.fastSimpleUUID());
         tProjectInformation.setCreateBy(getNickName());
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectInformation.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectInformation.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectInformation.getId());//公司ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.INFORMATION.ordinal()));//文件类型:公司信息
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectInformation.getListFile(),
+                tProjectInformation.getProjectPoolId(),
+                tProjectInformation.getId(),//文件资料ID
+                String.valueOf(FileType.INFORMATION.ordinal()),//文件类型:文件资料
+                getNickName());
 
         // todo 增加文件创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
@@ -149,19 +143,12 @@ public class TProjectInformationController extends BaseController
     public AjaxResult edit(@RequestBody TProjectInformation tProjectInformation)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectInformation.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectInformation.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectInformation.getId());//公司ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.INFORMATION.ordinal()));//文件类型:公司信息
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectInformation.getListFile(),
+                tProjectInformation.getProjectPoolId(),
+                tProjectInformation.getId(),//文件资料ID
+                String.valueOf(FileType.INFORMATION.ordinal()),//文件类型:文件资料
+                getNickName());
+
         return toAjax(tProjectInformationService.updateTProjectInformation(tProjectInformation));
     }
 

+ 11 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigateController.java

@@ -108,17 +108,11 @@ public class TProjectInvestigateController extends BaseController
     {
         tProjectInvestigate.setId(IdUtils.fastSimpleUUID());
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectInvestigate.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectInvestigate.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectInvestigate.getId());//尽调ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.INVESTIGATE.ordinal()));//文件类型:尽调
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectInvestigate.getListFile(),
+                tProjectInvestigate.getProjectPoolId(),
+                tProjectInvestigate.getId(),//尽调ID
+                String.valueOf(FileType.INVESTIGATE.ordinal()),//文件类型:尽调
+                getNickName());
 
         // todo 增加尽调创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
@@ -155,19 +149,12 @@ public class TProjectInvestigateController extends BaseController
     public AjaxResult edit(@RequestBody TProjectInvestigate tProjectInvestigate)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectInvestigate.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectInvestigate.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectInvestigate.getId());//尽调ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.INVESTIGATE.ordinal()));//文件类型:尽调
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectInvestigate.getListFile(),
+                tProjectInvestigate.getProjectPoolId(),
+                tProjectInvestigate.getId(),//尽调ID
+                String.valueOf(FileType.INVESTIGATE.ordinal()),//文件类型:尽调
+                getNickName());
+
         return toAjax(tProjectInvestigateService.updateTProjectInvestigate(tProjectInvestigate));
     }
 

+ 12 - 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigatePersonController.java

@@ -101,19 +101,12 @@ public class TProjectInvestigatePersonController extends BaseController
         tProjectInvestigatePerson.setInvestigatePersonId(getUserId().toString());
         tProjectInvestigatePerson.setDeptId(getDeptId());
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectInvestigatePerson.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectInvestigatePerson.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectInvestigatePerson.getId());//尽调ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.INVESTIGATE.ordinal()));//文件类型:尽调
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectInvestigatePerson.getListFile(),
+                tProjectInvestigatePerson.getProjectPoolId(),
+                tProjectInvestigatePerson.getId(),//尽调ID
+                String.valueOf(FileType.INVESTIGATE.ordinal()),//文件类型:尽调
+                getNickName());
+
         // todo 增加项目创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
         tProjectCirculation.setProjectPoolId(tProjectInvestigatePerson.getProjectPoolId());
@@ -133,19 +126,12 @@ public class TProjectInvestigatePersonController extends BaseController
     public AjaxResult edit(@RequestBody TProjectInvestigatePerson tProjectInvestigatePerson)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectInvestigatePerson.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectInvestigatePerson.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectInvestigatePerson.getId());//尽调ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.INVESTIGATE.ordinal()));//文件类型:尽调
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectInvestigatePerson.getListFile(),
+                tProjectInvestigatePerson.getProjectPoolId(),
+                tProjectInvestigatePerson.getId(),//尽调ID
+                String.valueOf(FileType.INVESTIGATE.ordinal()),//文件类型:尽调
+                getNickName());
+
         return toAjax(tProjectInvestigatePersonService.updateTProjectInvestigatePerson(tProjectInvestigatePerson));
     }
 

+ 11 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -135,17 +135,11 @@ public class TProjectMeetingController extends BaseController
             tProjectMeeting.setMeetingCode(DateUtils.dateNow()+ String.format("%03d",number+1));
         }
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectMeeting.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectMeeting.getProjectPoolId());
-                tUnifyFile.setFileBusinessId(tProjectMeeting.getId());//公司ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.MEETING.ordinal()));//文件类型:公司信息
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectMeeting.getListFile(),
+                tProjectMeeting.getProjectPoolId(),
+                tProjectMeeting.getId(),//会议ID
+                String.valueOf(FileType.MEETING.ordinal()),//文件类型:会议
+                getNickName());
 
         // todo 增加会议创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
@@ -198,19 +192,12 @@ public class TProjectMeetingController extends BaseController
     public AjaxResult edit(@RequestBody TProjectMeeting tProjectMeeting)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectMeeting.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectMeeting.getProjectPoolId());
-                    tUnifyFile.setFileBusinessId(tProjectMeeting.getId());//公司ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.MEETING.ordinal()));//文件类型:公司信息
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectMeeting.getListFile(),
+                tProjectMeeting.getProjectPoolId(),
+                tProjectMeeting.getId(),//会议ID
+                String.valueOf(FileType.MEETING.ordinal()),//文件类型:会议
+                getNickName());
+
         return toAjax(tProjectMeetingService.updateTProjectMeeting(tProjectMeeting));
     }
 

+ 11 - 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java

@@ -116,17 +116,11 @@ public class TProjectRecordController extends BaseController
         tProjectRecord.setId(IdUtils.fastSimpleUUID());
         tProjectRecord.setCreateBy(getNickName());
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectRecord.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileId(tProjectRecord.getProjectId());
-                tUnifyFile.setFileBusinessId(tProjectRecord.getId());//公司ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.RECORD.ordinal()));//文件类型:公司信息
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectRecord.getListFile(),
+                tProjectRecord.getProjectId(),
+                tProjectRecord.getId(),
+                String.valueOf(FileType.RECORD.ordinal()),
+                getNickName());
 
         // todo 增加跟进记录创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
@@ -148,19 +142,12 @@ public class TProjectRecordController extends BaseController
     public AjaxResult edit(@RequestBody TProjectRecord tProjectRecord)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectRecord.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectRecord.getProjectId());
-                    tUnifyFile.setFileBusinessId(tProjectRecord.getId());//公司ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.RECORD.ordinal()));//文件类型:公司信息
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectRecord.getListFile(),
+                tProjectRecord.getProjectId(),
+                tProjectRecord.getId(),
+                String.valueOf(FileType.RECORD.ordinal()),
+                getNickName());
+
         return toAjax(tProjectRecordService.updateTProjectRecord(tProjectRecord));
     }
 

+ 12 - 22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TStudyInformationController.java

@@ -112,16 +112,12 @@ public class TStudyInformationController extends BaseController
         tStudyInformation.setId(IdUtils.fastSimpleUUID());
         tStudyInformation.setCreateBy(getNickName());
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tStudyInformation.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                tUnifyFile.setFileBusinessId(tStudyInformation.getId());//公司ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.GEN.ordinal()));//文件类型:公司信息
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tStudyInformation.getListFile(),
+                null,
+                tStudyInformation.getId(),
+                String.valueOf(FileType.GEN.ordinal()),
+                getNickName());
+
         return toAjax(tStudyInformationService.insertTStudyInformation(tStudyInformation));
     }
 
@@ -135,18 +131,12 @@ public class TStudyInformationController extends BaseController
     public AjaxResult edit(@RequestBody TStudyInformation tStudyInformation)
     {
         // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tStudyInformation.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileBusinessId(tStudyInformation.getId());//公司ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.GEN.ordinal()));//文件类型:公司信息
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tStudyInformation.getListFile(),
+                null,
+                tStudyInformation.getId(),
+                String.valueOf(FileType.GEN.ordinal()),
+                getNickName());
+        
         return toAjax(tStudyInformationService.updateTStudyInformation(tStudyInformation));
     }