Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.service.ITProjectPoolService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -45,6 +46,9 @@ public class TProjectApprovalController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ITProjectPoolService tProjectPoolService;
+
     /**
      * 查询立项申请列表
      */
@@ -87,7 +91,6 @@ public class TProjectApprovalController extends BaseController
      * 新增立项申请
      */
     @ApiOperation("新增立项申请")
-    @PreAuthorize("@ss.hasPermi('invest:approval:add')")
     @Log(title = "立项申请", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TProjectApproval tProjectApproval)
@@ -105,6 +108,9 @@ public class TProjectApprovalController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+        // todo 更改立项状态
+        tProjectPoolService.updateTProjectPoolByApprovalFlag(tProjectApproval.getProjectPoolId(),"1");
+
         return toAjax(tProjectApprovalService.insertTProjectApproval(tProjectApproval));
     }
 
@@ -150,7 +156,6 @@ public class TProjectApprovalController extends BaseController
      * 根据项目ID获取最新立项申请
      */
     @ApiOperation("根据项目ID获取最新立项申请")
-    @PreAuthorize("@ss.hasPermi('invest:approval:query')")
     @GetMapping(value = "/listProjectPoolIdNew")
     public AjaxResult listProjectPoolIdNew(String projectPoolId)
     {

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.service.ITProjectPoolService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -45,6 +46,9 @@ public class TProjectDecisionController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ITProjectPoolService tProjectPoolService;
+
     /**
      * 查询投决申请列表
      */
@@ -87,7 +91,6 @@ public class TProjectDecisionController extends BaseController
      * 新增投决申请
      */
     @ApiOperation("新增投决申请")
-    @PreAuthorize("@ss.hasPermi('invest:decision:add')")
     @Log(title = "投决申请", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TProjectDecision tProjectDecision)
@@ -105,6 +108,10 @@ public class TProjectDecisionController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+
+        // todo 更改投决状态
+        tProjectPoolService.updateTProjectPoolByDecisionFlag(tProjectDecision.getProjectPoolId(),"1");
+
         return toAjax(tProjectDecisionService.insertTProjectDecision(tProjectDecision));
     }
 
@@ -150,7 +157,6 @@ public class TProjectDecisionController extends BaseController
      * 根据项目ID获取最新立项申请
      */
     @ApiOperation("根据项目ID获取最新立项申请")
-    @PreAuthorize("@ss.hasPermi('invest:decision:query')")
     @GetMapping(value = "/listProjectPoolIdNew")
     public AjaxResult listProjectPoolIdNew(String projectPoolId)
     {

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectScoring;
 import com.ruoyi.invest.service.ITProjectCirculationService;
+import com.ruoyi.invest.service.ITProjectPoolService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -52,6 +53,9 @@ public class TProjectInvestigateController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ITProjectPoolService tProjectPoolService;
+
     /**
      * 查询尽调关联列表
      */
@@ -116,6 +120,9 @@ public class TProjectInvestigateController extends BaseController
         tProjectCirculation.setCreateBy(getNickName());
         tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
 
+        // todo 更改尽调状态
+        tProjectPoolService.updateTProjectPoolByInvestigateFlag(tProjectInvestigate.getProjectPoolId(),"1");
+
         return toAjax(tProjectInvestigateService.insertTProjectInvestigate(tProjectInvestigate));
     }
 

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

@@ -172,4 +172,16 @@ public class TProjectInvestigatePersonController extends BaseController
         return success(tProjectInvestigatePersonService.selectByProjectInvestigateId(projectInvestigateId,getUserId()));
     }
 
+    /**
+     * 获取尽调人员关联表详细信息集合
+     */
+    @ApiOperation("获取尽调人员关联表详细信息集合")
+    @GetMapping(value = "/selectProjectInvestigateIdList")
+    public AjaxResult selectProjectInvestigateIdList(String projectInvestigateId)
+    {
+        return success(tProjectInvestigatePersonService.selectProjectInvestigateIdList(projectInvestigateId));
+    }
+
+
+
 }

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

@@ -68,17 +68,11 @@ public class TProjectPoolController extends BaseController
     @Autowired
     private ISysDictDataService dictDataService;
 
-    @Autowired
-    private ITProjectMeetingService tProjectMeetingService;
-
     @Autowired
     private ITProjectInvestigateService tProjectInvestigateService;
 
     @Autowired
