11482-【CR】【投资系统】增加审批流程-流程中需要查询的信息

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

@@ -1,6 +1,7 @@
 package com.ruoyi.invest.domain;
 
 import com.ruoyi.tool.domain.TUnifyFile;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,6 +15,7 @@ import java.util.List;
  * @author zjc
  * @date 2024-04-02
  */
+@Data
 public class TProjectApproval extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -26,6 +28,7 @@ public class TProjectApproval extends BaseEntity
     private String projectPoolId;
 
     /** 项目名称 */
+    @Excel(name = "项目名称")
     private String projectName;
 
     /** 项目概况 */
@@ -50,6 +53,13 @@ public class TProjectApproval extends BaseEntity
      */
     private List<TUnifyFile> listFile;
 
+
+    private String procInstId;//流程实例Id
+    private String taskName;
+    private String taskDefKey;
+
+    private boolean flag; // true - 同意; false - 驳回
+
     public void setId(String id) 
     {
         this.id = id;

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

@@ -6,6 +6,7 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.tool.domain.TUnifyFile;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -17,6 +18,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-02-21
  */
+@Data
 public class TProjectPool extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -25,6 +27,8 @@ public class TProjectPool extends BaseEntity
     @ApiModelProperty("主键id")
     private String id;
 
+    private String procInstId;
+
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String projectName;
@@ -215,6 +219,15 @@ public class TProjectPool extends BaseEntity
      */
     private String decisionFlag;
 
+    private int status;//流程状态（ //0暂存1已提交2流程中3已完成4关闭）
+    //表外
+    private boolean flag; // true - 同意; false - 驳回
+
+
+    private String taskId;//任务节点编号
+    private String taskDefKey;
+
+
 
     public void setId(String id) 
     {
@@ -230,6 +243,14 @@ public class TProjectPool extends BaseEntity
         this.projectName = projectName;
     }
 
+    public String getProcInstId() {
+        return procInstId;
+    }
+
+    public void setProcInstId(String procInstId) {
+        this.procInstId = procInstId;
+    }
+
     public String getProjectName()
     {
         return projectName;

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -115,4 +115,11 @@ public interface SysDeptMapper
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+    /**
+     * 次询部门管理信息
+     *
+     * @param deptName 部门名称
+     * @return 结果
+     */
+    String selectDeptLeader(String deptName);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -50,6 +50,13 @@ public interface SysUserMapper
      * @return 用户对象信息
      */
     public SysUser selectUserById(Long userId);
+    /**
+     * 通过部门名称查询用户
+     *
+     * @param deptName 部门名称
+     * @return 用户对象信息
+     */
+    List<SysUser> selectUserByDeptName(String deptName);
 
     /**
      * 新增用户信息

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -66,6 +66,8 @@ public interface ISysUserService
      */
     public String selectUserPostGroup(String userName);
 
+    List<SysUser> selectUserByDeptName(String deptName);
+
     /**
      * 校验用户名称是否唯一
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -160,6 +160,16 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
     }
+    /**
+     * 通过部门名称查询用户
+     *
+     * @param deptName 部门名称
+     * @return 用户对象信息
+     */
+    @Override
+    public List<SysUser> selectUserByDeptName(String deptName){
+        return userMapper.selectUserByDeptName(deptName);
+    }
 
     /**
      * 校验用户名称是否唯一

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

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TProjectApproval" id="TProjectApprovalResult">
         <result property="id"    column="id"    />
+        <result property="procInstId" column="proc_inst_id"/>
         <result property="projectPoolId"    column="project_pool_id"    />
         <result property="projectOverview"    column="project_overview"    />
         <result property="projectSparkle"    column="project_sparkle"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        select id, proc_inst_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">
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_project_approval
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="procInstId != null">proc_inst_id,</if>
             <if test="projectPoolId != null">project_pool_id,</if>
             <if test="projectOverview != null">project_overview,</if>
             <if test="projectSparkle != null">project_sparkle,</if>
@@ -55,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="procInstId != null">#{procInstId},</if>
             <if test="projectPoolId != null">#{projectPoolId},</if>
             <if test="projectOverview != null">#{projectOverview},</if>
             <if test="projectSparkle != null">#{projectSparkle},</if>

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -155,5 +155,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteDeptById" parameterType="Long">
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
+	<select id="selectDeptLeader" resultType="java.lang.String" parameterType="String">
+		select
+			leader
+		from
+			sys_dept
+		where dept_name=#{deptName}
+		and status=0 and del_flag=0
+	</select>
+
 
 </mapper> 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+		where u.user_id = #{userId} and u.del_flag = '0'
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -145,6 +145,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
+
+	<select id="selectUserByDeptName" parameterType="java.lang.String" resultMap="SysUserResult">
+		SELECT
+			u.*
+		FROM sys_user u
+		LEFT JOIN sys_dept d ON u.dept_id=d.dept_id
+		WHERE d.dept_name like concat('%',#{deptName},'%')
+		  and d.status=0 and d.del_flag=0
+	</select>
 	
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(

ruoyi-ui/src/api/invest/pool.js

@@ -124,7 +124,7 @@ export function delInvestReview(id) {
     method: 'delete'
   })
 }
-//查询评审记录列表 
+//查询评审记录列表
 export function getInvestReviewList(id) {
   return request({
     url: '/invest/review/list',
@@ -273,4 +273,4 @@ export function getDecisionNumber() {
     url: '/invest/pool/getDecisionNumber',
     method: 'get'
   })
-}
+}

ruoyi-ui/src/views/invest/components/poolForm.vue

@@ -1026,4 +1026,5 @@ export default {
 //   width: 100%;
 //   height: 120%;
 // }
-</style>
+</style>
+