借款、预算加董事长相关字段；修改子流程发起设置

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

@@ -13,6 +13,6 @@ public class CallBudgetActivityExecutionListener implements ExecutionListener {
     public void notify(DelegateExecution delegateExecution) {
         Map<String, Object> variables = delegateExecution.getVariables();
         Authentication.setAuthenticatedUserId(variables.get("budgetInitiator").toString());
-        delegateExecution.setVariable("approval", variables.get("budgetInitiator").toString());
+        delegateExecution.setVariableLocal("approval", variables.get("budgetInitiator"));
     }
 }

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

@@ -15,6 +15,6 @@ public class CallPlanActivityExecutionListener implements ExecutionListener {
     public void notify(DelegateExecution delegateExecution) {
         Map<String, Object> variables = delegateExecution.getVariables();
         Authentication.setAuthenticatedUserId(variables.get("planInitiator").toString());
-        delegateExecution.setVariable("approval", variables.get("planInitiator").toString());
+        delegateExecution.setVariableLocal("approval", variables.get("planInitiator"));
     }
 }

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

@@ -13,8 +13,8 @@ public class CallSafeActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
-        String userId = userPostMapper.selectUserListByPostName("专职安全员").get(0).getUserId().toString();
-        Authentication.setAuthenticatedUserId(userId);
-        delegateExecution.setVariable("approval", userId);
+        Long userId = userPostMapper.selectUserListByPostName("专职安全员").get(0).getUserId();
+        Authentication.setAuthenticatedUserId(userId.toString());
+        delegateExecution.setVariableLocal("approval", userId);
     }
 }

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

@@ -13,6 +13,6 @@ public class CallTechActivityExecutionListener implements ExecutionListener {
     public void notify(DelegateExecution delegateExecution) {
         Map<String, Object> variables = delegateExecution.getVariables();
         Authentication.setAuthenticatedUserId(variables.get("techInitiator").toString());
-        delegateExecution.setVariable("approval", variables.get("techInitiator").toString());
+        delegateExecution.setVariableLocal("approval", variables.get("techInitiator"));
     }
 }

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

@@ -68,6 +68,10 @@ public class CmcBorrow extends BaseEntity
     private String zjlUserName;
     private SysUser zjlUser;
 
+    @Excel(name = "董事长")
+    private String dszUserName;
+    private SysUser dszUser;
+
     @Excel(name = "党工团审批人")
     private String unionUserName;
     private SysUser unionUser;
@@ -113,10 +117,17 @@ public class CmcBorrow extends BaseEntity
     /** 总经理审批人 */
     private Long zjlUserId;
 
+    /** 董事长审批人 */
+    private Long dszUserId;
+
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String zjlComment;
 
+    /** 董事长审批意见 */
+    @Excel(name = "董事长审批意见")
+    private String dszComment;
+
     /** 工会审批人 */
     private Long unionUserId;
 
@@ -159,6 +170,11 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zjlTime;
 
+    /** 董事长审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "董事长审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dszTime;
+
     /** 工会审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "工会审批时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -293,6 +309,16 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlUser;
     }
+    public void setDszUser(SysUser dszUser)
+    {
+        this.dszUser = dszUser;
+        this.dszUserName = dszUser == null ? "" : dszUser.getNickName();
+    }
+
+    public SysUser getDszUser()
+    {
+        return dszUser;
+    }
     public void setUnionUser(SysUser unionUser)
     {
         this.unionUser = unionUser;
@@ -403,6 +429,15 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlUserId;
     }
+    public void setDszUserId(Long dszUserId)
+    {
+        this.dszUserId = dszUserId;
+    }
+
+    public Long getDszUserId()
+    {
+        return dszUserId;
+    }
     public void setZjlComment(String zjlComment) 
     {
         this.zjlComment = zjlComment;
@@ -412,6 +447,15 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlComment;
     }
+    public void setDszComment(String dszComment)
+    {
+        this.dszComment = dszComment;
+    }
+
+    public String getDszComment()
+    {
+        return dszComment;
+    }
     public void setUnionUserId(Long unionUserId)
     {
         this.unionUserId = unionUserId;
@@ -484,6 +528,15 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlTime;
     }
+    public void setDszTime(Date dszTime)
+    {
+        this.dszTime = dszTime;
+    }
+
+    public Date getDszTime()
+    {
+        return dszTime;
+    }
     public void setUnionTime(Date unionTime)
     {
         this.unionTime = unionTime;

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

@@ -101,6 +101,9 @@ public class CmcBudget extends BaseEntity
     /** 编制人 */
     private Long compiler;
 
