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/TProjectCirculationController.java

@@ -112,4 +112,16 @@ public class TProjectCirculationController extends BaseController
     {
         return toAjax(tProjectCirculationService.deleteTProjectCirculationByIds(ids));
     }
+
+    /**
+     * 根据项目ID获取会议记录
+     */
+    @ApiOperation("根据项目ID获取项目流转记录")
+    @PreAuthorize("@ss.hasPermi('invest:circulation:query')")
+    @GetMapping(value = "/listProjectPoolId")
+    public AjaxResult listProjectPoolId(String projectPoolId)
+    {
+        return success(tProjectCirculationService.listProjectPoolId(projectPoolId));
+    }
+
 }

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

@@ -9,6 +9,8 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -48,10 +50,10 @@ public class TProjectContractController extends BaseController
     private ITProjectContractService tProjectContractService;
 
     @Autowired
-    private ITUnifyFileService tUnifyFileService;
+    private ITProjectCirculationService tProjectCirculationService;
 
     @Autowired
-    private ServerConfig serverConfig;
+    private ITUnifyFileService tUnifyFileService;
 
     /**
      * 查询合同管理列表
@@ -114,6 +116,14 @@ public class TProjectContractController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+
+        // todo 增加合同创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectContract.getProjectPoolId());
+        tProjectCirculation.setStageName(tProjectContract.getContractName()+"(合同)");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectContractService.insertTProjectContract(tProjectContract));
     }
 

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

@@ -9,7 +9,9 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectInformation;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectInformationService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
@@ -48,10 +50,10 @@ public class TProjectInformationController extends BaseController
     private ITProjectInformationService tProjectInformationService;
 
     @Autowired
-    private ITUnifyFileService tUnifyFileService;
+    private ITProjectCirculationService tProjectCirculationService;
 
     @Autowired
-    private ServerConfig serverConfig;
+    private ITUnifyFileService tUnifyFileService;
 
     /**
      * 查询文件资料列表
@@ -113,6 +115,14 @@ public class TProjectInformationController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+
+        // todo 增加文件创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectInformation.getProjectPoolId());
+        tProjectCirculation.setStageName(tProjectInformation.getFileName()+"(文件资料)");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectInformationService.insertTProjectInformation(tProjectInformation));
     }
 

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

@@ -11,7 +11,9 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectMeeting;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectMeetingService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
@@ -49,6 +51,9 @@ public class TProjectMeetingController extends BaseController
     @Autowired
     private ITProjectMeetingService tProjectMeetingService;
 
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
@@ -119,6 +124,14 @@ public class TProjectMeetingController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+
+        // todo 增加会议创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectMeeting.getProjectPoolId());
+        tProjectCirculation.setStageName(tProjectMeeting.getMeetingTheme()+"(会议)");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectMeetingService.insertTProjectMeeting(tProjectMeeting));
     }
 

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

@@ -208,6 +208,7 @@ public class TProjectPoolController extends BaseController
         // todo 增加项目创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
         tProjectCirculation.setProjectPoolId(tProjectPool.getId());
+        tProjectCirculation.setStageName(tProjectPool.getStageName());
         tProjectCirculation.setCreateBy(getNickName());
         tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
 

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

@@ -9,7 +9,9 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectRecord;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectRecordService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
@@ -48,10 +50,10 @@ public class TProjectRecordController extends BaseController
     private ITProjectRecordService tProjectRecordService;
 
     @Autowired
-    private ITUnifyFileService tUnifyFileService;
+    private ITProjectCirculationService tProjectCirculationService;
 
     @Autowired
-    private ServerConfig serverConfig;
+    private ITUnifyFileService tUnifyFileService;
 
     /**
      * 查询跟进记录列表
@@ -113,6 +115,14 @@ public class TProjectRecordController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+
+        // todo 增加跟进记录创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectRecord.getProjectId());
+        tProjectCirculation.setStageName(tProjectRecord.getUpPerson()+"(跟进记录)");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectRecordService.insertTProjectRecord(tProjectRecord));
     }
 

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

@@ -52,6 +52,11 @@ public class TProjectContract extends BaseEntity
      */
     private List<TUnifyFile> listFile;
 
