增加立项申请表代码

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

@@ -0,0 +1,148 @@
+package com.ruoyi.web.controller.invest;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.enums.FileType;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.tool.domain.TUnifyFile;
+import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.invest.domain.TProjectApproval;
+import com.ruoyi.invest.service.ITProjectApprovalService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 立项申请Controller
+ * 
+ * @author zjc
+ * @date 2024-04-02
+ */
+@Api(tags = "立项申请")
+@RestController
+@RequestMapping("/invest/approval")
+public class TProjectApprovalController extends BaseController
+{
+    @Autowired
+    private ITProjectApprovalService tProjectApprovalService;
+
+    @Autowired
+    private ITUnifyFileService tUnifyFileService;
+
+    /**
+     * 查询立项申请列表
+     */
+    @ApiOperation("查询立项申请列表")
+    @PreAuthorize("@ss.hasPermi('invest:approval:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProjectApproval tProjectApproval)
+    {
+        startPage();
+        List<TProjectApproval> list = tProjectApprovalService.selectTProjectApprovalList(tProjectApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出立项申请列表
+     */
+    @ApiOperation("导出立项申请列表")
+    @PreAuthorize("@ss.hasPermi('invest:approval:export')")
+    @Log(title = "立项申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TProjectApproval tProjectApproval)
+    {
+        List<TProjectApproval> list = tProjectApprovalService.selectTProjectApprovalList(tProjectApproval);
+        ExcelUtil<TProjectApproval> util = new ExcelUtil<TProjectApproval>(TProjectApproval.class);
+        util.exportExcel(response, list, "立项申请数据");
+    }
+
+    /**
+     * 获取立项申请详细信息
+     */
+    @ApiOperation("获取立项申请详细信息")
+    @PreAuthorize("@ss.hasPermi('invest:approval:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tProjectApprovalService.selectTProjectApprovalById(id));
+    }
+
+    /**
+     * 新增立项申请
+     */
+    @ApiOperation("新增立项申请")
+    @PreAuthorize("@ss.hasPermi('invest:approval:add')")
+    @Log(title = "立项申请", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProjectApproval tProjectApproval)
+    {
+        tProjectApproval.setId(IdUtils.fastSimpleUUID());
+        // todo 保存立项资料
+        List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
+        if(!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);
+            }
+        }
+        return toAjax(tProjectApprovalService.insertTProjectApproval(tProjectApproval));
+    }
+
+    /**
+     * 修改立项申请
+     */
+    @ApiOperation("修改立项申请")
+    @PreAuthorize("@ss.hasPermi('invest:approval:edit')")
+    @Log(title = "立项申请", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProjectApproval tProjectApproval)
+    {
+        // todo 保存立项资料
+        List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
+        if(!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);
+                }
+            }
+        }
+        return toAjax(tProjectApprovalService.updateTProjectApproval(tProjectApproval));
+    }
+
+    /**
+     * 删除立项申请
+     */
+    @ApiOperation("删除立项申请")
+    @PreAuthorize("@ss.hasPermi('invest:approval:remove')")
+    @Log(title = "立项申请", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tProjectApprovalService.deleteTProjectApprovalByIds(ids));
+    }
+}

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

@@ -60,7 +60,6 @@ public class TProjectChannelController extends BaseController
      * 查询渠道信息列表
      */
     @ApiOperation("查询渠道信息列表")