+    /** 批准人 */
+    private Long approver;
+
     @Excel(name = "编制人")
     private String compilerUserName;
     private SysUser compilerUser;
@@ -109,6 +112,10 @@ public class CmcBudget extends BaseEntity
     private String auditorUserName;
     private SysUser auditorUser;
 
+    @Excel(name = "批准人")
+    private String approverUserName;
+    private SysUser approverUser;
+
     /** 审核人 */
     private Long auditor;
 
@@ -332,6 +339,25 @@ public class CmcBudget extends BaseEntity
     {
         return auditor;
     }
+    public void setApprover(Long approver)
+    {
+        this.approver = approver;
+    }
+
+    public Long getApprover()
+    {
+        return approver;
+    }
+    public void setApproverUser(SysUser approverUser)
+    {
+        this.approverUser = approverUser;
+        this.approverUserName = approverUser == null ? "" : approverUser.getNickName();
+    }
+
+    public SysUser getApproverUser()
+    {
+        return approverUser;
+    }
 
     @Override
     public String toString() {

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

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="xmUser"    javaType="SysUser"         resultMap="XmUserResult" />
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="dszUser"    javaType="SysUser"         resultMap="DszUserResult" />
         <association property="unionUser"    javaType="SysUser"         resultMap="UnionUserResult" />
         <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
@@ -71,6 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="zjl_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="DszUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dsz_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="UnionUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="union_nick_name"    />
@@ -95,8 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectCmcBorrowVo">
         select b.borrow_id, b.project_id, p.project_number, p.project_name, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept, b.remark, b.borrow_usage,
                b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, u1.nick_name as dept_nick_name, b.xm_user_id, u2.nick_name as xm_nick_name, b.xm_comment,
-               b.manager_comment, b.manager_user_id, u3.nick_name as manager_nick_name, b.zjl_user_id, u4.nick_name as zjl_nick_name, b.zjl_comment,  b.union_user_id, u5.nick_name as zjl_nick_name,
-               b.union_comment, b.cw_user_id, u6.nick_name as cw_nick_name, b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time, b.lend_document, b.borrow_document, b.union_time from cmc_borrow as b
+               b.manager_comment, b.manager_user_id, u3.nick_name as manager_nick_name, b.zjl_user_id, u4.nick_name as zjl_nick_name, b.zjl_comment, b.dsz_comment,  b.union_user_id, 
+               u5.nick_name as zjl_nick_name, b.union_comment, b.cw_user_id, u6.nick_name as cw_nick_name, b.dsz_user_id, u7.nick_name as dsz_nick_name, b.cw_comment, b.dept_time, b.xm_time,
+               b.manager_time, b.zjl_time, b.dsz_time, b.lend_time, b.lend_document, b.borrow_document, b.union_time from cmc_borrow as b
         left join sys_user as u on u.user_id = b.applier
         left join sys_user as u1 on u1.user_id = b.dept_user_id
         left join sys_user as u2 on u2.user_id = b.xm_user_id
@@ -104,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user as u4 on u4.user_id = b.zjl_user_id
         left join sys_user as u5 on u5.user_id = b.union_user_id
         left join sys_user as u6 on u6.user_id = b.cw_user_id
+        left join sys_user as u7 on u7.user_id = b.dsz_user_id
         left join sys_dept as d on d.dept_id = b.apply_dept
         left join cmc_project as p on b.project_id = p.project_id
     </sql>
@@ -128,6 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null "> and b.manager_user_id = #{managerUserId}</if>
             <if test="zjlUserId != null "> and b.zjl_user_id = #{zjlUserId}</if>
             <if test="zjlComment != null  and zjlComment != ''"> and b.zjl_comment = #{zjlComment}</if>
+            <if test="dszUserId != null "> and b.dsz_user_id = #{dszUserId}</if>
+            <if test="dszComment != null  and dszComment != ''"> and b.dsz_comment = #{dszComment}</if>
             <if test="unionUserId != null "> and b.union_user_id = #{unionUserId}</if>
             <if test="unionComment != null  and unionComment != ''"> and b.union_comment = #{unionComment}</if>
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
@@ -136,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmTime != null "> and b.xm_time = #{xmTime}</if>
             <if test="managerTime != null "> and b.manager_time = #{managerTime}</if>
             <if test="zjlTime != null "> and b.zjl_time = #{zjlTime}</if>
+            <if test="dszTime != null "> and b.dsz_time = #{dszTime}</if>
             <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
@@ -168,6 +179,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="zjlUserId != null">zjl_user_id,</if>
             <if test="zjlComment != null">zjl_comment,</if>
+            <if test="dszUserId != null">dsz_user_id,</if>
+            <if test="dszComment != null">dsz_comment,</if>
             <if test="unionUserId != null">union_user_id,</if>
             <if test="unionComment != null">union_comment,</if>
             <if test="cwUserId != null">cw_user_id,</if>
@@ -176,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmTime != null">xm_time,</if>
             <if test="managerTime != null">manager_time,</if>
             <if test="zjlTime != null">zjl_time,</if>
+            <if test="dszTime != null">dsz_time,</if>
             <if test="lendTime != null">lend_time,</if>
             <if test="unionTime != null">union_time,</if>
             <if test="lendDocument != null">lend_document,</if>
@@ -200,6 +214,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="zjlUserId != null">#{zjlUserId},</if>
             <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="dszUserId != null">#{dszUserId},</if>
+            <if test="dszComment != null">#{dszComment},</if>
             <if test="unionUserId != null">#{unionUserId},</if>
             <if test="unionComment != null">#{unionComment},</if>
             <if test="cwUserId != null">#{cwUserId},</if>
@@ -208,6 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmTime != null">#{xmTime},</if>
             <if test="managerTime != null">#{managerTime},</if>
             <if test="zjlTime != null">#{zjlTime},</if>
+            <if test="dszTime != null">#{dszTime},</if>
             <if test="unionTime != null">#{unionTime},</if>
             <if test="lendTime != null">#{lendTime},</if>
             <if test="lendDocument != null">#{lendDocument},</if>
@@ -235,6 +252,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
             <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="dszUserId != null">dsz_user_id = #{dszUserId},</if>
+            <if test="dszComment != null">dsz_comment = #{dszComment},</if>
             <if test="unionUserId != null">union_user_id = #{unionUserId},</if>
             <if test="unionComment != null">zjl_comment = #{unionComment},</if>
             <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
@@ -243,6 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmTime != null">xm_time = #{xmTime},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
             <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+            <if test="dszTime != null">dsz_time = #{dszTime},</if>
             <if test="unionTime != null">union_time = #{unionTime},</if>
             <if test="lendTime != null">lend_time = #{lendTime},</if>
             <if test="lendDocument != null">lend_document = #{lendDocument},</if>

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

@@ -26,9 +26,15 @@
         <result property="totalBudget"    column="total_budget"    />
         <result property="compiler"    column="compiler"    />
         <result property="auditor"    column="auditor"    />
+        <result property="approver"    column="approver"    />
+        <result property="auditComment"    column="auditor_comment"    />
+        <result property="approveComment"    column="approve_comment"    />
+        <result property="auditTime"    column="audit_time"    />
+        <result property="approveTime"    column="approve_time"    />
         <result property="createTime"    column="create_time"    />
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
         <association property="auditorUser"    javaType="SysUser"         resultMap="AuditorResult" />
+        <association property="approverUser"    javaType="SysUser"         resultMap="ApproverResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
@@ -42,6 +48,11 @@
         <result property="nickName"    column="auditor_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="ApproverResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="approver_nick_name"    />
+    </resultMap>
+
     <resultMap type="CmcProject" id="CmcProjectResult">
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
@@ -51,9 +62,11 @@
     <sql id="selectCmcBudgetVo">
         select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
                b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler,
-               u.nick_name as compiler_nick_name, b.auditor, u1.nick_name as auditor_nick_name, b.create_time from cmc_budget as b
+               u.nick_name as compiler_nick_name, b.auditor, u1.nick_name as auditor_nick_name, b.appover, u2.nick_name as appover_nick_name, b.create_time, b.audit_time, b.approve_time,
+               b.audit_comment, b.approve_comment from cmc_budget as b
             left join sys_user as u on u.user_id = b.compiler
             left join sys_user as u1 on u1.user_id = b.auditor
+            left join sys_user as u2 on u2.user_id = b.appover
             left join cmc_project as p on b.project_id = p.project_id
     </sql>
 
@@ -107,6 +120,11 @@
             <if test="totalBudget != null">total_budget,</if>
             <if test="compiler != null">compiler,</if>
             <if test="auditor != null">auditor,</if>
+            <if test="approver != null">approver,</if>
+            <if test="auditTime != null">audit_time,</if>
+            <if test="approveTime != null">approve_time,</if>
+            <if test="auditComment != null">audit_comment,</if>
+            <if test="approveComment != null">approve_comment,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -131,6 +149,11 @@
             <if test="totalBudget != null">#{totalBudget},</if>
             <if test="compiler != null">#{compiler},</if>
             <if test="auditor != null">#{auditor},</if>
+            <if test="approver != null">#{approver},</if>
+            <if test="auditTime != null">#{auditTime},</if>
+            <if test="approveTime != null">#{approveTime},</if>
+            <if test="auditComment != null">#{auditComment},</if>
+            <if test="approveComment != null">#{approveComment},</if>
             sysdate()
         </trim>
     </insert>
@@ -158,6 +181,11 @@
             <if test="totalBudget != null">total_budget = #{totalBudget},</if>
             <if test="compiler != null">compiler = #{compiler},</if>
             <if test="auditor != null">auditor = #{auditor},</if>
+            <if test="approver != null">approver = #{approver},</if>
+            <if test="auditTime != null">audit_time = #{auditTime},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</if>
+            <if test="auditComment != null">audit_comment = #{auditComment},</if>
+            <if test="approveComment != null">approve_comment = #{approveComment},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where budget_id = #{budgetId}

oa-back/sql/sql.sql

@@ -6347,7 +6347,12 @@ create table `cmc_budget`  (
   `total_budget` 		decimal(10, 2) 	default null 	comment '预算总额',
   `compiler` 			bigint 			default null 	comment '编制人',
   `auditor` 			bigint 			default null 	comment '审核人',
+  `approver` 			bigint 			default null 	comment '批准人',
+  `audit_comment` 		varchar(255)	default null 	comment '审核人意见',
+  `approve_comment` 	varchar(255)	default null 	comment '批准人意见',
   `create_time` 		date 			default null 	comment '创建时间',
+  `audit_time` 			date			default null 	comment '审核时间',
+  `approve_time` 		date			default null 	comment '批准时间',
   primary key (`budget_id`)
 ) engine = innodb comment = 'cmc预算管理表';
 
@@ -8571,6 +8576,8 @@ create table `cmc_borrow`  (
   `manager_user_id` bigint 			default null comment '分管审批人',
   `zjl_user_id` 	bigint 			default null comment '总经理审批人',
   `zjl_comment` 	varchar(255)  	default null comment '总经理审批意见',
+  `dsz_user_id` 	bigint 			default null comment '董事长审批人',
+  `dsz_comment` 	varchar(255)  	default null comment '董事长审批意见',
   `union_user_id` 	bigint 			default null comment '工会审批人',
   `union_comment` 	varchar(255)  	default null comment '工会审批意见',
   `cw_user_id` 		bigint 			default null comment '财务部经办人',
@@ -8580,6 +8587,7 @@ create table `cmc_borrow`  (
   `xm_time` 		date 			default null comment '项目部审批时间',
   `manager_time` 	date 			default null comment '分管审批时间',
   `zjl_time` 		date 			default null comment '总经理审批时间',
+  `dsz_time` 		date 			default null comment '董事长审批时间',
   `union_time` 		date 			default null comment '工会审批时间',
   `lend_time` 		date 			default null comment '借款支付时间',
   primary key (`borrow_id`)

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-09 09:28:51
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-09 21:30:44
 -->
 <template>
   <div class="app-container">
@@ -109,7 +109,7 @@
 <script>
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
-import { getUsersDeptLeaderByDept, getDeptLeadersByDeptId } from '@/api/system/post'
+import { getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
 export default {
@@ -253,10 +253,10 @@ export default {
         type: 'warning'
       }).then(async () => {
         this.save();
-        let resData = await getUsersDeptLeaderByDept({ deptId: 105 });
+        let resData = await getUsersManageLeaderByDept({ deptId: 105 });
         let approvalId;
         if (resData.data) {
-          approvalId = resData.data.userId;
+          approvalId = resData.data[0].userId;
         }
         console.log(approvalId);
         const params = { taskId: this.taskForm.taskId };