-    private ITProjectApprovalService tProjectApprovalService;
-
-    @Autowired
-    private ITProjectDecisionService tProjectDecisionService;
+    private ITProjectInvestigatePersonService tProjectInvestigatePersonService;
 
 
     /**
@@ -136,6 +130,9 @@ public class TProjectPoolController extends BaseController
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
                 .stream().map(n -> {
                     n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
+                    if(null != n.gettProjectInvestigate()){
+                        n.settProjectInvestigatePerson(tProjectInvestigatePersonService.selectByProjectInvestigateId(n.gettProjectInvestigate().getId(),getUserId()));
+                    }
                     return n;
                 }).collect(Collectors.toList());
         return getDataTable(list);
@@ -220,43 +217,25 @@ public class TProjectPoolController extends BaseController
         tProjectCompany.setProjectPoolId(tProjectPool.getId());
 
         // todo 保存公司附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectPool.getListFile();
-        if(null != tUnifyFileList && !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());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectPool.getListFile(),
+                tProjectPool.getId(),
+                tProjectCompany.getId(),
+                String.valueOf(FileType.COMPANY.ordinal()),
+                getNickName());
 
         // todo 保存BP附件信息
-        List<TUnifyFile> bpFileList = tProjectPool.getBpFile();
-        if(null != bpFileList && !bpFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    bpFileList) {
-                tUnifyFile.setFileId(tProjectPool.getId());
-                tUnifyFile.setFileBusinessId(tProjectPool.getId());//项目ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.BP.ordinal()));//文件类型:BP
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectPool.getBpFile(),
+                tProjectPool.getId(),
+                tProjectPool.getId(),
+                String.valueOf(FileType.BP.ordinal()),
+                getNickName());
 
         // todo 保存其他附件信息
-        List<TUnifyFile> otherFileList = tProjectPool.getOtherFile();
-        if(null != otherFileList && !otherFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:
-                    otherFileList) {
-                tUnifyFile.setFileId(tProjectPool.getId());
-                tUnifyFile.setFileBusinessId(tProjectPool.getId());//项目ID
-                tUnifyFile.setUploadType(String.valueOf(FileType.OTHER.ordinal()));//文件类型:OTHER
-                tUnifyFile.setCreateBy(getNickName());
-                tUnifyFileService.insertTUnifyFile(tUnifyFile);
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectPool.getOtherFile(),
+                tProjectPool.getId(),
+                tProjectPool.getId(),
+                String.valueOf(FileType.OTHER.ordinal()),
+                getNickName());
 
         tProjectCompanyService.insertTProjectCompany(tProjectCompany);
         tProjectContactsService.insertTProjectContacts(tProjectContacts);
@@ -286,45 +265,27 @@ public class TProjectPoolController extends BaseController
         tProjectContacts.setUpdateBy(getNickName());
         tProjectContacts.setId(tProjectPool.getProjectContacts());
         // 上传并返回新文件名称
-        // todo 保存附件信息
-        List<TUnifyFile> tUnifyFileList = tProjectPool.getListFile();
-        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:tUnifyFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectPool.getId());
-                    tUnifyFile.setFileBusinessId(tProjectCompany.getCompanyId());//公司ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        // todo 保存公司附件信息
+        tUnifyFileService.insertTUnifyFileList(tProjectPool.getListFile(),
+                tProjectPool.getId(),
+                tProjectCompany.getCompanyId(),
+                String.valueOf(FileType.COMPANY.ordinal()),
+                getNickName());
+
         // todo 保存BP附件信息
-        List<TUnifyFile> bpFileList = tProjectPool.getBpFile();
-        if(null != bpFileList && !bpFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:bpFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectPool.getId());
-                    tUnifyFile.setFileBusinessId(tProjectPool.getId());//项目ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.BP.ordinal()));//文件类型:BP
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectPool.getBpFile(),
+                tProjectPool.getId(),
+                tProjectPool.getId(),
+                String.valueOf(FileType.BP.ordinal()),
+                getNickName());
+
         // todo 保存其他附件信息
-        List<TUnifyFile> otherFileList = tProjectPool.getOtherFile();
-        if(null != otherFileList && !otherFileList.isEmpty()){
-            for (TUnifyFile tUnifyFile:otherFileList) {
-                if(tUnifyFile.getId() == null){
-                    tUnifyFile.setFileId(tProjectPool.getId());
-                    tUnifyFile.setFileBusinessId(tProjectPool.getId());//项目ID
-                    tUnifyFile.setUploadType(String.valueOf(FileType.OTHER.ordinal()));//文件类型:OTHER
-                    tUnifyFile.setCreateBy(getNickName());
-                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
-                }
-            }
-        }
+        tUnifyFileService.insertTUnifyFileList(tProjectPool.getOtherFile(),
+                tProjectPool.getId(),
+                tProjectPool.getId(),
+                String.valueOf(FileType.OTHER.ordinal()),
+                getNickName());
+
         tProjectCompanyService.updateTProjectCompany(tProjectCompany);
         tProjectContactsService.updateTProjectContacts(tProjectContacts);
         return toAjax(tProjectPoolService.updateTProjectPool(tProjectPool));

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectInvestigate.java

@@ -1,11 +1,13 @@
 package com.ruoyi.invest.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.tool.domain.TUnifyFile;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -59,7 +61,29 @@ public class TProjectInvestigate extends BaseEntity
      */
     private List<TUnifyFile> listFile;
 