-    @PreAuthorize("@ss.hasPermi('invest:channel:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectChannel tProjectChannel)
     {

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

@@ -166,7 +166,7 @@ public class TProjectInvestigateController extends BaseController
         {
             return error("查询尽调数据失败，请提供项目ID！");
         }
-        TProjectInvestigate tProjectInvestigate = tProjectInvestigateService.listProjectPoolId(projectPoolId);
+        List<TProjectInvestigate> tProjectInvestigate = tProjectInvestigateService.listProjectPoolId(projectPoolId);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("tProjectInvestigate", tProjectInvestigate);
         return ajax;

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

@@ -15,10 +15,7 @@ import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectCompany;
 import com.ruoyi.invest.domain.TProjectContacts;
 import com.ruoyi.invest.domain.TProjectPool;
-import com.ruoyi.invest.service.ITProjectCirculationService;
-import com.ruoyi.invest.service.ITProjectCompanyService;
-import com.ruoyi.invest.service.ITProjectContactsService;
-import com.ruoyi.invest.service.ITProjectPoolService;
+import com.ruoyi.invest.service.*;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
@@ -71,6 +68,12 @@ public class TProjectPoolController extends BaseController
     @Autowired
     private ISysDictDataService dictDataService;
 
+    @Autowired
+    private ITProjectMeetingService tProjectMeetingService;
+
+    @Autowired
+    private ITProjectInvestigateService tProjectInvestigateService;
+
     /**
      * 查询项目池列表
      */
@@ -84,6 +87,70 @@ public class TProjectPoolController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询评估考察列表
+     */
+    @ApiOperation("查询评估考察列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listReview")
+    public TableDataInfo listReview(TProjectPool tProjectPool)
+    {
+        startPage();
+        tProjectPool.setCreateBy(getUserId().toString());
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolReviewList(tProjectPool);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询项目立项列表
+     */
+    @ApiOperation("查询项目立项列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listApproval")
+    public TableDataInfo listApproval(TProjectPool tProjectPool)
+    {
+        startPage();
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+                    n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));
+
+                    return n;
+                }).collect(Collectors.toList());
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询尽职背调列表
+     */
+    @ApiOperation("查询尽职背调列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listInvestigate")
+    public TableDataInfo listInvestigate(TProjectPool tProjectPool)
+    {
+        startPage();
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+            n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
+            return n;
+        }).collect(Collectors.toList());
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询项目投决列表
+     */
+    @ApiOperation("查询项目投决列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listDecision")
+    public TableDataInfo listDecision(TProjectPool tProjectPool)
+    {
+        startPage();
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+            n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
+            return n;
+        }).collect(Collectors.toList());
+        return getDataTable(list);
+    }
+
+
     /**
      * 导出项目池列表
      */
@@ -227,6 +294,32 @@ public class TProjectPoolController extends BaseController
                 }
             }
         }
+        // todo 保存BP附件信息
+        List<TUnifyFile> bpFileList = tProjectPool.getBpFile();
+        if(!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);
+                }
+            }
+        }
+        // todo 保存其他附件信息
+        List<TUnifyFile> otherFileList = tProjectPool.getOtherFile();
+        if(!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);
+                }
+            }
+        }
         tProjectCompanyService.updateTProjectCompany(tProjectCompany);
         tProjectContactsService.updateTProjectContacts(tProjectContacts);
         return toAjax(tProjectPoolService.updateTProjectPool(tProjectPool));

ruoyi-common/src/main/java/com/ruoyi/common/enums/FileType.java

@@ -46,4 +46,8 @@ public enum FileType {
      * BP附件类型
      */
     BP,
+    /**
+     * 立项资料
+     */
+    APPROVAL,
 }

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

