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

@@ -95,7 +95,7 @@ public class TProjectApprovalController extends BaseController
         tProjectApproval.setId(IdUtils.fastSimpleUUID());
         // todo 保存立项资料
         List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectApproval.getProjectPoolId());
@@ -119,7 +119,7 @@ public class TProjectApprovalController extends BaseController
     {
         // todo 保存立项资料
         List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){
@@ -145,4 +145,16 @@ public class TProjectApprovalController extends BaseController
     {
         return toAjax(tProjectApprovalService.deleteTProjectApprovalByIds(ids));
     }
+
+    /**
+     * 根据项目ID获取最新立项申请
+     */
+    @ApiOperation("根据项目ID获取最新立项申请")
+    @PreAuthorize("@ss.hasPermi('invest:approval:query')")
+    @GetMapping(value = "/listProjectPoolIdNew")
+    public AjaxResult listProjectPoolIdNew(String projectPoolId)
+    {
+        return success(tProjectApprovalService.listProjectPoolIdNew(projectPoolId));
+    }
+
 }

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

@@ -114,7 +114,7 @@ public class TProjectChannelController extends BaseController
         tProjectChannel.setChannelCode(tProjectChannel.getChannelGroup()+"-"+ DateUtils.lastTwoDigits() +"-"+ String.format("%03d",number+1));
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectChannel.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileBusinessId(tProjectChannel.getId());//渠道ID
@@ -137,7 +137,7 @@ public class TProjectChannelController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectChannel.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -104,7 +104,7 @@ public class TProjectCompanyController extends BaseController
         tProjectCompany.setCreateBy(getNickName());
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectCompany.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectCompany.getProjectPoolId());
@@ -128,7 +128,7 @@ public class TProjectCompanyController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectCompany.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -119,7 +119,7 @@ public class TProjectContractController extends BaseController
 
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectContract.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectContract.getProjectPoolId());
@@ -151,7 +151,7 @@ public class TProjectContractController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectContract.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -95,7 +95,7 @@ public class TProjectDecisionController extends BaseController
         tProjectDecision.setId(IdUtils.fastSimpleUUID());
         // todo 保存投决资料
         List<TUnifyFile> tUnifyFileList = tProjectDecision.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectDecision.getProjectPoolId());
@@ -119,7 +119,7 @@ public class TProjectDecisionController extends BaseController
     {
         // todo 保存投决资料
         List<TUnifyFile> tUnifyFileList = tProjectDecision.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){
@@ -145,4 +145,16 @@ public class TProjectDecisionController extends BaseController
     {
         return toAjax(tProjectDecisionService.deleteTProjectDecisionByIds(ids));
     }
+
+    /**
+     * 根据项目ID获取最新立项申请
+     */
+    @ApiOperation("根据项目ID获取最新立项申请")
+    @PreAuthorize("@ss.hasPermi('invest:decision:query')")
+    @GetMapping(value = "/listProjectPoolIdNew")
+    public AjaxResult listProjectPoolIdNew(String projectPoolId)
+    {
+        return success(tProjectDecisionService.listProjectPoolIdNew(projectPoolId));
+    }
+
 }

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

@@ -118,7 +118,7 @@ public class TProjectInformationController extends BaseController
         tProjectInformation.setCreateBy(getNickName());
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectInformation.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectInformation.getProjectPoolId());
@@ -150,7 +150,7 @@ public class TProjectInformationController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectInformation.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -98,7 +98,7 @@ public class TProjectInvestigateController extends BaseController
         tProjectInvestigate.setId(IdUtils.fastSimpleUUID());
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectInvestigate.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectInvestigate.getProjectPoolId());
@@ -129,7 +129,7 @@ public class TProjectInvestigateController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectInvestigate.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){
@@ -183,5 +183,15 @@ public class TProjectInvestigateController extends BaseController
         return toAjax(tProjectInvestigateService.editStatus(id));
     }
 
+    /**
+     * 根据项目ID获取最新尽调完成
+     */
+    @ApiOperation("根据项目ID获取最新尽调")
+    @GetMapping(value = "/listProjectPoolIdNew")
+    public AjaxResult listProjectPoolIdNew(String projectPoolId)
+    {
+        return success(tProjectInvestigateService.listProjectPoolIdNew(projectPoolId));
+    }
+
 
 }

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