+    /**
+     * 项目池
+     */
+    private TProjectPool tProjectPool;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -133,6 +138,14 @@ public class TProjectContract extends BaseEntity
         this.listFile = listFile;
     }
 
+    public TProjectPool gettProjectPool() {
+        return tProjectPool;
+    }
+
+    public void settProjectPool(TProjectPool tProjectPool) {
+        this.tProjectPool = tProjectPool;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -56,9 +56,16 @@ public class TProjectMeeting extends BaseEntity
     @Excel(name = "会议发起人")
     private String promoter;
 
+    /** 会议发起人ID */
+    @Excel(name = "会议发起人")
+    private String promoterId;
+
     /** 会议参与人 */
     private String participants;
 
+    /** 会议参与人ID */
+    private String participantsId;
+
     /** 状态 */
     private String delFlag;
 
@@ -199,6 +206,22 @@ public class TProjectMeeting extends BaseEntity
         this.projectGroup = projectGroup;
     }
 
+    public String getPromoterId() {
+        return promoterId;
+    }
+
+    public void setPromoterId(String promoterId) {
+        this.promoterId = promoterId;
+    }
+
+    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)

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

@@ -26,6 +26,9 @@ public class TProjectScoring extends BaseEntity
     @Excel(name = "投资总监")
     private String investCommissioner;
 
+    /** 会议ID */
+    private String meetingId;
+
     /** 打分人 */
     @Excel(name = "打分人")
     private String scoringPerson;
@@ -452,6 +455,14 @@ public class TProjectScoring extends BaseEntity
         return delFlag;
     }
 
+    public String getMeetingId() {
+        return meetingId;
+    }
+
+    public void setMeetingId(String meetingId) {
+        this.meetingId = meetingId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -59,4 +59,11 @@ public interface TProjectCirculationMapper
      * @return 结果
      */
     public int deleteTProjectCirculationByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取项目流转记录
+     * @param projectPoolId
+     * @return
+     */
+    List<TProjectCirculation> listProjectPoolId(String projectPoolId);
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.invest.service;
 
 import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.domain.TProjectMeeting;
 
 import java.util.List;
 
@@ -59,4 +60,11 @@ public interface ITProjectCirculationService
      * @return 结果
      */
     public int deleteTProjectCirculationById(String id);
+
+    /**
+     * 根据项目ID获取项目流转记录
+     * @param projectPoolId
+     * @return
+     */
+    List<TProjectCirculation> listProjectPoolId(String projectPoolId);
 }

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

@@ -94,4 +94,14 @@ public class TProjectCirculationServiceImpl implements ITProjectCirculationServi
     {
         return tProjectCirculationMapper.deleteTProjectCirculationById(id);
     }
+
+    /**
+     * 根据项目ID获取项目流转记录
+     * @param projectPoolId
+     * @return
+     */
+    @Override
+    public List<TProjectCirculation> listProjectPoolId(String projectPoolId) {
+        return tProjectCirculationMapper.listProjectPoolId(projectPoolId);
+    }
 }

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

@@ -68,4 +68,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="listProjectPoolId" parameterType="String" resultMap="TProjectCirculationResult">
+        <include refid="selectTProjectCirculationVo"/>
+        where project_pool_id = #{projectPoolId}
+    </select>
+
 </mapper>

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

@@ -18,26 +18,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <association property="tProjectPool" javaType="TProjectPool"  resultMap="TProjectPoolResult" />
+    </resultMap>
+
+    <resultMap type="TProjectPool" id="TProjectPoolResult">
+        <result property="projectName"    column="project_name"    />
+        <result property="projectStage"    column="project_stage"    />
+        <result property="projectState"    column="project_state"    />
+        <result property="projectGroup"    column="project_group"    />
+        <result property="projectCode"    column="project_code"    />
     </resultMap>
 
     <sql id="selectTProjectContractVo">
-        select id, contract_name, contract_type, project_pool_id, project_stage, meeting_code, del_flag, file_business_id, remark, create_by, create_time, update_by, update_time from t_project_contract
+        select a.id, a.contract_name, a.contract_type, a.project_pool_id, a.project_stage, a.meeting_code, a.del_flag, a.file_business_id, a.remark, a.create_by, a.create_time, a.update_by, a.update_time,
+                b.project_name, b.project_stage, b.project_state, b.project_group ,b.project_code
+        from t_project_contract a
+             left join t_project_pool b ON a.project_pool_id = b.id
     </sql>
 
     <select id="selectTProjectContractList" parameterType="TProjectContract" resultMap="TProjectContractResult">
         <include refid="selectTProjectContractVo"/>