@@ -0,0 +1,135 @@
+package com.ruoyi.invest.domain;
+
+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.List;
+
+/**
+ * 立项申请对象 t_project_approval
+ * 
+ * @author zjc
+ * @date 2024-04-02
+ */
+public class TProjectApproval extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private String projectPoolId;
+
+    /** 项目概况 */
+    @Excel(name = "项目概况")
+    private String projectOverview;
+
+    /** 项目亮点 */
+    @Excel(name = "项目亮点")
+    private String projectSparkle;
+
+    /** 参与人 */
+    private String participants;
+
+    /** 参与人ID */
+    private String participantsId;
+
+    /** 状态 */
+    private String delFlag;
+
+    /**
+     * 附件信息
+     */
+    private List<TUnifyFile> listFile;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setProjectOverview(String projectOverview) 
+    {
+        this.projectOverview = projectOverview;
+    }
+
+    public String getProjectOverview() 
+    {
+        return projectOverview;
+    }
+    public void setProjectSparkle(String projectSparkle) 
+    {
+        this.projectSparkle = projectSparkle;
+    }
+
+    public String getProjectSparkle() 
+    {
+        return projectSparkle;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    public List<TUnifyFile> getListFile() {
+        return listFile;
+    }
+
+    public void setListFile(List<TUnifyFile> listFile) {
+        this.listFile = listFile;
+    }
+
+    public String getParticipants() {
+        return participants;
+    }
+
+    public void setParticipants(String participants) {
+        this.participants = participants;
+    }
+
+    public String getParticipantsId() {
+        return participantsId;
+    }
+
+    public void setParticipantsId(String participantsId) {
+        this.participantsId = participantsId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectPoolId", getProjectPoolId())
+            .append("projectOverview", getProjectOverview())
+            .append("projectSparkle", getProjectSparkle())
+            .append("remark", getRemark())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -147,6 +147,18 @@ public class TProjectPool extends BaseEntity
     /** 渠道信息 */
     private TProjectChannel tProjectChannel;
 
+    /** 评审信息 */
+    private TProjectReview tProjectReview;
+
+    /** 会议信息 */
+    private TProjectMeeting tProjectMeeting;
+
+    /** 尽调信息 */
+    private TProjectInvestigate tProjectInvestigate;
+
+    /** 立项申请 */
+    private TProjectApproval tProjectApproval;
+
     /**
      * 附件信息
      */
@@ -508,6 +520,38 @@ public class TProjectPool extends BaseEntity
         this.otherFile = otherFile;
     }
 
+    public TProjectReview gettProjectReview() {
+        return tProjectReview;
+    }
+
+    public void settProjectReview(TProjectReview tProjectReview) {
+        this.tProjectReview = tProjectReview;
+    }
+
+    public TProjectMeeting gettProjectMeeting() {
+        return tProjectMeeting;
+    }
+
+    public void settProjectMeeting(TProjectMeeting tProjectMeeting) {
+        this.tProjectMeeting = tProjectMeeting;
+    }
+
+    public TProjectInvestigate gettProjectInvestigate() {
+        return tProjectInvestigate;
+    }
+
+    public void settProjectInvestigate(TProjectInvestigate tProjectInvestigate) {
+        this.tProjectInvestigate = tProjectInvestigate;
+    }
+
+    public TProjectApproval gettProjectApproval() {
+        return tProjectApproval;
+    }
+
+    public void settProjectApproval(TProjectApproval tProjectApproval) {
+        this.tProjectApproval = tProjectApproval;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -0,0 +1,61 @@
+package com.ruoyi.invest.mapper;
+
+import java.util.List;
+import com.ruoyi.invest.domain.TProjectApproval;
+
+/**
+ * 立项申请Mapper接口
+ * 
+ * @author zjc
+ * @date 2024-04-02
+ */
+public interface TProjectApprovalMapper 
+{
+    /**
+     * 查询立项申请
+     * 
+     * @param id 立项申请主键
+     * @return 立项申请
+     */
+    public TProjectApproval selectTProjectApprovalById(String id);
+
+    /**
+     * 查询立项申请列表
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 立项申请集合
+     */
+    public List<TProjectApproval> selectTProjectApprovalList(TProjectApproval tProjectApproval);
+
+    /**
+     * 新增立项申请
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 结果
+     */
+    public int insertTProjectApproval(TProjectApproval tProjectApproval);
+
+    /**
+     * 修改立项申请
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 结果
+     */
+    public int updateTProjectApproval(TProjectApproval tProjectApproval);
+
+    /**
+     * 删除立项申请
+     * 
+     * @param id 立项申请主键
+     * @return 结果
+     */
+    public int deleteTProjectApprovalById(String id);
+
+    /**
+     * 批量删除立项申请
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTProjectApprovalByIds(String[] ids);
+}

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

@@ -71,7 +71,7 @@ public interface TProjectInvestigateMapper
      * @param projectPoolId
      * @return
      */
-    TProjectInvestigate listProjectPoolId(String projectPoolId);
+    List<TProjectInvestigate> listProjectPoolId(String projectPoolId);
 
     /**
      * 修改尽调完成
@@ -79,4 +79,11 @@ public interface TProjectInvestigateMapper
      * @return
      */
     int editStatus(String id);
+
+    /**
+     * 根据项目ID获取最新尽调数据
+     * @param projectPoolId
+     * @return
+     */
+    TProjectInvestigate listProjectPoolIdNew(String projectPoolId);
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.invest.mapper;
 
 import com.ruoyi.invest.domain.TProjectMeeting;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -75,10 +76,19 @@ public interface TProjectMeetingMapper
      */
     List<TProjectMeeting> listProjectPoolId(String projectPoolId);
 
+    /**
+     * 根据项目ID获取最新会议记录
+     * @param projectPoolId
+     * @param meetingType
+     * @return
+     */
+    TProjectMeeting listProjectPoolIdNew(@Param("projectPoolId")String projectPoolId,@Param("meetingType") String meetingType);
+
     /**
      *  根据年查询会议编号
      * @param year
      * @return
      */
     Integer selectTProjectMeetingCode(String year);
+
 }

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

@@ -74,4 +74,12 @@ public interface TProjectPoolMapper
      * @return
      */
     int selectTProjectPoolCode(String year);
+
+    /**
+     * 查询评估考察列表
+     * @param tProjectPool
+     * @return
+     */
+    List<TProjectPool> selectTProjectPoolReviewList(TProjectPool tProjectPool);
+
 }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.invest.service;
+
+import java.util.List;
+import com.ruoyi.invest.domain.TProjectApproval;
+
+/**
+ * 立项申请Service接口
+ * 
+ * @author zjc
+ * @date 2024-04-02
+ */
+public interface ITProjectApprovalService 
+{
+    /**
+     * 查询立项申请
+     * 
+     * @param id 立项申请主键
+     * @return 立项申请
+     */
+    public TProjectApproval selectTProjectApprovalById(String id);
+
+    /**
+     * 查询立项申请列表
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 立项申请集合
+     */
+    public List<TProjectApproval> selectTProjectApprovalList(TProjectApproval tProjectApproval);
+
+    /**
+     * 新增立项申请
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 结果
+     */
+    public int insertTProjectApproval(TProjectApproval tProjectApproval);
+
+    /**
+     * 修改立项申请
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 结果
+     */
+    public int updateTProjectApproval(TProjectApproval tProjectApproval);
+
+    /**
+     * 批量删除立项申请
+     * 
+     * @param ids 需要删除的立项申请主键集合
+     * @return 结果
+     */
+    public int deleteTProjectApprovalByIds(String[] ids);
+
+    /**
+     * 删除立项申请信息
+     * 
+     * @param id 立项申请主键
+     * @return 结果
+     */
+    public int deleteTProjectApprovalById(String id);
+}

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

@@ -71,7 +71,14 @@ public interface ITProjectInvestigateService
      * @param projectPoolId
      * @return
      */
-    TProjectInvestigate listProjectPoolId(String projectPoolId);
+    List<TProjectInvestigate> listProjectPoolId(String projectPoolId);
+
+    /**
+     * 根据项目ID获取最新尽调
+     * @param projectPoolId
+     * @return
+     */
+    TProjectInvestigate listProjectPoolIdNew(String projectPoolId);
 
     /**
      * 修改尽调完成

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

@@ -75,6 +75,15 @@ public interface ITProjectMeetingService
      */
     public List<TProjectMeeting> listProjectPoolId(String projectPoolId);
 
+    /**
+     * 根据项目ID获取最新会议记录
+     * @param projectPoolId
+     * @param meetingType
+     * @return
+     */
+    public TProjectMeeting listProjectPoolIdNew(String projectPoolId,String meetingType);
+
+
     /**
      * 根据年查询会议编号
      * @param year

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

@@ -75,4 +75,10 @@ public interface ITProjectPoolService
      */
     int selectTProjectPoolCode(String year);
 
+    /**
+     * 查询评估考察列表
+     * @param tProjectPool
+     * @return
+     */
+    List<TProjectPool> selectTProjectPoolReviewList(TProjectPool tProjectPool);
 }

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

