预算、借款、结算字段修改

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

@@ -84,14 +84,10 @@ public class CmcBorrowController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBorrow cmcBorrow)
     {
-        if (cmcBorrow.getDeptComment() != null && cmcBorrow.getXmComment() == null) {
+        if (cmcBorrow.getDeptComment() != null && cmcBorrow.getManagerComment() == null) {
             cmcBorrow.setDeptUserId(getLoginUser().getUserId());
             cmcBorrow.setDeptTime(new Date());
         }
-        if (cmcBorrow.getXmComment() != null && cmcBorrow.getManagerComment() == null) {
-            cmcBorrow.setXmUserId(getLoginUser().getUserId());
-            cmcBorrow.setXmTime(new Date());
-        }
         if (cmcBorrow.getManagerComment() != null && cmcBorrow.getZjlComment() == null) {
             cmcBorrow.setManagerUserId(getLoginUser().getUserId());
             cmcBorrow.setManagerTime(new Date());

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

@@ -79,13 +79,17 @@ public class CmcBudgetController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
     {
-        if (cmcBudget.getAuditComment() != null && cmcBudget.getApproveComment() == null) {
+        if (cmcBudget.getManagerComment() != null && cmcBudget.getZjlComment() == null) {
+            cmcBudget.setManager(getLoginUser().getUserId());
+            cmcBudget.setManagerTime(new Date());
+        }
+        if (cmcBudget.getZjlComment() != null && cmcBudget.getDszComment() == null) {
             cmcBudget.setAuditor(getLoginUser().getUserId());
-            cmcBudget.setAuditTime(new Date());
+            cmcBudget.setZjlTime(new Date());
         }
-        if (cmcBudget.getApproveComment() != null) {
+        if (cmcBudget.getDszComment() != null) {
             cmcBudget.setApprover(getLoginUser().getUserId());
-            cmcBudget.setApproveTime(new Date());
+            cmcBudget.setDszTime(new Date());
         }
         return toAjax(cmcBudgetService.updateCmcBudget(cmcBudget));
     }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/FlowSkipListener.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 /**
  * 自动跳过流程任务监听
  * @author cmc
- * @date 2023-02-18
+ * @date 2024-07-10
  */
 
 @Component
@@ -16,6 +16,6 @@ public class FlowSkipListener implements ExecutionListener {
     public void notify(DelegateExecution execution) {
         //通过设置流程变量_FLOWABLE_SKIP_EXPRESSION_ENABLED为true启动skipExpression属性,
         //必须是true而非字符串"true",若不启动是不生效的
-        execution.setVariable("_FLOWABLE_SKIP_EXPRESSION_ENABLED",true);
+        execution.setVariable("_FLOWABLE_SKIP_EXPRESSION_ENABLED", true);
     }
 }

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

@@ -56,10 +56,6 @@ public class CmcBorrow extends BaseEntity
     private String deptUserName;
     private SysUser deptUser;
 
-    @Excel(name = "项目部审批人")
-    private String xmUserName;
-    private SysUser xmUser;
-
     @Excel(name = "分管审批人")
     private String managerUserName;
     private SysUser managerUser;
@@ -100,13 +96,6 @@ public class CmcBorrow extends BaseEntity
     /** 部门审批人 */
     private Long deptUserId;
 
-    /** 项目部审批人 */
-    private Long xmUserId;
-
-    /** 项目部审批意见 */
-    @Excel(name = "项目部审批意见")
-    private String xmComment;
-
     /** 分管审批意见 */
     @Excel(name = "分管审批意见")
     private String managerComment;
@@ -155,11 +144,6 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deptTime;
 
-    /** 项目部审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "项目部审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date xmTime;
-
     /** 分管审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -279,16 +263,6 @@ public class CmcBorrow extends BaseEntity
     {
         return deptUser;
     }
-    public void setXmUser(SysUser xmUser)
-    {
-        this.xmUser = xmUser;
-        this.xmUserName = xmUser == null ? "" : xmUser.getNickName();
-    }
-
-    public SysUser getXmUser()
-    {
-        return xmUser;
-    }
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
@@ -384,24 +358,6 @@ public class CmcBorrow extends BaseEntity
     {
         return deptUserId;
     }
-    public void setXmUserId(Long xmUserId) 
-    {
-        this.xmUserId = xmUserId;
-    }
-
-    public Long getXmUserId() 
-    {
-        return xmUserId;
-    }
-    public void setXmComment(String xmComment) 
-    {
-        this.xmComment = xmComment;
-    }
-
-    public String getXmComment() 
-    {
-        return xmComment;
-    }
     public void setManagerComment(String managerComment) 
     {
         this.managerComment = managerComment;
@@ -501,15 +457,6 @@ public class CmcBorrow extends BaseEntity
     {
         return deptTime;
     }
-    public void setXmTime(Date xmTime) 
-    {
-        this.xmTime = xmTime;
-    }
-
-    public Date getXmTime() 
-    {
-        return xmTime;
-    }
     public void setManagerTime(Date managerTime) 
     {
         this.managerTime = managerTime;
@@ -587,8 +534,6 @@ public class CmcBorrow extends BaseEntity
             .append("managerAmount", getManagerAmount())
             .append("deptComment", getDeptComment())
             .append("deptUserId", getDeptUserId())
-            .append("xmUserId", getXmUserId())
-            .append("xmComment", getXmComment())
             .append("managerComment", getManagerComment())
             .append("managerUserId", getManagerUserId())
             .append("zjlUserId", getZjlUserId())
@@ -598,7 +543,6 @@ public class CmcBorrow extends BaseEntity
             .append("cwUserId", getCwUserId())
             .append("cwComment", getCwComment())
             .append("deptTime", getDeptTime())
-            .append("xmTime", getXmTime())
             .append("managerTime", getManagerTime())
             .append("zjlTime", getZjlTime())
             .append("unionTime", getUnionTime())

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

@@ -43,10 +43,6 @@ public class CmcBorrowDetail extends BaseEntity
     @Excel(name = "申请金额")
     private BigDecimal applyAmount;
 
-    /** 项目部校核金额 */
-    @Excel(name = "项目部校核金额")
-    private BigDecimal xmAmount;
-
     /** 分管审核金额 */
     @Excel(name = "分管审核金额")
     private BigDecimal managerAmount;
@@ -114,15 +110,6 @@ public class CmcBorrowDetail extends BaseEntity
     {
         return applyAmount;
     }
-    public void setXmAmount(BigDecimal xmAmount) 
-    {
-        this.xmAmount = xmAmount;
-    }
-
-    public BigDecimal getXmAmount() 
-    {
-        return xmAmount;
-    }
     public void setManagerAmount(BigDecimal managerAmount) 
     {
         this.managerAmount = managerAmount;
@@ -143,7 +130,6 @@ public class CmcBorrowDetail extends BaseEntity
             .append("price", getPrice())
             .append("quantity", getQuantity())
             .append("applyAmount", getApplyAmount())
-            .append("xmAmount", getXmAmount())
             .append("managerAmount", getManagerAmount())
             .toString();
     }

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

@@ -103,39 +103,54 @@ public class CmcBudget extends BaseEntity
     /** 编制人 */
     private Long compiler;
 
-    /** 批准人 */
+    /** 董事长 */
     private Long approver;
 
+    /** 分管审核人 */
+    private Long manager;
+
     @Excel(name = "编制人")
     private String compilerUserName;
     private SysUser compilerUser;
 
-    @Excel(name = "审核人")
-    private String auditorUserName;
-    private SysUser auditorUser;
+    @Excel(name = "分管审核人")
+    private String managerUserName;
+    private SysUser managerUser;
+
+    @Excel(name = "总经理")
+    private String zjlUserName;
+    private SysUser zjlUser;
 
-    @Excel(name = "批准人")
-    private String approverUserName;
-    private SysUser approverUser;
+    @Excel(name = "董事长")
+    private String dszUserName;
+    private SysUser dszUser;
 
-    /** 审核人 */
+    /** 总经理 */
     private Long auditor;
 
-    /** 审批时间 */
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @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 auditTime;
+    @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
 
-    /** 批准时间 */
+    /** 董事长批准时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "批准时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date approveTime;
+    @Excel(name = "董事长批准时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dszTime;
 
-    @Excel(name = "审批意见")
-    private String auditComment;
+    @Excel(name = "分管审核意见")
+    private String managerComment;
 
-    @Excel(name = "批准意见")
-    private String approveComment;
+    @Excel(name = "总经理审批意见")
+    private String zjlComment;
+
+    @Excel(name = "董事长批准意见")
+    private String dszComment;
 
     public void setBudgetId(String budgetId)
     {
@@ -328,6 +343,15 @@ public class CmcBudget extends BaseEntity
     {
         return compiler;
     }
+    public void setManager(Long manager)
+    {
+        this.manager = manager;
+    }
+
+    public Long getManager()
+    {
+        return manager;
+    }
     public void setCompilerUser(SysUser compilerUser)
     {
         this.compilerUser = compilerUser;
@@ -338,15 +362,26 @@ public class CmcBudget extends BaseEntity
     {
         return compilerUser;
     }
-    public void setAuditorUser(SysUser auditorUser)
+
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
+    public void setZjlUser(SysUser zjlUser)
     {
-        this.auditorUser = auditorUser;
-        this.auditorUserName = auditorUser == null ? "" : auditorUser.getNickName();
+        this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
     }
 
-    public SysUser getAuditorUser()
+    public SysUser getZjlUser()
     {
-        return auditorUser;
+        return zjlUser;
     }
     public void setAuditor(Long auditor)
     {
@@ -366,51 +401,69 @@ public class CmcBudget extends BaseEntity
     {
         return approver;
     }
-    public void setApproverUser(SysUser approverUser)
+    public void setDszUser(SysUser dszUser)
+    {
+        this.dszUser = dszUser;
+        this.dszUserName = dszUser == null ? "" : dszUser.getNickName();
+    }
+
+    public SysUser getDszUser()
+    {
+        return dszUser;
+    }
+    public void setManagerTime(Date managerTime)
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime()
+    {
+        return managerTime;
+    }
+    public void setZjlTime(Date zjlTime)
     {
-        this.approverUser = approverUser;
-        this.approverUserName = approverUser == null ? "" : approverUser.getNickName();
+        this.zjlTime = zjlTime;
     }
 
-    public SysUser getApproverUser()
+    public Date getZjlTime()
     {
-        return approverUser;
+        return zjlTime;
     }
-    public void setAuditTime(Date auditTime)
+    public void setDszTime(Date dszTime)
     {
-        this.auditTime = auditTime;
+        this.dszTime = dszTime;
     }
 
-    public Date getAuditTime()
+    public Date getDszTime()
     {
-        return auditTime;
+        return dszTime;
     }
-    public void setApproveTime(Date approveTime)
+    public void setManagerComment(String managerComment)
     {
-        this.approveTime = approveTime;
+        this.managerComment = managerComment;
     }
 
-    public Date getApproveTime()
+    public String getManagerComment()
     {
-        return approveTime;
+        return managerComment;
     }
-    public void setAuditComment(String auditComment)
+    public void setZjlComment(String zjlComment)
     {
-        this.auditComment = auditComment;
+        this.zjlComment = zjlComment;
     }
 
-    public String getAuditComment()
+    public String getZjlComment()
     {
-        return auditComment;
+        return zjlComment;
     }
-    public void setApproveComment(String approveComment)
+    public void setDszComment(String dszComment)
     {
-        this.approveComment = approveComment;
+        this.dszComment = dszComment;
     }
 
-    public String getApproveComment()
+    public String getDszComment()
     {
-        return approveComment;
+        return dszComment;
     }
 
     @Override

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

@@ -48,14 +48,6 @@ public class CmcSettle extends BaseEntity
     private String jsUserName;
     private SysUser jsUser;
 
-    @Excel(name = "项目管理部审核人")
-    private String xmUserName;
-    private SysUser xmUser;
-
-    @Excel(name = "承担部门审核人")
-    private String deptUserName;
-    private SysUser deptUser;
-
     @Excel(name = "经营发展部审核人")
     private String jyUserName;
     private SysUser jyUser;
@@ -68,6 +60,10 @@ public class CmcSettle extends BaseEntity
     private String gmUserName;
     private SysUser gmUser;
 
+    @Excel(name = "董事长")
+    private String dszUserName;
+    private SysUser dszUser;
+
     /** 上报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -101,30 +97,6 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "技术质量部审核意见")
     private String jsComment;
 
-    /** 项目管理部审核人 */
-    private Long xmUserId;
-
-    /** 项目管理部审核日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "项目管理部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date xmTime;
-
-    /** 项目管理部审核意见 */
-    @Excel(name = "项目管理部审核意见")
-    private String xmComment;
-
-    /** 承担部门审核人 */
-    private Long deptUserId;
-
-    /** 承担部门审核日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "承担部门审核日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deptTime;
-
-    /** 承担部门审核意见 */
-    @Excel(name = "承担部门审核意见")
-    private String deptComment;
-
     /** 经营发展部审核人 */
     private Long jyUserId;
 
@@ -161,6 +133,18 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "总经理审核意见")
     private String gmComment;
 
+    /** 董事长审核人 */
+    private Long dszUserId;
+
+    /** 董事长审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "董事长审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dszTime;
+
+    /** 董事长审核意见 */
+    @Excel(name = "董事长审核意见")
+    private String dszComment;
+
     /** 原始结算表 */
     @Excel(name = "原始结算表")
     private String settleDocument;
@@ -292,60 +276,6 @@ public class CmcSettle extends BaseEntity
     {
         return jsComment;
     }
-    public void setXmUserId(Long xmUserId) 
-    {
-        this.xmUserId = xmUserId;
-    }
-
-    public Long getXmUserId() 
-    {
-        return xmUserId;
-    }
-    public void setXmTime(Date xmTime) 
-    {
-        this.xmTime = xmTime;
-    }
-
-    public Date getXmTime() 
-    {
-        return xmTime;
-    }
-    public void setXmComment(String xmComment) 
-    {
-        this.xmComment = xmComment;
-    }
-
-    public String getXmComment() 
-    {
-        return xmComment;
-    }
-    public void setDeptUserId(Long deptUserId) 
-    {
-        this.deptUserId = deptUserId;
-    }
-
-    public Long getDeptUserId() 
-    {
-        return deptUserId;
-    }
-    public void setDeptTime(Date deptTime) 
-    {
-        this.deptTime = deptTime;
-    }
-
-    public Date getDeptTime() 
-    {
-        return deptTime;
-    }
-    public void setDeptComment(String deptComment) 
-    {
-        this.deptComment = deptComment;
-    }
-
-    public String getDeptComment() 
-    {
-        return deptComment;
-    }
     public void setJyUserId(Long jyUserId) 
     {
         this.jyUserId = jyUserId;
@@ -427,6 +357,33 @@ public class CmcSettle extends BaseEntity
     {
         return gmComment;
     }
+    public void setDszUserId(Long dszUserId)
+    {
+        this.dszUserId = dszUserId;
+    }
+
+    public Long getDszUserId()
+    {
+        return dszUserId;
+    }
+    public void setDszTime(Date dszTime)
+    {
+        this.dszTime = dszTime;
+    }
+
+    public Date getDszTime()
+    {
+        return dszTime;
+    }
+    public void setDszComment(String dszComment) 
+    {
+        this.dszComment = dszComment;
+    }
+
+    public String getDszComment() 
+    {
+        return dszComment;
+    }
     public void setSettleDocument(String settleDocument)
     {
         this.settleDocument = settleDocument;
@@ -464,16 +421,6 @@ public class CmcSettle extends BaseEntity
     {
         return reporterUser;
     }
-    public void setDeptUser(SysUser deptUser)
-    {
-        this.deptUser = deptUser;
-        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
-    }
-
-    public SysUser getDeptUser()
-    {
-        return deptUser;
-    }
     public void setZhUser(SysUser zhUser)
     {
         this.zhUser = zhUser;
@@ -504,16 +451,6 @@ public class CmcSettle extends BaseEntity
     {
         return jsUser;
     }
-    public void setXmUser(SysUser xmUser)
-    {
-        this.xmUser = xmUser;
-        this.xmUserName = xmUser == null ? "" : xmUser.getNickName();
-    }
-
-    public SysUser getXmUser()
-    {
-        return xmUser;
-    }
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
@@ -534,6 +471,16 @@ public class CmcSettle extends BaseEntity
     {
         return gmUser;
     }
+    public void setDszUser(SysUser dszUser)
+    {
+        this.dszUser = dszUser;
+        this.dszUserName = dszUser == null ? "" : dszUser.getNickName();
+    }
+
+    public SysUser getDszUser()
+    {
+        return dszUser;
+    }
 
     @Override
     public String toString() {
@@ -550,12 +497,6 @@ public class CmcSettle extends BaseEntity
             .append("jsUserId", getJsUserId())
             .append("jsTime", getJsTime())
             .append("jsComment", getJsComment())
-            .append("xmUserId", getXmUserId())
-            .append("xmTime", getXmTime())
-            .append("xmComment", getXmComment())
-            .append("deptUserId", getDeptUserId())
-            .append("deptTime", getDeptTime())
-            .append("deptComment", getDeptComment())
             .append("jyUserId", getJyUserId())
             .append("jyTime", getJyTime())
             .append("jyComment", getJyComment())

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

@@ -12,12 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="price"    column="price"    />
         <result property="quantity"    column="quantity"    />
         <result property="applyAmount"    column="apply_amount"    />
-        <result property="xmAmount"    column="xm_amount"    />
         <result property="managerAmount"    column="manager_amount"    />
     </resultMap>
 
     <sql id="selectCmcBorrowDetailVo">
-        select borrow_detail_id, borrow_id, borrow_item, unit, price, quantity, apply_amount, xm_amount, manager_amount from cmc_borrow_detail
+        select borrow_detail_id, borrow_id, borrow_item, unit, price, quantity, apply_amount, manager_amount from cmc_borrow_detail
     </sql>
 
     <select id="selectCmcBorrowDetailList" parameterType="CmcBorrowDetail" resultMap="CmcBorrowDetailResult">
@@ -29,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null "> and price = #{price}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="applyAmount != null "> and apply_amount = #{applyAmount}</if>
-            <if test="xmAmount != null "> and xm_amount = #{xmAmount}</if>
             <if test="managerAmount != null "> and manager_amount = #{managerAmount}</if>
         </where>
     </select>
@@ -49,7 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">price,</if>
             <if test="quantity != null">quantity,</if>
             <if test="applyAmount != null">apply_amount,</if>
-            <if test="xmAmount != null">xm_amount,</if>
             <if test="managerAmount != null">manager_amount,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -60,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">#{price},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="applyAmount != null">#{applyAmount},</if>
-            <if test="xmAmount != null">#{xmAmount},</if>
             <if test="managerAmount != null">#{managerAmount},</if>
          </trim>
     </insert>
@@ -74,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">price = #{price},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="applyAmount != null">apply_amount = #{applyAmount},</if>
-            <if test="xmAmount != null">xm_amount = #{xmAmount},</if>
             <if test="managerAmount != null">manager_amount = #{managerAmount},</if>
         </trim>
         where borrow_detail_id = #{borrowDetailId}

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

@@ -17,20 +17,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="managerAmount"    column="manager_amount"    />
         <result property="deptComment"    column="dept_comment"    />
         <result property="deptUserId"    column="dept_user_id"    />
-        <result property="xmUserId"    column="xm_user_id"    />
-        <result property="xmComment"    column="xm_comment"    />
         <result property="managerComment"    column="manager_comment"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="zjlUserId"    column="zjl_user_id"    />
         <result property="zjlComment"    column="zjl_comment"    />
+        <result property="dszUserId"    column="dsz_user_id"    />
+        <result property="dszComment"    column="dsz_comment"    />
         <result property="unionUserId"    column="union_user_id"    />
         <result property="unionComment"    column="union_comment"    />
         <result property="cwUserId"    column="cw_user_id"    />
         <result property="cwComment"    column="cw_comment"    />
         <result property="deptTime"    column="dept_time"    />
-        <result property="xmTime"    column="xm_time"    />
         <result property="managerTime"    column="manager_time"    />
         <result property="zjlTime"    column="zjl_time"    />
+        <result property="dszTime"    column="dsz_time"    />
         <result property="lendTime"    column="lend_time"    />
         <result property="lendDocument"    column="lend_document"    />
         <result property="borrowDocument"    column="borrow_document"    />
@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <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" />
@@ -62,11 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="XmUserResult">
-        <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="xm_nick_name"    />
-    </resultMap>
-
     <resultMap type="SysUser" id="ZjlUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="zjl_nick_name"    />
@@ -100,18 +94,16 @@ 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.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
+               b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, u1.nick_name as dept_nick_name, b.manager_comment, b.manager_user_id, u2.nick_name as manager_nick_name,
+               b.zjl_user_id, u3.nick_name as zjl_nick_name, b.zjl_comment, b.dsz_comment,  b.union_user_id, u4.nick_name as union_nick_name, b.union_comment, b.cw_user_id, u5.nick_name as cw_nick_name,
+               b.dsz_user_id, u6.nick_name as dsz_nick_name, b.cw_comment, b.dept_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
-        left join sys_user as u3 on u3.user_id = b.manager_user_id
-        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_user as u2 on u2.user_id = b.manager_user_id
+        left join sys_user as u3 on u3.user_id = b.zjl_user_id
+        left join sys_user as u4 on u4.user_id = b.union_user_id
+        left join sys_user as u5 on u5.user_id = b.cw_user_id
+        left join sys_user as u6 on u6.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>
@@ -130,8 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerAmount != null "> and b.manager_amount = #{managerAmount}</if>
             <if test="deptComment != null  and deptComment != ''"> and b.dept_comment = #{deptComment}</if>
             <if test="deptUserId != null "> and b.dept_user_id = #{deptUserId}</if>
-            <if test="xmUserId != null "> and b.xm_user_id = #{xmUserId}</if>
-            <if test="xmComment != null  and xmComment != ''"> and b.xm_comment = #{xmComment}</if>
             <if test="managerComment != null  and managerComment != ''"> and b.manager_comment = #{managerComment}</if>
             <if test="managerUserId != null "> and b.manager_user_id = #{managerUserId}</if>
             <if test="zjlUserId != null "> and b.zjl_user_id = #{zjlUserId}</if>
@@ -143,7 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
             <if test="cwComment != null  and cwComment != ''"> and b.cw_comment = #{cwComment}</if>
             <if test="deptTime != null "> and b.dept_time = #{deptTime}</if>
-            <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>
@@ -173,8 +162,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerAmount != null">manager_amount,</if>
             <if test="deptComment != null">dept_comment,</if>
             <if test="deptUserId != null">dept_user_id,</if>
-            <if test="xmUserId != null">xm_user_id,</if>
-            <if test="xmComment != null">xm_comment,</if>
             <if test="managerComment != null">manager_comment,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="zjlUserId != null">zjl_user_id,</if>
@@ -186,7 +173,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cwUserId != null">cw_user_id,</if>
             <if test="cwComment != null">cw_comment,</if>
             <if test="deptTime != null">dept_time,</if>
-            <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>
@@ -208,8 +194,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerAmount != null">#{managerAmount},</if>
             <if test="deptComment != null">#{deptComment},</if>
             <if test="deptUserId != null">#{deptUserId},</if>
-            <if test="xmUserId != null">#{xmUserId},</if>
-            <if test="xmComment != null">#{xmComment},</if>
             <if test="managerComment != null">#{managerComment},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="zjlUserId != null">#{zjlUserId},</if>
@@ -221,7 +205,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cwUserId != null">#{cwUserId},</if>
             <if test="cwComment != null">#{cwComment},</if>
             <if test="deptTime != null">#{deptTime},</if>
-            <if test="xmTime != null">#{xmTime},</if>
             <if test="managerTime != null">#{managerTime},</if>
             <if test="zjlTime != null">#{zjlTime},</if>
             <if test="dszTime != null">#{dszTime},</if>
@@ -246,8 +229,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerAmount != null">manager_amount = #{managerAmount},</if>
             <if test="deptComment != null">dept_comment = #{deptComment},</if>
             <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
-            <if test="xmUserId != null">xm_user_id = #{xmUserId},</if>
-            <if test="xmComment != null">xm_comment = #{xmComment},</if>
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
@@ -259,7 +240,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
             <if test="cwComment != null">cw_comment = #{cwComment},</if>
             <if test="deptTime != null">dept_time = #{deptTime},</if>
-            <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>

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

@@ -25,16 +25,18 @@
         <result property="directExpense"    column="direct_expense"    />
         <result property="totalBudget"    column="total_budget"    />
         <result property="compiler"    column="compiler"    />
+        <result property="manager"    column="manager"    />
         <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="zjlComment"    column="zjl_comment"    />
+        <result property="dszComment"    column="dsz_comment"    />
+        <result property="zjlTime"    column="zjl_time"    />
+        <result property="dszTime"    column="dsz_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="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
+        <association property="dszUser"    javaType="SysUser"         resultMap="DszResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
@@ -43,14 +45,19 @@
         <result property="nickName"    column="compiler_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="AuditorResult">
+    <resultMap type="SysUser" id="ManagerResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="auditor_nick_name"    />
+        <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="ApproverResult">
+    <resultMap type="SysUser" id="ZjlResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="approver_nick_name"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DszResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dsz_nick_name"    />
     </resultMap>
 
     <resultMap type="CmcProject" id="CmcProjectResult">
@@ -62,11 +69,12 @@
     <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.approver, u2.nick_name as approver_nick_name, b.create_time, b.audit_time, b.approve_time,
-               b.audit_comment, b.approve_comment from cmc_budget as b
+               u.nick_name as compiler_nick_name, b.manager, u2.nick_name as manager_nick_name, b.auditor, u3.nick_name as zjl_nick_name, b.approver, u4.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
+               b.manager_comment, b.zjl_comment, b.dsz_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.approver
+            left join sys_user as u1 on u1.user_id = b.manager
+            left join sys_user as u2 on u2.user_id = b.auditor
+            left join sys_user as u3 on u3.user_id = b.approver
             left join cmc_project as p on b.project_id = p.project_id
     </sql>
 
@@ -119,12 +127,15 @@
             <if test="directExpense != null">direct_expense,</if>
             <if test="totalBudget != null">total_budget,</if>
             <if test="compiler != null">compiler,</if>
+            <if test="manager != null">manager,</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>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="zjlTime != null">zjl_time,</if>
+            <if test="dszTime != null">dsz_time,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="zjlComment != null">zjl_comment,</if>
+            <if test="dszComment != null">dsz_comment,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -148,12 +159,15 @@
             <if test="directExpense != null">#{directExpense},</if>
             <if test="totalBudget != null">#{totalBudget},</if>
             <if test="compiler != null">#{compiler},</if>
+            <if test="manager != null">#{manager},</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>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="zjlTime != null">#{zjlTime},</if>
+            <if test="dszTime != null">#{dszTime},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="dszComment != null">#{dszComment},</if>
             sysdate()
         </trim>
     </insert>
@@ -180,12 +194,15 @@
             <if test="directExpense != null">direct_expense = #{directExpense},</if>
             <if test="totalBudget != null">total_budget = #{totalBudget},</if>
             <if test="compiler != null">compiler = #{compiler},</if>
+            <if test="manager != null">manager = #{manager},</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="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+            <if test="dszTime != null">dsz_time = #{dszTime},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="dszComment != null">dsz_comment = #{dszComment},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where budget_id = #{budgetId}

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

@@ -20,9 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="xmUserId"    column="xm_user_id"    />
         <result property="xmTime"    column="xm_time"    />
         <result property="xmComment"    column="xm_comment"    />
-        <result property="deptUserId"    column="dept_user_id"    />
-        <result property="deptTime"    column="dept_time"    />
-        <result property="deptComment"    column="dept_comment"    />
         <result property="jyUserId"    column="jy_user_id"    />
         <result property="jyTime"    column="jy_time"    />
         <result property="jyComment"    column="jy_comment"    />
@@ -32,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gmUserId"    column="gm_user_id"    />
         <result property="gmTime"    column="gm_time"    />
         <result property="gmComment"    column="gm_comment"    />
+        <result property="dszUserId"    column="dsz_user_id"    />
+        <result property="dszTime"    column="dsz_time"    />
+        <result property="dszComment"    column="dsz_comment"    />
         <result property="settleDocument"    column="settle_document"    />
         <result property="modifyDocument"    column="modify_document"    />
         <result property="finalDocument"    column="final_document"    />
@@ -39,10 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
         <association property="xmUser"    javaType="SysUser"         resultMap="XmUserResult" />
-        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="jyUser"    javaType="SysUser"         resultMap="JyUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
+        <association property="dszUser"    javaType="SysUser"         resultMap="DszUserResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ReporterUserResult">
@@ -65,11 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="xm_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="DeptUserResult">
-        <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="dept_nick_name"    />
-    </resultMap>
-
     <resultMap type="SysUser" id="JyUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="jy_nick_name"    />
@@ -85,19 +80,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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>
+
     <sql id="selectCmcSettleVo">
         select s.settle_id, s.project_id, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name, 
-               s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.xm_user_id, u3.nick_name as xm_nick_name, s.xm_time, s.xm_comment, s.dept_user_id,
-               u4.nick_name as dept_nick_name, s.dept_time, s.dept_comment, s.jy_user_id, u5.nick_name as jy_nick_name, s.jy_time, s.jy_comment, s.manager_user_id, u6.nick_name as manager_nick_name, 
-               s.manager_time, s.manager_comment, s.gm_user_id, u7.nick_name as gm_nick_name, s.gm_time, s.gm_comment, s.settle_document, s.modify_document, s.final_document from cmc_settle as s
+               s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, 
+               s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment,
+               s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document from cmc_settle as s
         left join sys_user as u on u.user_id = s.reporter
         left join sys_user as u1 on u1.user_id = s.zh_user_id
         left join sys_user as u2 on u2.user_id = s.js_user_id
-        left join sys_user as u3 on u3.user_id = s.xm_user_id
-        left join sys_user as u4 on u4.user_id = s.dept_user_id
-        left join sys_user as u5 on u5.user_id = s.jy_user_id
-        left join sys_user as u6 on u6.user_id = s.manager_user_id
-        left join sys_user as u7 on u7.user_id = s.gm_user_id
+        left join sys_user as u3 on u3.user_id = s.jy_user_id
+        left join sys_user as u4 on u4.user_id = s.manager_user_id
+        left join sys_user as u5 on u5.user_id = s.gm_user_id
+        left join sys_user as u6 on u6.user_id = s.dsz_user_id
     </sql>
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
@@ -115,12 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsUserId != null "> and s.js_user_id = #{jsUserId}</if>
             <if test="jsTime != null "> and s.js_time = #{jsTime}</if>
             <if test="jsComment != null  and jsComment != ''"> and s.js_comment = #{jsComment}</if>
-            <if test="xmUserId != null "> and s.xm_user_id = #{xmUserId}</if>
-            <if test="xmTime != null "> and s.xm_time = #{xmTime}</if>
-            <if test="xmComment != null  and xmComment != ''"> and s.xm_comment = #{xmComment}</if>
-            <if test="deptUserId != null "> and s.dept_user_id = #{deptUserId}</if>
-            <if test="deptTime != null "> and s.dept_time = #{deptTime}</if>
-            <if test="deptComment != null  and deptComment != ''"> and s.dept_comment = #{deptComment}</if>
             <if test="jyUserId != null "> and s.jy_user_id = #{jyUserId}</if>
             <if test="jyTime != null "> and s.jy_time = #{jyTime}</if>
             <if test="jyComment != null  and jyComment != ''"> and s.jy_comment = #{jyComment}</if>
@@ -154,12 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsUserId != null">js_user_id,</if>
             <if test="jsTime != null">js_time,</if>
             <if test="jsComment != null">js_comment,</if>
-            <if test="xmUserId != null">xm_user_id,</if>
-            <if test="xmTime != null">xm_time,</if>
-            <if test="xmComment != null">xm_comment,</if>
-            <if test="deptUserId != null">dept_user_id,</if>
-            <if test="deptTime != null">dept_time,</if>
-            <if test="deptComment != null">dept_comment,</if>
             <if test="jyUserId != null">jy_user_id,</if>
             <if test="jyTime != null">jy_time,</if>
             <if test="jyComment != null">jy_comment,</if>
@@ -169,6 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null">gm_user_id,</if>
             <if test="gmTime != null">gm_time,</if>
             <if test="gmComment != null">gm_comment,</if>
+            <if test="dszUserId != null">dsz_user_id,</if>
+            <if test="dszTime != null">dsz_time,</if>
+            <if test="dszComment != null">dsz_comment,</if>
             <if test="settleDocument != null">settle_document,</if>
             <if test="modifyDocument != null">modify_document,</if>
             <if test="finalDocument != null">final_document,</if>
@@ -186,12 +176,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsUserId != null">#{jsUserId},</if>
             <if test="jsTime != null">#{jsTime},</if>
             <if test="jsComment != null">#{jsComment},</if>
-            <if test="xmUserId != null">#{xmUserId},</if>
-            <if test="xmTime != null">#{xmTime},</if>
-            <if test="xmComment != null">#{xmComment},</if>
-            <if test="deptUserId != null">#{deptUserId},</if>
-            <if test="deptTime != null">#{deptTime},</if>
-            <if test="deptComment != null">#{deptComment},</if>
             <if test="jyUserId != null">#{jyUserId},</if>
             <if test="jyTime != null">#{jyTime},</if>
             <if test="jyComment != null">#{jyComment},</if>
@@ -201,6 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null">#{gmUserId},</if>
             <if test="gmTime != null">#{gmTime},</if>
             <if test="gmComment != null">#{gmComment},</if>
+            <if test="dszUserId != null">#{dszUserId},</if>
+            <if test="dszTime != null">#{dszTime},</if>
+            <if test="dszComment != null">#{dszComment},</if>
             <if test="settleDocument != null">#{settleDocument},</if>
             <if test="modifyDocument != null">#{modifyDocument},</if>
             <if test="finalDocument != null">#{finalDocument},</if>
@@ -221,12 +208,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsUserId != null">js_user_id = #{jsUserId},</if>
             <if test="jsTime != null">js_time = #{jsTime},</if>
             <if test="jsComment != null">js_comment = #{jsComment},</if>
-            <if test="xmUserId != null">xm_user_id = #{xmUserId},</if>
-            <if test="xmTime != null">xm_time = #{xmTime},</if>
-            <if test="xmComment != null">xm_comment = #{xmComment},</if>
-            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
-            <if test="deptTime != null">dept_time = #{deptTime},</if>
-            <if test="deptComment != null">dept_comment = #{deptComment},</if>
             <if test="jyUserId != null">jy_user_id = #{jyUserId},</if>
             <if test="jyTime != null">jy_time = #{jyTime},</if>
             <if test="jyComment != null">jy_comment = #{jyComment},</if>
@@ -236,6 +217,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
             <if test="gmTime != null">gm_time = #{gmTime},</if>
             <if test="gmComment != null">gm_comment = #{gmComment},</if>
+            <if test="dszUserId != null">dsz_user_id = #{dszUserId},</if>
+            <if test="dszTime != null">dsz_time = #{dszTime},</if>
+            <if test="dszComment != null">dsz_comment = #{dszComment},</if>
             <if test="settleDocument != null">settle_document = #{settleDocument},</if>
             <if test="modifyDocument != null">modify_document = #{modifyDocument},</if>
             <if test="finalDocument != null">final_document = #{finalDocument},</if>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-09 17:01:08
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-10 17:20:43
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -955,6 +955,9 @@ export default {
         work.remark = '不足600，按600算'
         sum = 600
       }
+      else {
+        work.remark = ''
+      }
       work.settle = Number(sum).toFixed(2);
       this.calculateSumSettle();
       this.calculateActualSumSettle();

oa-ui/src/views/oa/project/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-09 15:26:58
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-10 15:09:11
 -->
 <template>
   <div class="project-wrapper">
@@ -244,7 +244,8 @@ import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projec
 import { listDept } from '@/api/system/dept';
 import { listUser, getUser } from '@/api/system/user';
 import { mapGetters } from 'vuex';
-import { getIsDeptLeader } from '@/api/system/post.js'
+import { checkPermi } from '@/utils/permission';
+
 export default {
   computed: {
     ...mapGetters(['deptId', 'userId'])
@@ -297,9 +298,9 @@ export default {
     // 查询项目列表
     async getList() {
       this.loading = true
-      if (this.deptId > 107) {
-        let response = await getIsDeptLeader({ deptId: this.deptId })
-        if (response.data == false) {
+      if (this.deptId > 107 && this.deptId != 109) {
+        let response = await checkPermi(['oa:allproject:query'])
+        if (response == false) {
           this.queryParams.undertakingDept = this.deptId
         }
       }