人事绩效

airport-personnel/src/main/java/com/sundot/airport/personnel/domain/PersonnelMonthlyAssessmentIndicatorDetail.java

@@ -52,6 +52,22 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
     @Excel(name = "指标名称")
     private String indicatorName;
 
+    /** 所属一级分类编码 */
+    @Excel(name = "所属一级分类编码")
+    private String categoryCodeOne;
+
+    /** 所属一级分类名称 */
+    @Excel(name = "所属一级分类名称")
+    private String categoryNameOne;
+
+    /** 所属二级分类编码 */
+    @Excel(name = "所属二级分类编码")
+    private String categoryCode;
+
+    /** 所属二级分类名称 */
+    @Excel(name = "所属二级分类名称")
+    private String categoryName;
+
     /** 分值 */
     @Excel(name = "分值")
     private BigDecimal score;
@@ -155,6 +171,38 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
         return indicatorName;
     }
 
+    public String getCategoryCodeOne() {
+        return categoryCodeOne;
+    }
+
+    public void setCategoryCodeOne(String categoryCodeOne) {
+        this.categoryCodeOne = categoryCodeOne;
+    }
+
+    public String getCategoryNameOne() {
+        return categoryNameOne;
+    }
+
+    public void setCategoryNameOne(String categoryNameOne) {
+        this.categoryNameOne = categoryNameOne;
+    }
+
+    public String getCategoryCode() {
+        return categoryCode;
+    }
+
+    public void setCategoryCode(String categoryCode) {
+        this.categoryCode = categoryCode;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
     public void setScore(BigDecimal score) {
         this.score = score;
     }
@@ -243,6 +291,10 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
                 .append("indicatorId", getIndicatorId())
                 .append("indicatorCode", getIndicatorCode())
                 .append("indicatorName", getIndicatorName())
+                .append("categoryCodeOne", getCategoryCodeOne())
+                .append("categoryNameOne", getCategoryNameOne())
+                .append("categoryCode", getCategoryCode())
+                .append("categoryName", getCategoryName())
                 .append("score", getScore())
                 .append("unit", getUnit())
                 .append("leaveType", getLeaveType())

airport-personnel/src/main/resources/mapper/personnel/PersonnelMonthlyAssessmentIndicatorDetailMapper.xml

@@ -18,6 +18,10 @@
         <result property="indicatorId" column="indicator_id"/>
         <result property="indicatorCode" column="indicator_code"/>
         <result property="indicatorName" column="indicator_name"/>
+        <result property="categoryCodeOne" column="category_code_one"/>
+        <result property="categoryNameOne" column="category_name_one"/>
+        <result property="categoryCode" column="category_code"/>
+        <result property="categoryName" column="category_name"/>
         <result property="score" column="score"/>
         <result property="unit" column="unit"/>
         <result property="leaveType" column="leave_type"/>
@@ -42,6 +46,10 @@
                indicator_id,
                indicator_code,
                indicator_name,
+               category_code_one,
+               category_name_one,
+               category_code,
+               category_name,
                score,
                unit,
                leave_type,
@@ -67,6 +75,15 @@
             <if test="indicatorName != null  and indicatorName != ''">and indicator_name like concat('%',
                 #{indicatorName}, '%')
             </if>
+            <if test="categoryCodeOne != null  and categoryCodeOne != ''">and category_code_one = #{categoryCodeOne}
+            </if>
+            <if test="categoryNameOne != null  and categoryNameOne != ''">and category_name_one like concat('%',
+                #{categoryNameOne}, '%')
+            </if>
+            <if test="categoryCode != null  and categoryCode != ''">and category_code = #{categoryCode}</if>
+            <if test="categoryName != null  and categoryName != ''">and category_name like concat('%',
+                #{categoryName}, '%')
+            </if>
             <if test="score != null ">and score = #{score}</if>
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
             <if test="leaveType != null  and leaveType != ''">and leave_type = #{leaveType}</if>
@@ -103,6 +120,10 @@
             <if test="indicatorId != null">indicator_id,</if>
             <if test="indicatorCode != null and indicatorCode != ''">indicator_code,</if>
             <if test="indicatorName != null and indicatorName != ''">indicator_name,</if>
+            <if test="categoryCodeOne != null and categoryCodeOne != ''">category_code_one,</if>
+            <if test="categoryNameOne != null and categoryNameOne != ''">category_name_one,</if>
+            <if test="categoryCode != null and categoryCode != ''">category_code,</if>
+            <if test="categoryName != null and categoryName != ''">category_name,</if>
             <if test="score != null">score,</if>
             <if test="unit != null">unit,</if>
             <if test="leaveType != null">leave_type,</if>
@@ -125,6 +146,10 @@
             <if test="indicatorId != null">#{indicatorId},</if>
             <if test="indicatorCode != null and indicatorCode != ''">#{indicatorCode},</if>
             <if test="indicatorName != null and indicatorName != ''">#{indicatorName},</if>
+            <if test="categoryCodeOne != null and categoryCodeOne != ''">#{categoryCodeOne},</if>
+            <if test="categoryNameOne != null and categoryNameOne != ''">#{categoryNameOne},</if>
+            <if test="categoryCode != null and categoryCode != ''">#{categoryCode},</if>
+            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
             <if test="score != null">#{score},</if>
             <if test="unit != null">#{unit},</if>
             <if test="leaveType != null">#{leaveType},</if>
@@ -152,6 +177,10 @@
             <if test="indicatorId != null">indicator_id = #{indicatorId},</if>
             <if test="indicatorCode != null and indicatorCode != ''">indicator_code = #{indicatorCode},</if>
             <if test="indicatorName != null and indicatorName != ''">indicator_name = #{indicatorName},</if>
+            <if test="categoryCodeOne != null and categoryCodeOne != ''">category_code_one = #{categoryCodeOne},</if>
+            <if test="categoryNameOne != null and categoryNameOne != ''">category_name_one = #{categoryNameOne},</if>
+            <if test="categoryCode != null and categoryCode != ''">category_code = #{categoryCode},</if>
+            <if test="categoryName != null and categoryName != ''">category_name = #{categoryName},</if>
             <if test="score != null">score = #{score},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="leaveType != null">leave_type = #{leaveType},</if>