Selaa lähdekoodia

调整附件上传关联项目ID查询数据

zjc 1 vuosi sitten
vanhempi
commit
dbf9c4e84f

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCompanyController.java

@@ -107,6 +107,7 @@ public class TProjectCompanyController extends BaseController
         if(!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());
@@ -131,6 +132,7 @@ public class TProjectCompanyController extends BaseController
             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());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContractController.java

@@ -110,6 +110,7 @@ public class TProjectContractController extends BaseController
         if(!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());
@@ -142,6 +143,7 @@ public class TProjectContractController extends BaseController
             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());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -109,6 +109,7 @@ public class TProjectInformationController extends BaseController
         if(!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());
@@ -141,6 +142,7 @@ public class TProjectInformationController extends BaseController
             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());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigateController.java

@@ -96,6 +96,7 @@ public class TProjectInvestigateController extends BaseController
         if(!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());
@@ -119,6 +120,7 @@ public class TProjectInvestigateController extends BaseController
             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());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigatePersonController.java

@@ -101,6 +101,7 @@ public class TProjectInvestigatePersonController extends BaseController
             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());
@@ -125,6 +126,7 @@ public class TProjectInvestigatePersonController extends BaseController
             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());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -119,6 +119,7 @@ public class TProjectMeetingController extends BaseController
         if(!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());
@@ -151,6 +152,7 @@ public class TProjectMeetingController extends BaseController
             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());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectPoolController.java

@@ -132,6 +132,7 @@ public class TProjectPoolController extends BaseController
         if(!tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
+                tUnifyFile.setFileId(tProjectPool.getId());
                 tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
                 tUnifyFile.setCreateBy(getNickName());
@@ -172,6 +173,7 @@ public class TProjectPoolController extends BaseController
         if(!tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:tUnifyFileList) {
                 if(tUnifyFile.getId() == null){
+                    tUnifyFile.setFileId(tProjectPool.getId());
                     tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
                     tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
                     tUnifyFile.setCreateBy(getNickName());

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java

@@ -109,6 +109,7 @@ public class TProjectRecordController extends BaseController
         if(!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());
@@ -141,6 +142,7 @@ public class TProjectRecordController extends BaseController
             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());

+ 10 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TUnifyFileController.java

@@ -195,4 +195,14 @@ public class TUnifyFileController extends BaseController
         return success(tUnifyFileService.selectTUnifyFileByBusinessIdList(fileBusinessId));
     }
 
+    /**
+     * 根据fileId()获取项目中所有附件列表
+     */
+    @ApiOperation("根据fileId()获取项目中所有附件列表")
+    @GetMapping("/listFileId")
+    public AjaxResult listFileId(String fileId)
+    {
+        return success(tUnifyFileService.listFileId(fileId));
+    }
+
 }

+ 10 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectInvestigatePerson.java

@@ -41,6 +41,8 @@ public class TProjectInvestigatePerson extends BaseEntity
     @Excel(name = "尽调人员部门名称")
     private String deptName;
 
+    /** 项目id */
+    private String projectPoolId;
     /**
      * 附件信息
      */
@@ -109,6 +111,14 @@ public class TProjectInvestigatePerson extends BaseEntity
         this.listFile = listFile;
     }
 
+    public String getProjectPoolId() {
+        return projectPoolId;
+    }
+
+    public void setProjectPoolId(String projectPoolId) {
+        this.projectPoolId = projectPoolId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 7 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TUnifyFileMapper.java

@@ -74,4 +74,11 @@ public interface TUnifyFileMapper
      * @return
      */
     public List<TUnifyFile> selectTUnifyFileByBusinessIdList(@Param("fileBusinessId")String fileBusinessId);
+
+    /**
+     * 根据fileId()获取项目中所有附件列表
+     * @param fileId
+     * @return
+     */
+    List<TUnifyFile> listFileId(@Param("fileId")String fileId);
 }

+ 7 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/service/ITUnifyFileService.java

@@ -77,4 +77,11 @@ public interface ITUnifyFileService
      * @return
      */
     public List<TUnifyFile> selectTUnifyFileByBusinessIdList(String fileBusinessId);
+
+    /**
+     * 根据fileId()获取项目中所有附件列表
+     * @param fileId
+     * @return
+     */
+    List<TUnifyFile> listFileId(String fileId);
 }

+ 10 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TUnifyFileServiceImpl.java

@@ -124,4 +124,14 @@ public class TUnifyFileServiceImpl implements ITUnifyFileService
         return tUnifyFileMapper.selectTUnifyFileByBusinessIdList(fileBusinessId);
     }
 
+    /**
+     * 根据fileId()获取项目中所有附件列表
+     * @param fileId
+     * @return
+     */
+    @Override
+    public List<TUnifyFile> listFileId(String fileId) {
+        return tUnifyFileMapper.listFileId(fileId);
+    }
+
 }

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectInvestigatePersonMapper.xml

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectByProjectInvestigateId" parameterType="String" resultMap="TProjectInvestigatePersonResult">
+    <select id="selectByProjectInvestigateId" parameterType="TProjectInvestigatePerson" resultMap="TProjectInvestigatePersonResult">
         <include refid="selectTProjectInvestigatePersonVo"/>
         where project_investigate_id = #{projectInvestigateId} and investigate_person_id = #{userId}
     </select>

+ 5 - 0
ruoyi-system/src/main/resources/mapper/tool/TUnifyFileMapper.xml

@@ -121,4 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where file_business_id = #{fileBusinessId} and del_flag = 0
     </select>
 
+    <select id="listFileId" parameterType="String" resultMap="TUnifyFileResult">
+        <include refid="selectTUnifyFileVo"/>
+        where file_id = #{fileId} and del_flag = 0
+    </select>
+
 </mapper>