@@ -102,7 +102,7 @@ public class TProjectInvestigatePersonController extends BaseController
         tProjectInvestigatePerson.setDeptId(getDeptId());
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectInvestigatePerson.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){
@@ -134,7 +134,7 @@ public class TProjectInvestigatePersonController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectInvestigatePerson.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -128,7 +128,7 @@ public class TProjectMeetingController extends BaseController
         }
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectMeeting.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectMeeting.getProjectPoolId());
@@ -160,7 +160,7 @@ public class TProjectMeetingController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectMeeting.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -103,6 +103,7 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listReview(TProjectPool tProjectPool)
     {
         startPage();
+        tProjectPool.setProjectStage("2");
         tProjectPool.setCreateBy(getUserId().toString());
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolReviewList(tProjectPool);
         return getDataTable(list);
@@ -117,12 +118,8 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listApproval(TProjectPool tProjectPool)
     {
         startPage();
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
-                .stream().map(n -> {
-                    n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));
-                    n.settProjectApproval(tProjectApprovalService.listProjectPoolIdNew(n.getId()));
-                    return n;
-                }).collect(Collectors.toList());
+        tProjectPool.setProjectStage("3");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool);
         return getDataTable(list);
     }
 
@@ -135,6 +132,7 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listInvestigate(TProjectPool tProjectPool)
     {
         startPage();
+        tProjectPool.setProjectStage("4");
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
                 .stream().map(n -> {
                     n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
@@ -152,12 +150,8 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listDecision(TProjectPool tProjectPool)
     {
         startPage();
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
-                .stream().map(n -> {
-                    n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
-                    n.settProjectDecision(tProjectDecisionService.listProjectPoolIdNew(n.getId()));
-                    return n;
-                }).collect(Collectors.toList());
+        tProjectPool.setProjectStage("5");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool);
         return getDataTable(list);
     }
 
@@ -227,7 +221,7 @@ public class TProjectPoolController extends BaseController
 
         // todo 保存公司附件信息
         List<TUnifyFile> tUnifyFileList = tProjectPool.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectPool.getId());
@@ -240,7 +234,7 @@ public class TProjectPoolController extends BaseController
 
         // todo 保存BP附件信息
         List<TUnifyFile> bpFileList = tProjectPool.getBpFile();
-        if(!bpFileList.isEmpty()){
+        if(null != bpFileList && !bpFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     bpFileList) {
                 tUnifyFile.setFileId(tProjectPool.getId());
@@ -253,7 +247,7 @@ public class TProjectPoolController extends BaseController
 
         // todo 保存其他附件信息
         List<TUnifyFile> otherFileList = tProjectPool.getOtherFile();
-        if(!otherFileList.isEmpty()){
+        if(null != otherFileList && !otherFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     otherFileList) {
                 tUnifyFile.setFileId(tProjectPool.getId());
@@ -294,11 +288,11 @@ public class TProjectPoolController extends BaseController
         // 上传并返回新文件名称
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectPool.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:tUnifyFileList) {
                 if(tUnifyFile.getId() == null){
                     tUnifyFile.setFileId(tProjectPool.getId());
-                    tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
+                    tUnifyFile.setFileBusinessId(tProjectCompany.getCompanyId());//公司ID
                     tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
                     tUnifyFile.setCreateBy(getNickName());
                     tUnifyFileService.insertTUnifyFile(tUnifyFile);
@@ -307,7 +301,7 @@ public class TProjectPoolController extends BaseController
         }
         // todo 保存BP附件信息
         List<TUnifyFile> bpFileList = tProjectPool.getBpFile();
-        if(!bpFileList.isEmpty()){
+        if(null != bpFileList && !bpFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:bpFileList) {
                 if(tUnifyFile.getId() == null){
                     tUnifyFile.setFileId(tProjectPool.getId());
@@ -320,7 +314,7 @@ public class TProjectPoolController extends BaseController
         }
         // todo 保存其他附件信息
         List<TUnifyFile> otherFileList = tProjectPool.getOtherFile();
-        if(!otherFileList.isEmpty()){
+        if(null != otherFileList && !otherFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:otherFileList) {
                 if(tUnifyFile.getId() == null){
                     tUnifyFile.setFileId(tProjectPool.getId());

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

@@ -117,7 +117,7 @@ public class TProjectRecordController extends BaseController
         tProjectRecord.setCreateBy(getNickName());
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectRecord.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileId(tProjectRecord.getProjectId());
@@ -149,7 +149,7 @@ public class TProjectRecordController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectRecord.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -42,7 +42,6 @@ public class TProjectReviewController extends BaseController
      * 查询评审记录列表
      */
     @ApiOperation("查询评审记录列表")
-    @PreAuthorize("@ss.hasPermi('invest:review:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectReview tProjectReview)
     {
@@ -55,7 +54,6 @@ public class TProjectReviewController extends BaseController
      * 导出评审记录列表
      */
     @ApiOperation("导出评审记录列表")
-    @PreAuthorize("@ss.hasPermi('invest:review:export')")
     @Log(title = "评审记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectReview tProjectReview)
@@ -69,7 +67,6 @@ public class TProjectReviewController extends BaseController
      * 获取评审记录详细信息
      */
     @ApiOperation("获取评审记录详细信息")
-    @PreAuthorize("@ss.hasPermi('invest:review:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -80,7 +77,6 @@ public class TProjectReviewController extends BaseController
      * 新增评审记录
      */
     @ApiOperation("新增评审记录")
-    @PreAuthorize("@ss.hasPermi('invest:review:add')")
     @Log(title = "评审记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TProjectReview tProjectReview)
@@ -95,7 +91,6 @@ public class TProjectReviewController extends BaseController
      * 修改评审记录
      */
     @ApiOperation("修改评审记录")
-    @PreAuthorize("@ss.hasPermi('invest:review:edit')")
     @Log(title = "评审记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TProjectReview tProjectReview)
@@ -107,7 +102,6 @@ public class TProjectReviewController extends BaseController
      * 删除评审记录
      */
     @ApiOperation("删除评审记录")
-    @PreAuthorize("@ss.hasPermi('invest:review:remove')")
     @Log(title = "评审记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

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

@@ -113,7 +113,7 @@ public class TStudyInformationController extends BaseController
         tStudyInformation.setCreateBy(getNickName());
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tStudyInformation.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 tUnifyFile.setFileBusinessId(tStudyInformation.getId());//公司ID
@@ -136,7 +136,7 @@ public class TStudyInformationController extends BaseController
     {
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tStudyInformation.getListFile();
-        if(!tUnifyFileList.isEmpty()){
+        if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
             for (TUnifyFile tUnifyFile:
                     tUnifyFileList) {
                 if(tUnifyFile.getId() == null){

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

@@ -200,9 +200,9 @@ public class TUnifyFileController extends BaseController
      */
     @ApiOperation("根据附件业务ID()获取附件详情信息列表")
     @GetMapping("/listFileBusinessId")
-    public AjaxResult listFileBusinessId(String fileBusinessId)
+    public AjaxResult listFileBusinessId(String fileBusinessId,String uploadType)
     {
-        return success(tUnifyFileService.selectTUnifyFileByBusinessIdList(fileBusinessId));
+        return success(tUnifyFileService.selectTUnifyFileByBusinessIdList(fileBusinessId,uploadType));
     }
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -72,7 +72,7 @@ spring:
     # 地址
     host: localhost
     # 端口，默认为6379
-    port: 6380
+    port: 6379
     # 数据库索引
     database: 0
     # 密码

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.tool.domain.TUnifyFile;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -71,7 +72,7 @@ public class TProjectCompany extends BaseEntity
 
     /** 备案时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private String filingTime;
+    private Date filingTime;
 
     /**
      * 附件信息
@@ -136,7 +137,11 @@ public class TProjectCompany extends BaseEntity
     }
     public void setRegisteredCapital(String registeredCapital) 
     {
-        this.registeredCapital = String.format("%.4f", Double.parseDouble(registeredCapital));
+        if(StringUtils.isNotEmpty(registeredCapital)){
+            this.registeredCapital = String.format("%.4f", Double.parseDouble(registeredCapital));
+        }else{
+            this.registeredCapital = registeredCapital;
+        }
     }
 
     public String getRegisteredCapital() 
@@ -154,7 +159,11 @@ public class TProjectCompany extends BaseEntity
     }
     public void setPaidCapital(String paidCapital) 
     {
-        this.paidCapital = String.format("%.4f", Double.parseDouble(paidCapital));
+        if(StringUtils.isNotEmpty(paidCapital)){
+            this.paidCapital = String.format("%.4f", Double.parseDouble(paidCapital));
+        }else{
+            this.paidCapital = paidCapital;
+        }
     }
 
     public String getPaidCapital() 
@@ -215,14 +224,6 @@ public class TProjectCompany extends BaseEntity
         this.listFile = listFile;
     }
 
-    public String getFilingTime() {
-        return filingTime;
-    }
-
-    public void setFilingTime(String filingTime) {
-        this.filingTime = filingTime;
-    }
-
     public String getCompanyId() {
         return companyId;
     }
@@ -231,6 +232,14 @@ public class TProjectCompany extends BaseEntity
         this.companyId = companyId;
     }
 
+    public Date getFilingTime() {
+        return filingTime;
+    }
+
+    public void setFilingTime(Date filingTime) {
+        this.filingTime = filingTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -154,22 +154,10 @@ public class TProjectPool extends BaseEntity
     @ApiModelProperty("评审信息")
     private TProjectReview tProjectReview;
 
-    /** 会议信息 */
-    @ApiModelProperty("会议信息")
-    private TProjectMeeting tProjectMeeting;
-
     /** 尽调信息 */
     @ApiModelProperty("尽调信息")
     private TProjectInvestigate tProjectInvestigate;
 
-    /** 立项申请 */
-    @ApiModelProperty("立项申请")
-    private TProjectApproval tProjectApproval;
-
-    /** 投决申请 */
-    @ApiModelProperty("投决申请")
-    private TProjectDecision tProjectDecision;
-
     /**
      * 附件信息
      */
@@ -200,6 +188,21 @@ public class TProjectPool extends BaseEntity
     @ApiModelProperty("状态名称")
     private String stateName;
 
+    /**
+     * 立项申请状态
+     */
+    private String approvalFlag;
+
+    /**
+     * 尽调申请状态
+     */
+    private String investigateFlag;
+
+    /**
+     * 投决申请状态
+     */
+    private String decisionFlag;
+
 
     public void setId(String id) 
     {
@@ -544,14 +547,6 @@ public class TProjectPool extends BaseEntity
         this.tProjectReview = tProjectReview;
     }
 
-    public TProjectMeeting gettProjectMeeting() {
-        return tProjectMeeting;
-    }
-
-    public void settProjectMeeting(TProjectMeeting tProjectMeeting) {
-        this.tProjectMeeting = tProjectMeeting;
-    }
-
     public TProjectInvestigate gettProjectInvestigate() {
         return tProjectInvestigate;
     }
@@ -560,20 +555,28 @@ public class TProjectPool extends BaseEntity
         this.tProjectInvestigate = tProjectInvestigate;
     }
 
-    public TProjectApproval gettProjectApproval() {
-        return tProjectApproval;
+    public String getApprovalFlag() {
+        return approvalFlag;
+    }
+
+    public void setApprovalFlag(String approvalFlag) {
+        this.approvalFlag = approvalFlag;
+    }
+
+    public String getInvestigateFlag() {
+        return investigateFlag;
     }
 
-    public void settProjectApproval(TProjectApproval tProjectApproval) {
-        this.tProjectApproval = tProjectApproval;
+    public void setInvestigateFlag(String investigateFlag) {
+        this.investigateFlag = investigateFlag;
     }
 
-    public TProjectDecision gettProjectDecision() {
-        return tProjectDecision;
+    public String getDecisionFlag() {
+        return decisionFlag;
     }
 
-    public void settProjectDecision(TProjectDecision tProjectDecision) {
-        this.tProjectDecision = tProjectDecision;
+    public void setDecisionFlag(String decisionFlag) {
+        this.decisionFlag = decisionFlag;
     }
 
     @Override

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

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

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

@@ -82,9 +82,10 @@ public interface ITUnifyFileService
      * 根据附件业务ID()获取附件详情信息列表
      *
      * @param fileBusinessId
+     * @param uploadType
      * @return
      */
-    public List<TUnifyFile> selectTUnifyFileByBusinessIdList(String fileBusinessId);
+    public List<TUnifyFile> selectTUnifyFileByBusinessIdList(String fileBusinessId,String uploadType);
 
     /**
      * 根据fileId()获取项目中所有附件列表

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

@@ -131,8 +131,8 @@ public class TUnifyFileServiceImpl implements ITUnifyFileService
      * @return
      */
     @Override
-    public List<TUnifyFile> selectTUnifyFileByBusinessIdList(String fileBusinessId) {
-        return tUnifyFileMapper.selectTUnifyFileByBusinessIdList(fileBusinessId);
+    public List<TUnifyFile> selectTUnifyFileByBusinessIdList(String fileBusinessId,String uploadType) {
+        return tUnifyFileMapper.selectTUnifyFileByBusinessIdList(fileBusinessId,uploadType);
     }
 
     /**

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

@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where project_pool_id = #{id}
+        where project_pool_id = #{projectPoolId}
     </update>
 
     <delete id="deleteTProjectCompanyById" parameterType="String">

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

@@ -128,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTUnifyFileByBusinessIdList" parameterType="String" resultMap="TUnifyFileResult">
         <include refid="selectTUnifyFileVo"/>
         where file_business_id = #{fileBusinessId} and del_flag = 0
+        <if test="uploadType != null  and uploadType != ''"> and upload_type = #{uploadType}</if>
     </select>
 
     <select id="listFileId" parameterType="String" resultMap="TUnifyFileResult">