工资表新增绩效审批id

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

@@ -111,6 +111,9 @@ public class CmcWage extends BaseEntity
     @Excel(name = "发放月份", width = 30, dateFormat = "yyyy-MM-dd")
     private Date payMonth;
 
+    /** 绩效审批id */
+    private String performanceId;
+
     public void setWageId(Integer wageId) 
     {
         this.wageId = wageId;
@@ -318,6 +321,15 @@ public class CmcWage extends BaseEntity
     {
         return payMonth;
     }
+    public void setPerformanceId(String performanceId)
+    {
+        this.performanceId = performanceId;
+    }
+
+    public String getPerformanceId()
+    {
+        return performanceId;
+    }
 
     @Override
     public String toString() {
@@ -345,6 +357,7 @@ public class CmcWage extends BaseEntity
             .append("paidWage", getPaidWage())
             .append("payDay", getPayDay())
             .append("payMonth", getPayMonth())
+            .append("performanceId", getPerformanceId())
             .toString();
     }
 }

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

@@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payDay"    column="pay_day"    />
         <result property="payMonth"    column="pay_month"    />
         <result property="remark"    column="remark"    />
+        <result property="performanceId"    column="performance_id"    />
     </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, remark 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, performance_id from cmc_wage
     </sql>
 
     <select id="selectCmcWageList" parameterType="CmcWage" resultMap="CmcWageResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidWage != null "> and paid_wage = #{paidWage}</if>
             <if test="payDay != null "> and pay_day = #{payDay}</if>
             <if test="payMonth != null "> and pay_month = #{payMonth}</if>
+            <if test="performanceId != null and performanceId != ''"> and performance_id = #{performanceId}</if>
         </where>
     </select>
     
@@ -95,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payDay != null">pay_day,</if>
             <if test="payMonth != null">pay_month,</if>
             <if test="remark != null">remark,</if>
+            <if test="performanceId != null">performance_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="wageId != null">#{wageId},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payDay != null">#{payDay},</if>
             <if test="payMonth != null">#{payMonth},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="performanceId != null">#{performanceId},</if>
          </trim>
     </insert>
 
@@ -150,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payDay != null">pay_day = #{payDay},</if>
             <if test="payMonth != null">pay_month = #{payMonth},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="performanceId != null">performance_id = #{performanceId},</if>
         </trim>
         where wage_id = #{wageId}
     </update>