导出绩效表，增加绩效备注字段

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

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -22,10 +24,12 @@ public class CmcPerformance extends BaseEntity
 
     /** 上报人 */
     @Excel(name = "上报人")
+    private String reportUserName;
     private Long reporter;
 
     /** 上报部门 */
     @Excel(name = "上报部门")
+    private String deptName;
     private Long reportDept;
 
     /** 附件 */
@@ -43,6 +47,7 @@ public class CmcPerformance extends BaseEntity
 
     /** 分管审核人 */
     @Excel(name = "分管审核人")
+    private String managerUserName;
     private Long managerUserId;
 
     /** 分管审核时间 */
@@ -56,6 +61,7 @@ public class CmcPerformance extends BaseEntity
 
     /** 总经理审批人 */
     @Excel(name = "总经理审批人")
+    private String zjlUserName;
     private Long zjlUserId;
 
     /** 总经理审批时间 */
@@ -72,6 +78,14 @@ public class CmcPerformance extends BaseEntity
     @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zhTime;
 
+    private SysUser reportUser;
+
+    private SysUser managerUser;
+
+    private SysUser zjlUser;
+
+    private SysDept dept;
+
     public void setPerformanceId(String performanceId)
     {
         this.performanceId = performanceId;
@@ -90,6 +104,16 @@ public class CmcPerformance extends BaseEntity
     {
         return reporter;
     }
+    public void setReportUser(SysUser reportUser)
+    {
+        this.reportUser = reportUser;
+        this.reportUserName = reportUser == null ? "" : reportUser.getNickName();
+    }
+
+    public SysUser getReportUser()
+    {
+        return reportUser;
+    }
     public void setReportDept(Long reportDept)
     {
         this.reportDept = reportDept;
@@ -99,6 +123,16 @@ public class CmcPerformance extends BaseEntity
     {
         return reportDept;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setDocument(String document)
     {
         this.document = document;
@@ -126,6 +160,16 @@ public class CmcPerformance extends BaseEntity
     {
         return managerUserId;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setManagerComment(String managerComment)
     {
         this.managerComment = managerComment;
@@ -153,6 +197,16 @@ public class CmcPerformance extends BaseEntity
     {
         return zjlUserId;
     }
+    public void setZjlUser(SysUser zjlUser)
+    {
+        this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
+    }
+
+    public SysUser getZjlUser()
+    {
+        return zjlUser;
+    }
     public void setZjlComment(String zjlComment)
     {
         this.zjlComment = zjlComment;

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -27,7 +28,7 @@ public class CmcSettle extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    @Excel(name = "承担部门")
+//    @Excel(name = "承担部门")
     private String undertakingDept;
 
     /** 其他项目名称 */
@@ -44,11 +45,12 @@ public class CmcSettle extends BaseEntity
 
     /** 上报人 */
     @Excel(name = "项目负责人")
-    private String reporterUserName;
+    private String reportUserName;
     private Long reporter;
 
     /** 上报部门 */
     @Excel(name = "上报部门")
+    private String deptName;
     private Long reportDept;
 
     /** 上报日期 */
@@ -152,7 +154,7 @@ public class CmcSettle extends BaseEntity
 //    @Excel(name = "最终结算表")
     private String finalDocument;
 
-    private SysUser reporterUser;
+    private SysUser reportUser;
 
     private SysUser zhUser;
 
@@ -168,6 +170,8 @@ public class CmcSettle extends BaseEntity
 
     private CmcProject project;
 
+    private SysDept dept;
+
     public void setSettleId(String settleId) 
     {
         this.settleId = settleId;
@@ -242,6 +246,16 @@ public class CmcSettle extends BaseEntity
     {
         return reporter;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setReportTime(Date reportTime) 
     {
         this.reportTime = reportTime;
@@ -449,15 +463,15 @@ public class CmcSettle extends BaseEntity
     {
         return finalDocument;
     }
-    public void setReporterUser(SysUser reporterUser)
+    public void setReportUser(SysUser reportUser)
     {
-        this.reporterUser = reporterUser;
-        this.reporterUserName = reporterUser == null ? "" : reporterUser.getNickName();
+        this.reportUser = reportUser;
+        this.reportUserName = reportUser == null ? "" : reportUser.getNickName();
     }
 
-    public SysUser getReporterUser()
+    public SysUser getReportUser()
     {
-        return reporterUser;
+        return reportUser;
     }
     public void setZhUser(SysUser zhUser)
     {

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

@@ -19,33 +19,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zjlTime"    column="zjl_time"    />
         <result property="zhUserId"    column="zh_user_id"    />
         <result property="zhTime"    column="zh_time"    />
+        <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ReportUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="report_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZjlUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectCmcPerformanceVo">
-        select performance_id, reporter, document, remark, report_time, report_dept, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, zh_user_id, zh_time from cmc_performance
+        select p.performance_id, p.reporter, u.nick_name as report_nick_name, p.document, p.remark, p.report_time, p.report_dept, d.dept_name,
+               p.manager_user_id, u1.nick_name as manager_nick_name,p.manager_comment, p.manager_time, p.zjl_user_id, u2.nick_name as zjl_nick_name,
+               p.zjl_comment, p.zjl_time, p.zh_user_id, p.zh_time from cmc_performance as p
+        left join sys_user as u on u.user_id = o.reporter
+        left join sys_user as u1 on u1.user_id = o.manager_user_id
+        left join sys_user as u2 on u2.user_id = o.zjl_user_id
+        left join sys_dept as d on d.dept_id = o.apply_dept
     </sql>
 
     <select id="selectCmcPerformanceList" parameterType="CmcPerformance" resultMap="CmcPerformanceResult">
         <include refid="selectCmcPerformanceVo"/>
         <where>  
-            <if test="reporter != null "> and reporter = #{reporter}</if>
-            <if test="document != null  and document != ''"> and document = #{document}</if>
-            <if test="reportTime != null "> and report_time = #{reportTime}</if>
-            <if test="reportDept != null "> and report_dept = #{reportDept}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
-            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
-            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
-            <if test="zhUserId != null "> and zh_user_id = #{zhUserId}</if>
-            <if test="zhTime != null "> and zh_time = #{zhTime}</if>
+            <if test="reporter != null "> and p.reporter = #{reporter}</if>
+            <if test="document != null  and document != ''"> and p.document = #{document}</if>
+            <if test="reportTime != null "> and p.report_time = #{reportTime}</if>
+            <if test="reportDept != null "> and p.report_dept = #{reportDept}</if>
+            <if test="managerUserId != null "> and p.manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and p.manager_comment = #{managerComment}</if>
+            <if test="managerTime != null "> and p.manager_time = #{managerTime}</if>
+            <if test="zjlUserId != null "> and p.zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and p.zjl_comment = #{zjlComment}</if>
+            <if test="zjlTime != null "> and p.zjl_time = #{zjlTime}</if>
+            <if test="zhUserId != null "> and p.zh_user_id = #{zhUserId}</if>
+            <if test="zhTime != null "> and p.zh_time = #{zhTime}</if>
         </where>
     </select>
     
     <select id="selectCmcPerformanceByPerformanceId" parameterType="String" resultMap="CmcPerformanceResult">
         <include refid="selectCmcPerformanceVo"/>
-        where performance_id = #{performanceId}
+        where p.performance_id = #{performanceId}
     </select>
         
     <insert id="insertCmcPerformance" parameterType="CmcPerformance">

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settleDocument"    column="settle_document"    />
         <result property="modifyDocument"    column="modify_document"    />
         <result property="finalDocument"    column="final_document"    />
-        <association property="reporterUser"    javaType="SysUser"         resultMap="ReporterUserResult" />
+        <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
         <association property="jyUser"    javaType="SysUser"         resultMap="JyUserResult" />
@@ -43,11 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
         <association property="dszUser"    javaType="SysUser"         resultMap="DszUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="ReporterUserResult">
+    <resultMap type="SysUser" id="ReportUserResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="reporter_nick_name"    />
+        <result property="nickName"    column="report_nick_name"    />
     </resultMap>
 
     <resultMap type="SysUser" id="ZhUserResult">
@@ -87,11 +88,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="undertakingDept"    column="undertaking_dept"    />
     </resultMap>
 
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
     <sql id="selectCmcSettleVo">
-        select s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, 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,
+        select s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as report_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.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, s.report_dept from cmc_settle as s
+               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, s.report_dept, d.dept_name 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
@@ -100,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
         left join cmc_project as p on p.project_id = s.project_id
+        left join sys_dept as d on d.dept_id = s.report_dept
     </sql>
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">

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

@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="paidWage"    column="paid_wage"    />
         <result property="payDay"    column="pay_day"    />
         <result property="payMonth"    column="pay_month"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcWageVo">
-        select wage_id, user_id, base_salary, year_salary, post_salary, performance_salary, certificates_subsidy, festival_subsidy, post_stable_subsidy, high_temperature_subsidy, attendance_deduct, payable_wage, house_fund, endowment_insurance, unemployment_insurance, medical_insurance, property_fee, deduct_total, social_security_unit, individual_income_tax, paid_wage, pay_day, pay_month from cmc_wage
+        select wage_id, user_id, base_salary, year_salary, post_salary, performance_salary, certificates_subsidy, festival_subsidy, post_stable_subsidy, high_temperature_subsidy, attendance_deduct, payable_wage, house_fund, endowment_insurance, unemployment_insurance, medical_insurance, property_fee, deduct_total, social_security_unit, individual_income_tax, paid_wage, pay_day, pay_month, remark from cmc_wage
     </sql>
 
     <select id="selectCmcWageList" parameterType="CmcWage" resultMap="CmcWageResult">
@@ -93,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidWage != null">paid_wage,</if>
             <if test="payDay != null">pay_day,</if>
             <if test="payMonth != null">pay_month,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="wageId != null">#{wageId},</if>
@@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidWage != null">#{paidWage},</if>
             <if test="payDay != null">#{payDay},</if>
             <if test="payMonth != null">#{payMonth},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -146,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidWage != null">paid_wage = #{paidWage},</if>
             <if test="payDay != null">pay_day = #{payDay},</if>
             <if test="payMonth != null">pay_month = #{payMonth},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where wage_id = #{wageId}
     </update>

oa-ui/src/views/flowable/form/procure/procureForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-19 13:45:43
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-24 11:32:36
+ * @LastEditTime: 2024-09-24 11:44:34
 -->
 <template>
   <div class="app-container">
@@ -202,7 +202,7 @@ export default {
       const planList = this.$refs.planRef.itemList;
       const isAdd = this.$refs.planRef.formTotal;
       const procureApplyId = this.taskForm.formId;
-      if (isAdd)
+      if (isAdd != 0)
         await delProcurePlan(procureApplyId)
       for (let plan of planList) {
         plan.procureApplyId = procureApplyId