-    public void setId(String id) 
+    /** 尽调地点 */
+    private String investigatePlace;
+
+    /** 期望尽调开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 期望尽调结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 尽调资料是否齐全 */
+    private String readiness;
+
+    /** 是否有第三方投资机构 */
+    private String thirdParty;
+
+    /** 尽调财务数据截止日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date deadDate;
+
+
+    public void setId(String id)
     {
         this.id = id;
     }
@@ -157,6 +181,54 @@ public class TProjectInvestigate extends BaseEntity
         this.status = status;
     }
 
+    public String getInvestigatePlace() {
+        return investigatePlace;
+    }
+
+    public void setInvestigatePlace(String investigatePlace) {
+        this.investigatePlace = investigatePlace;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReadiness() {
+        return readiness;
+    }
+
+    public void setReadiness(String readiness) {
+        this.readiness = readiness;
+    }
+
+    public String getThirdParty() {
+        return thirdParty;
+    }
+
+    public void setThirdParty(String thirdParty) {
+        this.thirdParty = thirdParty;
+    }
+
+    public Date getDeadDate() {
+        return deadDate;
+    }
+
+    public void setDeadDate(Date deadDate) {
+        this.deadDate = deadDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java

@@ -158,6 +158,10 @@ public class TProjectPool extends BaseEntity
     @ApiModelProperty("尽调信息")
     private TProjectInvestigate tProjectInvestigate;
 
+    /** 尽调人员信息 */
+    @ApiModelProperty("尽调人员信息")
+    private TProjectInvestigatePerson tProjectInvestigatePerson;
+
     /**
      * 附件信息
      */
@@ -579,6 +583,14 @@ public class TProjectPool extends BaseEntity
         this.decisionFlag = decisionFlag;
     }
 
