更改流程、添加单价备注表、新增用户字段

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPriceController.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.oa.domain.CmcPriceRemark;
+import com.ruoyi.oa.service.ICmcPriceRemarkService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +40,9 @@ public class CmcPriceController extends BaseController
     @Autowired
     private ICmcPriceService cmcPriceService;
 
+    @Autowired
+    private ICmcPriceRemarkService cmcPriceRemarkService;
+
     /**
      * 查询单价表列表
      */
@@ -70,6 +75,18 @@ public class CmcPriceController extends BaseController
         return AjaxResult.success(cmcPriceService.selectCmcPriceById(id));
     }
 
+    /**
+     * 查询单价备注
+     */
+    @GetMapping("/remark")
+    public AjaxResult getPriceRemarkByWorkType(String workType)
+    {
+        CmcPriceRemark cmcPriceRemark = new CmcPriceRemark();
+        cmcPriceRemark.setWorkType(workType);
+        CmcPriceRemark priceRemark = cmcPriceRemarkService.selectCmcPriceRemarkList(cmcPriceRemark).get(0);
+        return success(priceRemark.getRemark());
+    }
+
     /**
      * 查询工作类别列表
      */

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -119,6 +119,15 @@ public class SysPostController extends BaseController
         return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId()));
     }
 
+    /**
+     * 查询总经理
+     */
+    @GetMapping("/gm")
+    public AjaxResult getGm()
+    {
+        return success(postService.selectGm().getUserId());
+    }
+
     /**
      * 通过deptId获取分管领导
      */

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,6 +86,19 @@ public class SysRoleController extends BaseController
         return success(roleService.selectRoleById(roleId));
     }
 
+    /**
+     * 通过roleId获取用户
+     */
+    @GetMapping("/getUserByRole")
+    public AjaxResult getUserByRole(Long roleId)
+    {
+        List<Long> userIdList = new ArrayList<>();
+        for(SysUserRole sysUserRole : roleService.selectUserById(roleId)) {
+            userIdList.add(sysUserRole.getUserId());
+        }
+        return success(userIdList);
+    }
+
     /**
      * 新增角色
      */

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallArchiveActivityExecutionListener.java

@@ -1,18 +0,0 @@
-package com.ruoyi.flowable.oa;
-
-import org.flowable.common.engine.impl.identity.Authentication;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-@Component("CallArchiveActivityExecutionListener")
-public class CallArchiveActivityExecutionListener implements ExecutionListener {
-    @Override
-    public void notify(DelegateExecution delegateExecution) {
-        Map<String, Object> variables = delegateExecution.getVariables();
-        Authentication.setAuthenticatedUserId(variables.get("archiveInitiator").toString());
-        delegateExecution.setVariable("approval", variables.get("archiveInitiator").toString());
-    }
-}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSafeActivityExecutionListener.java

@@ -1,5 +1,8 @@
 package com.ruoyi.flowable.oa;
 
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
@@ -9,7 +12,8 @@ import org.springframework.stereotype.Component;
 public class CallSafeActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
-        Authentication.setAuthenticatedUserId("15");
-        delegateExecution.setVariable("approval", "15");
+        SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
+        Authentication.setAuthenticatedUserId(userPostMapper.selectSafe().getUserId().toString());
+        delegateExecution.setVariable("approval", userPostMapper.selectSafe().getUserId().toString());
     }
 }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSettleActivityExecutionListener.java

@@ -1,18 +0,0 @@
-package com.ruoyi.flowable.oa;
-
-import org.flowable.common.engine.impl.identity.Authentication;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-@Component("CallSettleActivityExecutionListener")
-public class CallSettleActivityExecutionListener implements ExecutionListener {
-    @Override
-    public void notify(DelegateExecution delegateExecution) {
-        Map<String, Object> variables = delegateExecution.getVariables();
-        Authentication.setAuthenticatedUserId(variables.get("settleInitiator").toString());
-        delegateExecution.setVariable("approval", variables.get("settleInitiator").toString());
-    }
-}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcPriceRemark.java