-        <where>  
-            <if test="contractName != null  and contractName != ''"> and contract_name like concat('%', #{contractName}, '%')</if>
-            <if test="contractType != null  and contractType != ''"> and contract_type = #{contractType}</if>
-            <if test="projectPoolId != null  and projectPoolId != ''"> and project_pool_id = #{projectPoolId}</if>
-            <if test="projectStage != null  and projectStage != ''"> and project_stage = #{projectStage}</if>
-            <if test="meetingCode != null  and meetingCode != ''"> and meeting_code = #{meetingCode}</if>
+        <where>
+            a.del_flag = 0
+            <if test="contractName != null  and contractName != ''"> and a.contract_name like concat('%', #{contractName}, '%')</if>
+            <if test="contractType != null  and contractType != ''"> and a.contract_type = #{contractType}</if>
+            <if test="projectPoolId != null  and projectPoolId != ''"> and a.project_pool_id = #{projectPoolId}</if>
+            <if test="projectStage != null  and projectStage != ''"> and a.project_stage = #{projectStage}</if>
+            <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code = #{meetingCode}</if>
         </where>
     </select>
     
     <select id="selectTProjectContractById" parameterType="String" resultMap="TProjectContractResult">
         <include refid="selectTProjectContractVo"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
         
     <insert id="insertTProjectContract" parameterType="TProjectContract">

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

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.del_flag = 0
             <if test="fileName != null  and fileName != ''"> and a.file_name like concat('%', #{fileName}, '%')</if>
+            <if test="projectPoolId != null  and projectPoolId != ''"> and a.project_pool_id = #{projectPoolId}</if>
             <if test="fileType != null  and fileType != ''"> and a.file_type = #{fileType}</if>
             <if test="projectStage != null  and projectStage != ''"> and a.project_stage = #{projectStage}</if>
             <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code = #{meetingCode}</if>

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

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="place"    column="place"    />
         <result property="promoter"    column="promoter"    />
         <result property="participants"    column="participants"    />
+        <result property="promoterId"    column="promoter_id"    />
+        <result property="participantsId"    column="participants_id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -34,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProjectMeetingVo">
-        select a.id, a.meeting_theme, a.meeting_code, a.meeting_type, a.project_pool_id, a.start_time, a.end_time, a.place, a.promoter, a.participants, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
+        select a.id, a.meeting_theme, a.meeting_code, a.meeting_type, a.project_pool_id, a.start_time, a.end_time, a.place, a.promoter, a.participants, a.promoter_id, a.participants_id,a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
                b.project_name, b.project_stage, b.project_state, b.project_group ,b.project_code
         from t_project_meeting a
              left join t_project_pool b ON a.project_pool_id = b.id
@@ -44,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTProjectMeetingVo"/>
         <where>
             a.del_flag = 0
+            <if test="projectPoolId != null  and projectPoolId != ''"> and a.project_pool_id = #{projectPoolId}</if>
             <if test="meetingTheme != null  and meetingTheme != ''"> and a.meeting_theme = #{meetingTheme}</if>
             <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code = #{meetingCode}</if>
             <if test="meetingType != null  and meetingType != ''"> and a.meeting_type = #{meetingType}</if>
@@ -70,6 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="place != null">place,</if>
             <if test="promoter != null">promoter,</if>
             <if test="participants != null">participants,</if>
+            <if test="promoterId != null">promoter_id,</if>
+            <if test="participantsId != null">participants_id,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -87,6 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="place != null">#{place},</if>
             <if test="promoter != null">#{promoter},</if>
             <if test="participants != null">#{participants},</if>
+            <if test="promoterId != null">#{promoterId},</if>
+            <if test="participantsId != null">#{participantsId},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -107,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="place != null">place = #{place},</if>
             <if test="promoter != null">promoter = #{promoter},</if>
             <if test="participants != null">participants = #{participants},</if>
+            <if test="promoterId != null">promoter_id = #{promoterId},</if>
+            <if test="participantsId != null">participants_id = #{participantsId},</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>