+    public TProjectInvestigatePerson gettProjectInvestigatePerson() {
+        return tProjectInvestigatePerson;
+    }
+
+    public void settProjectInvestigatePerson(TProjectInvestigatePerson tProjectInvestigatePerson) {
+        this.tProjectInvestigatePerson = tProjectInvestigatePerson;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectInvestigatePersonMapper.java

@@ -68,4 +68,11 @@ public interface TProjectInvestigatePersonMapper
      * @return
      */
     TProjectInvestigatePerson selectByProjectInvestigateId(@Param("projectInvestigateId")String projectInvestigateId, @Param("userId")Long userId);
+
+    /**
+     * 根据尽调申请ID获取尽调人员关联表集合
+     * @param projectInvestigateId
+     * @return
+     */
+    List<TProjectInvestigatePerson> selectProjectInvestigateIdList(@Param("projectInvestigateId")String projectInvestigateId);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectPoolMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.invest.mapper;
 
 import com.ruoyi.invest.domain.TProjectPool;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -82,4 +83,27 @@ public interface TProjectPoolMapper
      */
     List<TProjectPool> selectTProjectPoolReviewList(TProjectPool tProjectPool);
 
+    /**
+     * 修改立项状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByApprovalFlag(@Param("id") String id,@Param("flag") String flag);
+
+    /**
+     * 修改尽调状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByInvestigateFlag(@Param("id") String id,@Param("flag") String flag);
+
+    /**
+     * 修改投决状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByDecisionFlag(@Param("id") String id,@Param("flag") String flag);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectInvestigatePersonService.java

@@ -67,4 +67,12 @@ public interface ITProjectInvestigatePersonService
      * @return
      */
     TProjectInvestigatePerson selectByProjectInvestigateId(String projectInvestigateId,Long userId);
+
+    /**
+     * 根据尽调申请ID获取尽调人员关联表详细信息
+     *
+     * @param projectInvestigateId
+     * @return
+     */
+    List<TProjectInvestigatePerson> selectProjectInvestigateIdList(String projectInvestigateId);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectPoolService.java

@@ -81,4 +81,29 @@ public interface ITProjectPoolService
      * @return
      */
     List<TProjectPool> selectTProjectPoolReviewList(TProjectPool tProjectPool);
+
+    /**
+     * 修改立项状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByApprovalFlag(String id,String flag);
+
+    /**
+     * 修改尽调状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByInvestigateFlag(String id,String flag);
+
+    /**
+     * 修改投决状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByDecisionFlag(String id,String flag);
+
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectInvestigatePersonServiceImpl.java

@@ -113,4 +113,14 @@ public class TProjectInvestigatePersonServiceImpl implements ITProjectInvestigat
     public TProjectInvestigatePerson selectByProjectInvestigateId(String projectInvestigateId, Long userId) {
         return tProjectInvestigatePersonMapper.selectByProjectInvestigateId(projectInvestigateId,userId);
     }
+
+    /**
+     * 根据尽调申请ID获取尽调人员关联表集合
+     * @param projectInvestigateId
+     * @return
+     */
+    @Override
+    public List<TProjectInvestigatePerson> selectProjectInvestigateIdList(String projectInvestigateId) {
+        return tProjectInvestigatePersonMapper.selectProjectInvestigateIdList(projectInvestigateId);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectPoolServiceImpl.java

@@ -127,4 +127,37 @@ public class TProjectPoolServiceImpl implements ITProjectPoolService
         return tProjectPoolMapper.selectTProjectPoolReviewList(tProjectPool);
     }
 
+    /**
+     * 修改立项状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    @Override
+    public int updateTProjectPoolByApprovalFlag(String id, String flag) {
+        return tProjectPoolMapper.updateTProjectPoolByApprovalFlag(id,flag);
+    }
+
+    /**
+     * 修改尽调状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    @Override
+    public int updateTProjectPoolByInvestigateFlag(String id, String flag) {
+        return tProjectPoolMapper.updateTProjectPoolByInvestigateFlag(id,flag);
+    }
+
+    /**
+     * 修改投决状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    @Override
+    public int updateTProjectPoolByDecisionFlag(String id, String flag) {
+        return tProjectPoolMapper.updateTProjectPoolByDecisionFlag(id,flag);
+    }
+
 }

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

@@ -38,6 +38,17 @@ public interface ITUnifyFileService
      */
     public int insertTUnifyFile(TUnifyFile tUnifyFile);
 
+    /**
+     * 批量新增关联附件
+     * @param tUnifyFileList
+     * @param fileId
+     * @param fileBusinessId
+     * @param uploadType
+     * @param createBy
+     * @return
+     */
+    public void insertTUnifyFileList(List<TUnifyFile> tUnifyFileList,String fileId,String fileBusinessId,String uploadType,String createBy);
+
     /**
      * 修改附件
      * 

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -67,6 +68,33 @@ public class TUnifyFileServiceImpl implements ITUnifyFileService
         return tUnifyFileMapper.insertTUnifyFile(tUnifyFile);
     }
 
+    /**
+     * 批量新增关联附件
+     * @param tUnifyFileList
+     * @param fileId
+     * @param fileBusinessId
+     * @param uploadType
+     * @param createBy
+     * @return
+     */
+    @Override
+    public void insertTUnifyFileList(List<TUnifyFile> tUnifyFileList, String fileId, String fileBusinessId, String uploadType, String createBy) {
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
+            for (TUnifyFile tUnifyFile:
+                    tUnifyFileList) {
+                if(tUnifyFile.getId() == null){
+                    tUnifyFile.setId(IdUtils.fastSimpleUUID());
+                    tUnifyFile.setCreateTime(DateUtils.getNowDate());
+                    tUnifyFile.setFileId(fileId);
+                    tUnifyFile.setFileBusinessId(fileBusinessId);
+                    tUnifyFile.setUploadType(uploadType);//文件类型:公司信息
+                    tUnifyFile.setCreateBy(createBy);
+                    tUnifyFileMapper.insertTUnifyFile(tUnifyFile);
+                }
+            }
+        }
+    }
+
     /**
      * 修改附件
      * 

ruoyi-system/src/main/resources/mapper/invest/TProjectInvestigateMapper.xml

@@ -13,6 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="investigatePersonId"    column="investigate_person_id"    />
         <result property="investigateCost"    column="investigate_cost"    />
         <result property="describe"    column="describe_"    />
+        <result property="investigatePlace"    column="investigate_place"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="readiness"    column="readiness"    />
+        <result property="thirdParty"    column="third_party"    />
+        <result property="deadDate"    column="dead_date"    />
         <result property="remark"    column="remark"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="status"    column="status"    />
@@ -23,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProjectInvestigateVo">
-        select id, investigate_name, investigate_code, project_pool_id, investigate_person, investigate_person_id, investigate_cost, describe_, remark, status, del_flag, create_by, create_time, update_by, update_time from t_project_investigate
+        select id, investigate_name, investigate_code, project_pool_id, investigate_place, start_time, end_time, readiness, third_party, dead_date, investigate_person, investigate_person_id, investigate_cost, describe_, remark, status, del_flag, create_by, create_time, update_by, update_time from t_project_investigate
     </sql>
 
     <select id="selectTProjectInvestigateList" parameterType="TProjectInvestigate" resultMap="TProjectInvestigateResult">
@@ -55,6 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investigatePersonId != null">investigate_person_id,</if>
             <if test="investigateCost != null">investigate_cost,</if>
             <if test="describe != null">describe_,</if>
+            <if test="investigatePlace != null">investigate_place,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="readiness != null">readiness,</if>
+            <if test="thirdParty != null">third_party,</if>
+            <if test="deadDate != null">dead_date,</if>
             <if test="remark != null">remark,</if>
             <if test="status != null">status,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -72,6 +84,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investigatePersonId != null">#{investigatePersonId},</if>
             <if test="investigateCost != null">#{investigateCost},</if>
             <if test="describe != null">#{describe},</if>
+            <if test="investigatePlace != null">#{investigatePlace},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="readiness != null">#{readiness},</if>
+            <if test="thirdParty != null">#{thirdParty},</if>
+            <if test="deadDate != null">#{deadDate},</if>
             <if test="remark != null">#{remark},</if>
             <if test="status != null">#{status},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -92,6 +110,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investigatePersonId != null">investigate_person_id = #{investigatePersonId},</if>
             <if test="investigateCost != null">investigate_cost = #{investigateCost},</if>
             <if test="describe != null">describe_ = #{describe},</if>
+            <if test="investigatePlace != null">investigate_place = #{investigatePlace},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="readiness != null">readiness = #{readiness},</if>
+            <if test="thirdParty != null">third_party = #{thirdParty},</if>
+            <if test="deadDate != null">dead_date = #{deadDate},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -134,7 +158,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY create_time DESC LIMIT 1
     </select>
 
-
     <update id="editStatus" parameterType="String">
         update t_project_investigate
         set status = 1

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

@@ -101,4 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where project_investigate_id = #{projectInvestigateId} and investigate_person_id = #{userId}
     </select>
 
+    <select id="selectProjectInvestigateIdList" parameterType="TProjectInvestigatePerson" resultMap="TProjectInvestigatePersonResult">
+        <include refid="selectTProjectInvestigatePersonVo"/>
+        where project_investigate_id = #{projectInvestigateId}
+    </select>
+
 </mapper>

ruoyi-system/src/main/resources/mapper/invest/TProjectPoolMapper.xml

@@ -317,4 +317,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <update id="updateTProjectPoolByApprovalFlag" parameterType="String">
+        update t_project_pool
+        set approval_flag = #{flag}
+        where id = #{id}
+    </update>
+
+    <update id="updateTProjectPoolByInvestigateFlag" parameterType="String">
+        update t_project_pool
+        set investigate_flag = #{flag}
+        where id = #{id}
+    </update>
+
+    <update id="updateTProjectPoolByDecisionFlag" parameterType="String">
+        update t_project_pool
+        set decision_flag = #{flag}
+        where id = #{id}
+    </update>
+
 </mapper>