@@ -0,0 +1,52 @@
+package com.ruoyi.oa.domain;
+
+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;
+
+/**
+ * 单价备注对象 cmc_price_remark
+ * 
+ * @author cmc
+ * @date 2024-05-14
+ */
+public class CmcPriceRemark extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 结算备注id */
+    private Long priceRemarkId;
+
+    /** 工程项目 */
+    @Excel(name = "工程项目")
+    private String workType;
+
+    public void setPriceRemarkId(Long priceRemarkId) 
+    {
+        this.priceRemarkId = priceRemarkId;
+    }
+
+    public Long getPriceRemarkId() 
+    {
+        return priceRemarkId;
+    }
+    public void setWorkType(String workType) 
+    {
+        this.workType = workType;
+    }
+
+    public String getWorkType() 
+    {
+        return workType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("priceRemarkId", getPriceRemarkId())
+            .append("workType", getWorkType())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcPriceRemarkMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcPriceRemark;
+
+/**
+ * 单价备注Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-05-14
+ */
+public interface CmcPriceRemarkMapper 
+{
+    /**
+     * 查询单价备注
+     * 
+     * @param priceRemarkId 单价备注主键
+     * @return 单价备注
+     */
+    public CmcPriceRemark selectCmcPriceRemarkByPriceRemarkId(Long priceRemarkId);
+
+    /**
+     * 查询单价备注列表
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 单价备注集合
+     */
+    public List<CmcPriceRemark> selectCmcPriceRemarkList(CmcPriceRemark cmcPriceRemark);
+
+    /**
+     * 新增单价备注
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 结果
+     */
+    public int insertCmcPriceRemark(CmcPriceRemark cmcPriceRemark);
+
+    /**
+     * 修改单价备注
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 结果
+     */
+    public int updateCmcPriceRemark(CmcPriceRemark cmcPriceRemark);
+
+    /**
+     * 删除单价备注
+     * 
+     * @param priceRemarkId 单价备注主键
+     * @return 结果
+     */
+    public int deleteCmcPriceRemarkByPriceRemarkId(Long priceRemarkId);
+
+    /**
+     * 批量删除单价备注
+     * 
+     * @param priceRemarkIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcPriceRemarkByPriceRemarkIds(Long[] priceRemarkIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcPriceRemarkService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcPriceRemark;
+
+/**
+ * 单价备注Service接口
+ * 
+ * @author cmc
+ * @date 2024-05-14
+ */
+public interface ICmcPriceRemarkService 
+{
+    /**
+     * 查询单价备注
+     * 
+     * @param priceRemarkId 单价备注主键
+     * @return 单价备注
+     */
+    public CmcPriceRemark selectCmcPriceRemarkByPriceRemarkId(Long priceRemarkId);
+
+    /**
+     * 查询单价备注列表
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 单价备注集合
+     */
+    public List<CmcPriceRemark> selectCmcPriceRemarkList(CmcPriceRemark cmcPriceRemark);
+
+    /**
+     * 新增单价备注
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 结果
+     */
+    public int insertCmcPriceRemark(CmcPriceRemark cmcPriceRemark);
+
+    /**
+     * 修改单价备注
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 结果
+     */
+    public int updateCmcPriceRemark(CmcPriceRemark cmcPriceRemark);
+
+    /**
+     * 批量删除单价备注
+     * 
+     * @param priceRemarkIds 需要删除的单价备注主键集合
+     * @return 结果
+     */
+    public int deleteCmcPriceRemarkByPriceRemarkIds(Long[] priceRemarkIds);
+
+    /**
+     * 删除单价备注信息
+     * 
+     * @param priceRemarkId 单价备注主键
+     * @return 结果
+     */
+    public int deleteCmcPriceRemarkByPriceRemarkId(Long priceRemarkId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcPriceRemarkServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcPriceRemarkMapper;
+import com.ruoyi.oa.domain.CmcPriceRemark;
+import com.ruoyi.oa.service.ICmcPriceRemarkService;
+
+/**
+ * 单价备注Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-05-14
+ */
+@Service
+public class CmcPriceRemarkServiceImpl implements ICmcPriceRemarkService 
+{
+    @Autowired
+    private CmcPriceRemarkMapper cmcPriceRemarkMapper;
+
+    /**
+     * 查询单价备注
+     * 
+     * @param priceRemarkId 单价备注主键
+     * @return 单价备注
+     */
+    @Override
+    public CmcPriceRemark selectCmcPriceRemarkByPriceRemarkId(Long priceRemarkId)
+    {
+        return cmcPriceRemarkMapper.selectCmcPriceRemarkByPriceRemarkId(priceRemarkId);
+    }
+
+    /**
+     * 查询单价备注列表
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 单价备注
+     */
+    @Override
+    public List<CmcPriceRemark> selectCmcPriceRemarkList(CmcPriceRemark cmcPriceRemark)
+    {
+        return cmcPriceRemarkMapper.selectCmcPriceRemarkList(cmcPriceRemark);
+    }
+
+    /**
+     * 新增单价备注
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 结果
+     */
+    @Override
+    public int insertCmcPriceRemark(CmcPriceRemark cmcPriceRemark)
+    {
+        return cmcPriceRemarkMapper.insertCmcPriceRemark(cmcPriceRemark);
+    }
+
+    /**
+     * 修改单价备注
+     * 
+     * @param cmcPriceRemark 单价备注
+     * @return 结果
+     */
+    @Override
+    public int updateCmcPriceRemark(CmcPriceRemark cmcPriceRemark)
+    {
+        return cmcPriceRemarkMapper.updateCmcPriceRemark(cmcPriceRemark);
+    }
+
+    /**
+     * 批量删除单价备注
+     * 
+     * @param priceRemarkIds 需要删除的单价备注主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPriceRemarkByPriceRemarkIds(Long[] priceRemarkIds)
+    {
+        return cmcPriceRemarkMapper.deleteCmcPriceRemarkByPriceRemarkIds(priceRemarkIds);
+    }
+
+    /**
+     * 删除单价备注信息
+     * 
+     * @param priceRemarkId 单价备注主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPriceRemarkByPriceRemarkId(Long priceRemarkId)
+    {
+        return cmcPriceRemarkMapper.deleteCmcPriceRemarkByPriceRemarkId(priceRemarkId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -52,6 +52,22 @@ public interface SysUserPostMapper
      */
     public List<SysUser> selectDriverList();
 
+    /**
+     * 查询总经理
+     *
+     * @param
+     * @return 总经理
+     */
+    public SysUser selectGm();
+
+    /**
+     * 查询专职安全员
+     *
+     * @param
+     * @return 专职安全员
+     */
+    public SysUser selectSafe();
+
     /**
      * 查询部门主任
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.system.domain.SysUserRole;
 
@@ -11,6 +13,14 @@ import com.ruoyi.system.domain.SysUserRole;
  */
 public interface SysUserRoleMapper
 {
+    /**
+     * 通过角色ID查询用户
+     *
+     * @param roleId 角色ID
+     * @return 用户对象信息
+     */
+    public List<SysUserRole> selectUserById(Long roleId);
+
     /**
      * 通过用户ID删除用户和角色关联
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -108,6 +108,22 @@ public interface ISysPostService
      */
     public List<SysUser> selectDriverList();
 
+    /**
+     * 查询总经理
+     *
+     * @param
+     * @return 总经理
+     */
+    public SysUser selectGm();
+
+    /**
+     * 查询专职安全员
+     *
+     * @param
+     * @return 专职安全员
+     */
+    public SysUser selectSafe();
+
     /**
      * 查询部门主任
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import java.util.List;
 import java.util.Set;
 import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.SysUserRole;
 
 /**
@@ -59,6 +60,14 @@ public interface ISysRoleService
      */
     public SysRole selectRoleById(Long roleId);
 
+    /**
+     * 通过角色ID查询用户
+     *
+     * @param roleId 角色ID
+     * @return 用户对象信息
+     */
+    public List<SysUserRole> selectUserById(Long roleId);
+
     /**
      * 校验角色名称是否唯一
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -189,6 +189,28 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDriverList();
     }
 
+    /**
+     * 查询总经理
+     *
+     * @param
+     * @return 总经理
+     */
+    @Override
+    public SysUser selectGm() {
+        return userPostMapper.selectGm();
+    }
+
+    /**
+     * 查询专职安全员
+     *
+     * @param
+     * @return 总经理
+     */
+    @Override
+    public SysUser selectSafe() {
+        return userPostMapper.selectSafe();
+    }
+
     /**
      * 查询部门主任
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -139,6 +139,18 @@ public class SysRoleServiceImpl implements ISysRoleService
         return roleMapper.selectRoleById(roleId);
     }
 
+    /**
+     * 通过角色ID查询用户
+     *
+     * @param roleId 角色ID
+     * @return 用户对象信息
+     */
+    @Override
+    public List<SysUserRole> selectUserById(Long roleId)
+    {
+        return userRoleMapper.selectUserById(roleId);
+    }
+
     /**
      * 校验角色名称是否唯一
      * 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcPriceRemarkMapper.xml

@@ -0,0 +1,62 @@
+<?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.oa.mapper.CmcPriceRemarkMapper">
+    
+    <resultMap type="CmcPriceRemark" id="CmcPriceRemarkResult">
+        <result property="priceRemarkId"    column="price_remark_id"    />
+        <result property="workType"    column="work_type"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcPriceRemarkVo">
+        select price_remark_id, work_type, remark from cmc_price_remark
+    </sql>
+
+    <select id="selectCmcPriceRemarkList" parameterType="CmcPriceRemark" resultMap="CmcPriceRemarkResult">
+        <include refid="selectCmcPriceRemarkVo"/>
+        <where>  
+            <if test="workType != null  and workType != ''"> and work_type = #{workType}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcPriceRemarkByPriceRemarkId" parameterType="Long" resultMap="CmcPriceRemarkResult">
+        <include refid="selectCmcPriceRemarkVo"/>
+        where price_remark_id = #{priceRemarkId}
+    </select>
+        
+    <insert id="insertCmcPriceRemark" parameterType="CmcPriceRemark">
+        insert into cmc_price_remark
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="priceRemarkId != null">price_remark_id,</if>
+            <if test="workType != null">work_type,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="priceRemarkId != null">#{priceRemarkId},</if>
+            <if test="workType != null">#{workType},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcPriceRemark" parameterType="CmcPriceRemark">
+        update cmc_price_remark
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="workType != null">work_type = #{workType},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where price_remark_id = #{priceRemarkId}
+    </update>
+
+    <delete id="deleteCmcPriceRemarkByPriceRemarkId" parameterType="Long">
+        delete from cmc_price_remark where price_remark_id = #{priceRemarkId}
+    </delete>
+
+    <delete id="deleteCmcPriceRemarkByPriceRemarkIds" parameterType="String">
+        delete from cmc_price_remark where price_remark_id in 
+        <foreach item="priceRemarkId" collection="array" open="(" separator="," close=")">
+            #{priceRemarkId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -74,7 +74,7 @@
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
-            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number = #{projectNumber}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>
             <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -20,13 +20,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 27 and u.status = '0'
 	</select>
 
+	<select id="selectGm" resultMap="SysUserResult">
+		select u.user_id, u.nick_name
+		from sys_user u left join sys_user_post up on u.user_id = up.user_id
+		where up.post_id = 2
+	</select>
+
+	<select id="selectSafe" resultMap="SysUserResult">
+		select u.user_id, u.nick_name
+		from sys_user u left join sys_user_post up on u.user_id = up.user_id
+		where up.post_id = 20
+	</select>
+
 	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select u1.user_id, u1.nick_name, u.dept_id from
 		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
 		left join sys_user_post as up
 		on r.user_id = up.user_id
-		where up.post_id = 12
+		where up.post_id = 13
 	</select>
 
 	<select id="selectViceDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
@@ -35,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
 	left join sys_user_post as up
 	on r.user_id = up.user_id
-	where up.post_id = 13 order by user_id desc limit 1
+	where up.post_id = 14 order by user_id desc limit 1
 	</select>
 
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
@@ -44,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		sys_user where dept_id = #{param}) as r
 		left join sys_user_post as up
 		on r.user_id = up.user_id
-		where up.post_id = 12
+		where up.post_id = 13
 	</select>
 
 	<select id="selectViceDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
@@ -53,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		sys_user where dept_id = #{param}) as r
 		left join sys_user_post as up
 		on r.user_id = up.user_id
-		where up.post_id = 13 order by user_id desc limit 1
+		where up.post_id = 14 order by user_id desc limit 1
 	</select>
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -9,6 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
 
+	<select id="selectUserById" parameterType="Long" resultMap="SysUserRoleResult">
+		select user_id from sys_user_role where role_id=#{roleId}
+	</select>
+
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>

oa-ui/src/api/system/post.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2024-03-07 17:33:37
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-08 15:44:00
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-14 14:44:34
  */
 import request from '@/utils/request'
 
@@ -23,6 +23,14 @@ export function listDriver() {
   })
 }
 
+// 查询总经理
+export function getGm() {
+  return request({
+    url: '/system/post/gm',
+    method: 'get'
+  })
+}
+
 // 查询岗位详细
 export function getPost(postId) {
   return request({

oa-ui/src/api/system/role.js

@@ -17,6 +17,15 @@ export function getRole(roleId) {
   })
 }
 
+// 查询角色详细
+export function getUserByRole(roleId) {
+  return request({
+    url: '/system/getUserByRole',
+    method: 'get',    
+    params: roleId
+  })
+}
+
 // 新增角色
 export function addRole(data) {
   return request({

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -139,6 +139,17 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
+      <el-form ref="taskForm" :model="taskForm">
+        <el-form-item prop="targetKey">
+          <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="completeOpen = false">取 消</el-button>
+        <el-button type="primary" @click="taskComplete">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -150,11 +161,14 @@ import { listProjectContract } from "@/api/oa/contract/projectContract";
 import { getContract } from "@/api/oa/contract/contract";
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import FlowUser from '@/components/flow/User';
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import { getUserByRole } from "@/api/system/role";
 
 export default {
   components: {
+    FlowUser,
     flow
   },
   props: {
@@ -232,6 +246,10 @@ export default {
       flowData: {},
       projectList: [],
       contractCode: '',
+      checkSendUser: false,
+      completeOpen: false,
+      completeTitle: '',
+      checkType: 'single',
     };
   },
   mounted() {
@@ -359,6 +377,26 @@ export default {
       }
       return true;
     },
+    // 用户信息选中数据
+    handleUserSelect(selection) {
+      if (selection) {
+        //不多选
+        this.$set(this.taskForm.variables, "approval", selection.userId.toString());
+      }
+    },
+    /** 用户审批任务 */
+    taskComplete() {
+      if (!this.taskForm.variables && this.checkSendUser) {
+        this.$modal.msgError("请选择流程接收人员!");
+        return;
+      }
+      if (this.taskForm) {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
+      }
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -446,11 +484,13 @@ export default {
                 });
               }
               if (this.taskName == '技术部审核') {
-                this.$set(this.taskForm.variables, "approval", '57');
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                getUserByRole(6).then(result => {
+                  this.$set(this.taskForm.variables, "approval", result.data[0]);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                })
               }
               if (this.taskName == '成果归档') {
                 complete(this.taskForm).then(response => {
@@ -461,6 +501,7 @@ export default {
             })
           } else {
             this.form.archiveId = this.taskForm.formId;
+            console.log(this.form);
             addArchive(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -468,11 +509,9 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              this.$set(this.taskForm.variables, "approval", '46');
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit('goBack')
-              });
+              this.checkSendUser = true;
+              this.completeOpen = true;
+              this.completeTitle = "流程审批";
             })
           }
         }

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -253,6 +253,7 @@ import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByD
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { listBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listProject, getProject } from "@/api/oa/project/project";
+import { getGm } from "@/api/system/post";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -491,11 +492,13 @@ export default {
                 });
               }
               else if (this.taskName == '分管审核') {
-                this.$set(this.taskForm.variables, "approval", 2);
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                getGm().then(res => {
+                  this.$set(this.taskForm.variables, "approval", res.data);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                })
               }
               else if (this.taskName == '总经理审核') {
                 let approvalList = [];

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-25 13:52:22
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-14 18:14:03
 -->
 
 <template>
@@ -54,17 +54,17 @@
                 </el-select>
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-    chooseProject.projectLeaderUser.nickName : ''
-                    }}</el-descriptions-item>
+                    chooseProject.projectLeaderUser.nickName : ''
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
@@ -75,8 +75,7 @@
               <el-row>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="乘车人数：" prop="passengers">
-                    <el-input-number v-model="form.passengers" :min="1"
-                      :disabled="taskName != '用车申请'"></el-input-number>
+                    <el-input-number v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'"></el-input-number>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -207,7 +206,8 @@
                     {{ item.nickName }}
                   </el-checkbox>
                 </el-checkbox-group> -->
-                <el-select v-model="form.drivers" filterable multiple clearable style="width:220px" :disabled="taskName != '安排用车'">
+                <el-select v-model="form.drivers" filterable multiple clearable style="width:220px"
+                  :disabled="taskName != '安排用车'">
                   <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                     v-if="item.nickName != 'admin'">
                   </el-option>
@@ -218,7 +218,8 @@
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
-              <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" : "完成审批" }}</el-button>
+              <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" :
+                "完成审批" }}</el-button>
             </el-row>
           </div>
         </el-card>
