零时薪资单5

yd-api/src/main/java/com/yd/api/practitioner/vo/n22/SalaryDetail.java

@@ -17,5 +17,5 @@ public class SalaryDetail {
 
     private Double after_tax_comis;//税后应发
 
-    private Integer salaryType;
+    private String salaryType;
 }

yd-api/src/main/java/com/yd/dal/entity/salary/AgAclSalary.java

@@ -32,7 +32,7 @@ public class AgAclSalary implements Serializable {
     /**
      * 薪资类别(1=个人销售A; 2=销售管理B; 3=其他加扣款C)
      */
-    private Integer salaryType;
+    private String salaryType;
 
     /**
      * 薪资code
@@ -128,11 +128,11 @@ public class AgAclSalary implements Serializable {
         this.yearMonth = yearMonth;
     }
 
-    public Integer getSalaryType() {
+    public String getSalaryType() {
         return salaryType;
     }
 
-    public void setSalaryType(Integer salaryType) {
+    public void setSalaryType(String salaryType) {
         this.salaryType = salaryType;
     }
 

yd-api/src/main/resources/mapper/salary/AgAclSalaryMapper.xml

@@ -6,7 +6,7 @@
     <result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
     <result column="practitioner_code" jdbcType="VARCHAR" property="practitionerCode" />
     <result column="year_month" jdbcType="VARCHAR" property="yearMonth" />
-    <result column="salary_type" jdbcType="INTEGER" property="salaryType" />
+    <result column="salary_type" jdbcType="VARCHAR" property="salaryType" />
     <result column="salary_code" jdbcType="VARCHAR" property="salaryCode" />
     <result column="salary_name" jdbcType="VARCHAR" property="salaryName" />
     <result column="amount" jdbcType="DECIMAL" property="amount" />
@@ -44,7 +44,7 @@
       created_by, updated_at, updated_by
       )
     values (#{practitionerId,jdbcType=BIGINT}, #{practitionerCode,jdbcType=VARCHAR}, 
-      #{yearMonth,jdbcType=VARCHAR}, #{salaryType,jdbcType=INTEGER}, #{salaryCode,jdbcType=VARCHAR}, 
+      #{yearMonth,jdbcType=VARCHAR}, #{salaryType,jdbcType=VARCHAR}, #{salaryCode,jdbcType=VARCHAR},
       #{salaryName,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{tax,jdbcType=DECIMAL}, 
       #{afterTaxAmount,jdbcType=DECIMAL}, #{lifePractitionerSalaryId,jdbcType=BIGINT}, 
       #{isActive,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
@@ -167,7 +167,7 @@
         `year_month` = #{yearMonth,jdbcType=VARCHAR},
       </if>
       <if test="salaryType != null">
-        salary_type = #{salaryType,jdbcType=INTEGER},
+        salary_type = #{salaryType,jdbcType=VARCHAR},
       </if>
       <if test="salaryCode != null">
         salary_code = #{salaryCode,jdbcType=VARCHAR},
@@ -213,7 +213,7 @@
     set practitioner_id = #{practitionerId,jdbcType=BIGINT},
       practitioner_code = #{practitionerCode,jdbcType=VARCHAR},
       `year_month` = #{yearMonth,jdbcType=VARCHAR},
-      salary_type = #{salaryType,jdbcType=INTEGER},
+      salary_type = #{salaryType,jdbcType=VARCHAR},
       salary_code = #{salaryCode,jdbcType=VARCHAR},
       salary_name = #{salaryName,jdbcType=VARCHAR},
       amount = #{amount,jdbcType=DECIMAL},
@@ -236,55 +236,55 @@
 
   <select id="queryByRecord" parameterType="com.yd.dal.entity.salary.AgAclSalary" resultMap="BaseResultMap">
     select * from  ag_acl_salary
-    where
+    where 1=1
     <trim suffixOverrides=",">
       <if test="practitionerId != null">
-        practitioner_id = #{practitionerId,jdbcType=BIGINT},
+        and practitioner_id = #{practitionerId,jdbcType=BIGINT}
       </if>
       <if test="practitionerCode != null">
-        practitioner_code = #{practitionerCode,jdbcType=VARCHAR},
+        and practitioner_code = #{practitionerCode,jdbcType=VARCHAR}
       </if>
       <if test="yearMonth != null">
-        `year_month` = #{yearMonth,jdbcType=VARCHAR},
+        and `year_month` = #{yearMonth,jdbcType=VARCHAR}
       </if>
       <if test="salaryType != null">
-        salary_type = #{salaryType,jdbcType=INTEGER},
+        and salary_type = #{salaryType,jdbcType=VARCHAR}
       </if>
       <if test="salaryCode != null">
-        salary_code = #{salaryCode,jdbcType=VARCHAR},
+        and salary_code = #{salaryCode,jdbcType=VARCHAR}
       </if>
       <if test="salaryName != null">
-        salary_name = #{salaryName,jdbcType=VARCHAR},
+        and salary_name = #{salaryName,jdbcType=VARCHAR}
       </if>
       <if test="amount != null">
-        amount = #{amount,jdbcType=DECIMAL},
+        and amount = #{amount,jdbcType=DECIMAL}
       </if>
       <if test="tax != null">
-        tax = #{tax,jdbcType=DECIMAL},
+        and tax = #{tax,jdbcType=DECIMAL}
       </if>
       <if test="afterTaxAmount != null">
-        after_tax_amount = #{afterTaxAmount,jdbcType=DECIMAL},
+        and after_tax_amount = #{afterTaxAmount,jdbcType=DECIMAL}
       </if>
       <if test="lifePractitionerSalaryId != null">
-        life_practitioner_salary_id = #{lifePractitionerSalaryId,jdbcType=BIGINT},
+        and life_practitioner_salary_id = #{lifePractitionerSalaryId,jdbcType=BIGINT}
       </if>
       <if test="isActive != null">
-        is_active = #{isActive,jdbcType=INTEGER},
+        and is_active = #{isActive,jdbcType=INTEGER}
       </if>
       <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
+        and remark = #{remark,jdbcType=VARCHAR}
       </if>
       <if test="createdAt != null">
-        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        and created_at = #{createdAt,jdbcType=TIMESTAMP}
       </if>
       <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
+        and created_by = #{createdBy,jdbcType=BIGINT}
       </if>
       <if test="updatedAt != null">
-        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        and updated_at = #{updatedAt,jdbcType=TIMESTAMP}
       </if>
       <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
+        and updated_by = #{updatedBy,jdbcType=BIGINT}
       </if>
     </trim>
   </select>