董事会用车、借款董事长审批

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

@@ -46,6 +46,10 @@ public class CmcCarApproval extends BaseEntity
     private String gmUserName;
     private SysUser gmUser;
 
+    @Excel(name = "董事长")
+    private String dszUserName;
+    private SysUser dszUser;
+
     @Excel(name = "车辆管理员")
     private String dispatchUserName;
     private SysUser dispatchUser;
@@ -124,10 +128,17 @@ public class CmcCarApproval extends BaseEntity
     /** 总经理审批人 */
     private Long gmUserId;
 
+    /** 董事长审批人 */
+    private Long dszUserId;
+
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String gmComment;
 
+    /** 董事长审批意见 */
+    @Excel(name = "董事长审批意见")
+    private String dszComment;
+
     /** 调度员 */
     private Long dispatcher;
 
@@ -164,6 +175,11 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date gmTime;
 
+    /** 董事长审批时间 */
+    @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")
@@ -236,6 +252,16 @@ public class CmcCarApproval extends BaseEntity
     {
         return gmUser;
     }
+    public void setDszUser(SysUser dszUser)
+    {
+        this.dszUser = dszUser;
+        this.dszUserName = dszUser == null ? "" : dszUser.getNickName();
+    }
+
+    public SysUser getDszUser()
+    {
+        return dszUser;
+    }
     public void setDispatchUser(SysUser dispatchUser)
     {
         this.dispatchUser = dispatchUser;
@@ -448,6 +474,15 @@ public class CmcCarApproval extends BaseEntity
     {
         return gmComment;
     }
+    public void setDszComment(String dszComment)
+    {
+        this.dszComment = dszComment;
+    }
+
+    public String getDszComment()
+    {
+        return dszComment;
+    }
     public void setDispatcher(Long dispatcher)
     {
         this.dispatcher = dispatcher;
@@ -525,6 +560,16 @@ public class CmcCarApproval extends BaseEntity
         return gmTime;
     }
 
+    public void setDszTime(Date dszTime)
+    {
+        this.dszTime = dszTime;
+    }
+
+    public Date getDszTime()
+    {
+        return dszTime;
+    }
+
     public void setDispatchTime(Date dispatchTime)
     {
         this.dispatchTime = dispatchTime;

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

@@ -33,6 +33,7 @@
         <result property="managerTime"    column="manager_time"    />
         <result property="unionTime"    column="union_time"    />
         <result property="gmTime"    column="gm_time"    />
+        <result property="dszTime"    column="dsz_time"    />
         <result property="dispatchTime"    column="dispatch_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
@@ -41,6 +42,7 @@
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="unionUser"    javaType="SysUser"         resultMap="UnionUserResult" />
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
+        <association property="dszUser"    javaType="SysUser"         resultMap="DszUserResult" />
         <association property="dispatchUser"    javaType="SysUser"         resultMap="DispatchUserResult" />
     </resultMap>
 
@@ -69,6 +71,11 @@
         <result property="nickName"    column="gm_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="DispatchUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="dispatch_nick_name"    />
@@ -89,13 +96,15 @@
         select ca.car_apply_id, ca.applier, u.nick_name as applier_nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name,
                ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.end_date, ca.days, ca.dept_user_id, u1.nick_name as dept_nick_name, ca.dept_comment, ca.manager_user_id,
                u2.nick_name as manager_nick_name, ca.manager_comment, ca.car_usage, ca.union_user_id, u3.nick_name as union_nick_name, ca.union_comment, ca.gm_user_id, u4.nick_name as gm_nick_name,
-               ca.gm_comment, ca.dispatcher, u5.nick_name as dispatch_nick_name, ca.dispatch_comment, ca.estimate_cost, ca.dept_time, ca.manager_time, ca.union_time, ca.gm_time, ca.dispatch_time from cmc_car_approval as ca
+               ca.dsz_user_id, u5.nick_name as dsz_nick_name, ca.gm_comment, ca.dsz_comment, ca.dispatcher, u6.nick_name as dispatch_nick_name, ca.dispatch_comment, ca.estimate_cost, ca.dept_time,
+               ca.manager_time, ca.union_time, ca.gm_time, ca.dsz_time, ca.dispatch_time from cmc_car_approval as ca
             left join sys_user as u on u.user_id = ca.applier
             left join sys_user as u1 on u1.user_id = ca.dept_user_id
             left join sys_user as u2 on u2.user_id = ca.manager_user_id
             left join sys_user as u3 on u3.user_id = ca.union_user_id
             left join sys_user as u4 on u4.user_id = ca.gm_user_id
-            left join sys_user as u5 on u5.user_id = ca.dispatcher
+            left join sys_user as u5 on u5.user_id = ca.dsz_user_id
+            left join sys_user as u6 on u6.user_id = ca.dispatcher
             left join sys_dept as d on d.dept_id = ca.use_dept
             left join cmc_project as p on ca.project_id = p.project_id
     </sql>
@@ -159,6 +168,8 @@
             <if test="unionComment != null">union_comment,</if>
             <if test="gmUserId != null">gm_user_id,</if>
             <if test="gmComment != null">gm_comment,</if>
+            <if test="dszUserId != null">dsz_user_id,</if>
+            <if test="dszComment != null">dsz_comment,</if>
             <if test="dispatcher != null">dispatcher,</if>
             <if test="dispatchComment != null">dispatch_comment,</if>
             <if test="estimateCost != null">estimate_cost,</if>
@@ -185,6 +196,8 @@
             <if test="unionComment != null">#{unionComment},</if>
             <if test="gmUserId != null">#{gmUserId},</if>
             <if test="gmComment != null">#{gmComment},</if>
+            <if test="dszUserId != null">#{dszUserId},</if>
+            <if test="dszComment != null">#{dszComment},</if>
             <if test="dispatcher != null">#{dispatcher},</if>
             <if test="dispatchComment != null">#{dispatchComment},</if>
             <if test="estimateCost != null">#{estimateCost},</if>
@@ -214,6 +227,8 @@
             <if test="unionComment != null">union_comment = #{unionComment},</if>
             <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
             <if test="gmComment != null">gm_comment = #{gmComment},</if>
+            <if test="dszUserId != null">dsz_user_id = #{dszUserId},</if>
+            <if test="dszComment != null">dsz_comment = #{dszComment},</if>
             <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
@@ -221,6 +236,7 @@
             <if test="managerTime != null ">manager_time = #{managerTime},</if>
             <if test="unionTime != null ">union_time = #{unionTime},</if>
             <if test="gmTime != null ">gm_time = #{gmTime},</if>
+            <if test="dszTime != null ">dsz_time = #{dszTime}</if>
             <if test="dispatchTime != null ">dispatch_time = #{dispatchTime}</if>
         </trim>
         where car_apply_id = #{carApplyId}