@@ -242,7 +243,7 @@ import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar, getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
-import { listDriver } from "@/api/system/post";
+import { listDriver, getGm } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
@@ -453,6 +454,10 @@ export default {
           this.$set(this.taskForm.variables, "dept", this.dept);
           if (res.data && this.dept != 0) {
             this.$set(this.taskForm.variables, "approval", res.data.userId);
+          } else if (this.dept == 102) {
+            getGm().then(result => {
+              this.$set(this.taskForm.variables, "approval", result.data);
+            })
           } else {
             let userId = this.getChooseType()
             this.$set(this.taskForm.variables, "approval", userId);
@@ -473,10 +478,12 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核') {
-        this.$set(this.taskForm.variables, "approvalList", [8, 16]);
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit('goBack')
+        getUserByRole(3).then(result => {
+          this.$set(this.taskForm.variables, "approvalList", result.data);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          })
         });
       } else if (this.taskName == '安排用车' || this.taskName == '申请确认') {
         complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-16 10:20:19
+ * @LastEditTime: 2024-05-14 18:16:09
 -->
 
 <template>
@@ -131,20 +131,22 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                  <el-form-item label="签名：" label-width="120px"
+                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
                     <span class="auditor"> {{ form.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px" v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                  <el-form-item label="日期：" label-width="120px"
+                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
                     <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
               <!-- 设备安排 -->
               <el-form-item label-width="120px" label="设备选择：">
-                <el-select style="width: 300px;" v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice"
-                  clearable :disabled="taskName != '安排设备'">
+                <el-select style="width: 300px;" v-model="form.devices" filterable multiple placeholder="请选择"
+                  @change="handleSelectDevice" clearable :disabled="taskName != '安排设备'">
                   <el-option v-for="item in deviceList" :key="item.deviceId"
                     :label="item.brand + item.series + item.name + item.code" :value="item.deviceId">
                   </el-option>
@@ -209,6 +211,7 @@ import {
 import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import { getUserByRole } from "@/api/system/role";
 export default {
   components: {
     flow
@@ -378,15 +381,26 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核') {
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit('goBack')
+        getUserByRole(5).then(result => {
+          this.$set(this.taskForm.variables, "approval", result.data[0]);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          })
         });
       } else if (this.taskName == '安排设备') {
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')
         });
+      } else if (this.taskName == '申请确认') {
+        getUserByRole(5).then(result => {
+          this.$set(this.taskForm.variables, "approval", result.data[0]);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          })
+        });
       } else {
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);