@@ -0,0 +1,97 @@
+package com.ruoyi.invest.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.invest.mapper.TProjectApprovalMapper;
+import com.ruoyi.invest.domain.TProjectApproval;
+import com.ruoyi.invest.service.ITProjectApprovalService;
+
+/**
+ * 立项申请Service业务层处理
+ * 
+ * @author zjc
+ * @date 2024-04-02
+ */
+@Service
+public class TProjectApprovalServiceImpl implements ITProjectApprovalService 
+{
+    @Autowired
+    private TProjectApprovalMapper tProjectApprovalMapper;
+
+    /**
+     * 查询立项申请
+     * 
+     * @param id 立项申请主键
+     * @return 立项申请
+     */
+    @Override
+    public TProjectApproval selectTProjectApprovalById(String id)
+    {
+        return tProjectApprovalMapper.selectTProjectApprovalById(id);
+    }
+
+    /**
+     * 查询立项申请列表
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 立项申请
+     */
+    @Override
+    public List<TProjectApproval> selectTProjectApprovalList(TProjectApproval tProjectApproval)
+    {
+        return tProjectApprovalMapper.selectTProjectApprovalList(tProjectApproval);
+    }
+
+    /**
+     * 新增立项申请
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectApproval(TProjectApproval tProjectApproval)
+    {
+        tProjectApproval.setCreateTime(DateUtils.getNowDate());
+        return tProjectApprovalMapper.insertTProjectApproval(tProjectApproval);
+    }
+
+    /**
+     * 修改立项申请
+     * 
+     * @param tProjectApproval 立项申请
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectApproval(TProjectApproval tProjectApproval)
+    {
+        tProjectApproval.setUpdateTime(DateUtils.getNowDate());
+        return tProjectApprovalMapper.updateTProjectApproval(tProjectApproval);
+    }
+
+    /**
+     * 批量删除立项申请
+     * 
+     * @param ids 需要删除的立项申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectApprovalByIds(String[] ids)
+    {
+        return tProjectApprovalMapper.deleteTProjectApprovalByIds(ids);
+    }
+
+    /**
+     * 删除立项申请信息
+     * 
+     * @param id 立项申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectApprovalById(String id)
+    {
+        return tProjectApprovalMapper.deleteTProjectApprovalById(id);
+    }
+}

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

@@ -111,10 +111,20 @@ public class TProjectInvestigateServiceImpl implements ITProjectInvestigateServi
      * @return
      */
     @Override
-    public TProjectInvestigate listProjectPoolId(String projectPoolId) {
+    public List<TProjectInvestigate> listProjectPoolId(String projectPoolId) {
         return tProjectInvestigateMapper.listProjectPoolId(projectPoolId);
     }
 
+    /**
+     * 根据项目ID获取最新尽调数据
+     * @param projectPoolId
+     * @return
+     */
+    @Override
+    public TProjectInvestigate listProjectPoolIdNew(String projectPoolId) {
+        return tProjectInvestigateMapper.listProjectPoolIdNew(projectPoolId);
+    }
+
     /**
      * 修改尽调完成
      * @param id

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

@@ -115,6 +115,17 @@ public class TProjectMeetingServiceImpl implements ITProjectMeetingService
         return tProjectMeetingMapper.listProjectPoolId(projectPoolId);
     }
 
+    /**
+     * 根据项目ID获取最新会议记录
+     * @param projectPoolId
+     * @param meetingType
+     * @return
+     */
+    @Override
+    public TProjectMeeting listProjectPoolIdNew(String projectPoolId,String meetingType) {
+        return tProjectMeetingMapper.listProjectPoolIdNew(projectPoolId,meetingType);
+    }
+
     /**
      * 根据年查询会议编号
      * @param year

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

@@ -116,4 +116,15 @@ public class TProjectPoolServiceImpl implements ITProjectPoolService
     public int selectTProjectPoolCode(String year) {
         return tProjectPoolMapper.selectTProjectPoolCode(year);
     }
+
+    /**
+     * 查询评估考察列表
+     * @param tProjectPool
+     * @return
+     */
+    @Override
+    public List<TProjectPool> selectTProjectPoolReviewList(TProjectPool tProjectPool) {
+        return tProjectPoolMapper.selectTProjectPoolReviewList(tProjectPool);
+    }
+
 }

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

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectApprovalMapper">
+    
+    <resultMap type="TProjectApproval" id="TProjectApprovalResult">
+        <result property="id"    column="id"    />
+        <result property="projectPoolId"    column="project_pool_id"    />
+        <result property="projectOverview"    column="project_overview"    />
+        <result property="projectSparkle"    column="project_sparkle"    />
+        <result property="participantsId"    column="participants_id"    />
+        <result property="participants"    column="participants"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTProjectApprovalVo">
+        select id, project_pool_id, project_overview, project_sparkle, participants_id, participants, remark, del_flag, create_by, create_time, update_by, update_time from t_project_approval
+    </sql>
+
+    <select id="selectTProjectApprovalList" parameterType="TProjectApproval" resultMap="TProjectApprovalResult">
+        <include refid="selectTProjectApprovalVo"/>
+        <where>  
+            <if test="projectPoolId != null  and projectPoolId != ''"> and project_pool_id = #{projectPoolId}</if>
+            <if test="projectOverview != null  and projectOverview != ''"> and project_overview = #{projectOverview}</if>
+            <if test="projectSparkle != null  and projectSparkle != ''"> and project_sparkle = #{projectSparkle}</if>
+        </where>
+    </select>
+    
+    <select id="selectTProjectApprovalById" parameterType="String" resultMap="TProjectApprovalResult">
+        <include refid="selectTProjectApprovalVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTProjectApproval" parameterType="TProjectApproval">
+        insert into t_project_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="projectPoolId != null">project_pool_id,</if>
+            <if test="projectOverview != null">project_overview,</if>
+            <if test="projectSparkle != null">project_sparkle,</if>
+            <if test="participantsId != null">participants_id,</if>
+            <if test="participants != null">participants,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="projectPoolId != null">#{projectPoolId},</if>
+            <if test="projectOverview != null">#{projectOverview},</if>
+            <if test="projectSparkle != null">#{projectSparkle},</if>
+            <if test="participantsId != null">#{participantsId},</if>
+            <if test="participants != null">#{participants},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTProjectApproval" parameterType="TProjectApproval">
+        update t_project_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectPoolId != null">project_pool_id = #{projectPoolId},</if>
+            <if test="projectOverview != null">project_overview = #{projectOverview},</if>
+            <if test="projectSparkle != null">project_sparkle = #{projectSparkle},</if>
+            <if test="participantsId != null">participants_id = #{participantsId},</if>
+            <if test="participants != null">participants = #{participants},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTProjectApprovalById" parameterType="String">
+        delete from t_project_approval where id = #{id}
+    </delete>
+
+    <delete id="deleteTProjectApprovalByIds" parameterType="String">
+        delete from t_project_approval where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -128,6 +128,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where project_pool_id = #{projectPoolId} and del_flag = 0
     </select>
 
+    <select id="listProjectPoolIdNew" parameterType="String" resultMap="TProjectInvestigateResult">
+        <include refid="selectTProjectInvestigateVo"/>
+        where project_pool_id = #{projectPoolId} and del_flag = 0
+        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/TProjectMeetingMapper.xml

@@ -152,6 +152,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.project_pool_id = #{projectPoolId} and a.del_flag = 0
     </select>
 
+    <select id="listProjectPoolIdNew" parameterType="String" resultMap="TProjectMeetingResult">
+        <include refid="selectTProjectMeetingVo"/>
+        where a.project_pool_id = #{projectPoolId} and a.meeting_type = #{meetingType} and a.del_flag = 0
+        ORDER BY a.create_time DESC LIMIT 1
+    </select>
+
     <select id="selectTProjectMeetingCode" parameterType="String" resultType="java.lang.Integer">
         select count(*) from t_project_meeting
         where meeting_code like concat('%', #{year}, '%')