oa-ui/src/views/flowable/form/settleForm.vue

@@ -1,15 +1,15 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 17:29:44
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-14 18:13:20
 -->
 <template>
   <div class="app-container" v-loading="loading">
     <el-button type="warning" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
     <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
-      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList"
-        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
+      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList" :settleList="oldSettleSumList"
+        @cancel="printOpen = false"></settle-print>
     </el-dialog>
     <el-row :gutter="20">
       <el-col :span="19" :xs="24">
@@ -432,6 +432,8 @@ import { listProjectContract, addProjectContract, } from "@/api/oa/contract/proj
 import { getPrice } from "@/api/oa/price/price";
 import ChoosePrice from "./components/choosePrice.vue";
 import { getUser } from "@/api/system/user";
+import { getUserByRole } from "@/api/system/role";
+import { getGm } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import SettlePrint from './components/settlePrint.vue';
@@ -658,26 +660,30 @@ export default {
         if (vaild) {
           this.preserve();
           if (this.taskName == '结算发起') {
-            this.getNextFlowNodeFn(17);
+            getUserByRole(5).then(res => {
+              this.getNextFlowNodeFn(res.data[0]);
+            })
           } else if (this.taskName == '综合事务部处理') {
-            this.getNextFlowNodeFn(52);
+            this.getNextFlowNodeFn(null, 110, false);
           } else if (this.taskName == '技术质量部审核') {
-            this.getNextFlowNodeFn(32);
+            this.getNextFlowNodeFn(null, 107, false);
           } else if (this.taskName == '项目管理部结算') {
             this.getNextFlowNodeFn();
           } else if (this.taskName == '结算发起人确认') {
-            this.getNextFlowNodeFn(13);
+            this.getNextFlowNodeFn(null, 105, false);
           } else if (this.taskName == '经营发展部校核') {
-            this.getNextFlowNodeFn(null, this.deptId);
+            this.getNextFlowNodeFn(null, this.deptId, true);
           } else if (this.taskName == '分管审核') {
-            this.getNextFlowNodeFn();
+            getGm().then(res => {
+              this.getNextFlowNodeFn(res.data);
+            })
           } else if (this.taskName == '总经理审批') {
             this.getNextFlowNodeFn();
           }
         }
       })
     },
-    getNextFlowNodeFn(userId, deptId) {
+    getNextFlowNodeFn(userId, deptId, isList) {
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(res => {
         if (userId) {
@@ -687,7 +693,7 @@ export default {
             this.$emit('goBack');
           });
         } else {
-          if (deptId) {
+          if (deptId && isList) {
             getUsersManageLeaderByDept({ deptId }).then(res => {
               let id = [];
               id.push(res.data.userId);
@@ -698,6 +704,14 @@ export default {
                 this.$emit('goBack');
               });
             })
+          } else if (deptId && !isList) {
+            getUsersManageLeaderByDept({ deptId }).then(res => {
+              this.$set(this.taskForm.variables, "approval", res.data.userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack');
+              });
+            })
           } else {
             complete(this.taskForm).then(response => {
               this.$modal.msgSuccess(response.msg);