考核指标表

airport-system/src/main/java/com/sundot/airport/system/domain/BasePerformanceIndicator.java

@@ -25,6 +25,14 @@ public class BasePerformanceIndicator extends BaseEntity {
     /** 主键 */
     private Long id;
 
+    /** 所属一级分类编码 */
+    @Excel(name = "所属一级分类编码", type = Excel.Type.EXPORT)
+    private String categoryCodeOne;
+
+    /** 所属一级分类名称 */
+    @Excel(name = "所属一级分类名称")
+    private String categoryNameOne;
+
     /** 所属二级分类编码 */
     @Excel(name = "所属二级分类编码", type = Excel.Type.EXPORT)
     private String categoryCode;
@@ -38,7 +46,6 @@ public class BasePerformanceIndicator extends BaseEntity {
     private String code;
 
     /** 序号 */
-    @Excel(name = "序号")
     private String serialNumber;
 
     /** 指标名称 */
@@ -74,14 +81,6 @@ public class BasePerformanceIndicator extends BaseEntity {
             type = Excel.Type.EXPORT)
     private String rewardPunishmentType;
 
-    /** 所属一级分类编码 */
-    @Excel(name = "所属一级分类编码", type = Excel.Type.EXPORT)
-    private String categoryCodeOne;
-
-    /** 所属一级分类名称 */
-    @Excel(name = "所属一级分类名称")
-    private String categoryNameOne;
-
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -106,6 +105,22 @@ public class BasePerformanceIndicator extends BaseEntity {
         return id;
     }
 
+    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 void setCategoryCode(String categoryCode) {
         this.categoryCode = categoryCode;
     }
@@ -186,22 +201,6 @@ public class BasePerformanceIndicator extends BaseEntity {
         this.rewardPunishmentType = rewardPunishmentType;
     }
 
-    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;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -213,6 +212,8 @@ public class BasePerformanceIndicator extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("id", getId())
+                .append("categoryCodeOne", getCategoryCodeOne())
+                .append("categoryNameOne", getCategoryNameOne())
                 .append("categoryCode", getCategoryCode())
                 .append("categoryName", getCategoryName())
                 .append("code", getCode())
@@ -222,8 +223,6 @@ public class BasePerformanceIndicator extends BaseEntity {
                 .append("unit", getUnit())
                 .append("leaveType", getLeaveType())
                 .append("rewardPunishmentType", getRewardPunishmentType())
-                .append("categoryCodeOne", getCategoryCodeOne())
-                .append("categoryNameOne", getCategoryNameOne())
                 .toString();
     }
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/BasePerformanceIndicatorServiceImpl.java

@@ -226,8 +226,9 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
                     continue;
                 }
 
-                // 查询是否已存在（根据【所属二级分类编码+指标名称】唯一）
+                // 查询是否已存在（根据【所属一级分类编码+所属二级分类编码+指标名称】唯一）
                 BasePerformanceIndicator queryParam = new BasePerformanceIndicator();
+                queryParam.setCategoryCodeOne(data.getCategoryCodeOne());
                 queryParam.setCategoryCode(data.getCategoryCode());
                 queryParam.setName(data.getName());
                 List<BasePerformanceIndicator> existingList = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(queryParam);
@@ -238,7 +239,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
                     data.setCreateTime(DateUtils.getNowDate());
                     basePerformanceIndicatorMapper.insertBasePerformanceIndicator(data);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】导入成功");
+                    successMsg.append("<br/>" + successNum + "、所属一级分类名称【" + data.getCategoryNameOne() + "】、所属二级分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】导入成功");
                 } else if (isUpdateSupport) {
                     // 更新
                     BasePerformanceIndicator old = existingList.get(0);
@@ -246,14 +247,14 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
                     data.setUpdateTime(DateUtils.getNowDate());
                     basePerformanceIndicatorMapper.updateBasePerformanceIndicator(data);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】更新成功");
+                    successMsg.append("<br/>" + successNum + "、所属一级分类名称【" + data.getCategoryNameOne() + "】、所属二级分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】已存在");
+                    failureMsg.append("<br/>" + failureNum + "、所属一级分类名称【" + data.getCategoryNameOne() + "】、所属二级分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】已存在");
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】导入失败：";
+                String msg = "<br/>" + failureNum + "、所属一级分类名称【" + data.getCategoryNameOne() + "】、所属二级分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }

airport-system/src/main/resources/mapper/system/BasePerformanceIndicatorMapper.xml

@@ -13,6 +13,8 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="id" column="id"/>
+        <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="code" column="code"/>
@@ -22,8 +24,6 @@
         <result property="unit" column="unit"/>
         <result property="leaveType" column="leave_type"/>
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
-        <result property="categoryCodeOne" column="category_code_one"/>
-        <result property="categoryNameOne" column="category_name_one"/>
     </resultMap>
 
     <sql id="selectBasePerformanceIndicatorVo">
@@ -35,6 +35,8 @@
                update_time,
                remark,
                id,
+               category_code_one,
+               category_name_one,
                category_code,
                category_name,
                code,
@@ -43,9 +45,7 @@
                score,
                unit,
                leave_type,
-               reward_punishment_type,
-               category_code_one,
-               category_name_one
+               reward_punishment_type
         from base_performance_indicator
     </sql>
 
@@ -55,6 +55,11 @@
         <where>
             <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
             <if test="revision != null ">and revision = #{revision}</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},
                 '%')
@@ -68,11 +73,6 @@
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
                 #{rewardPunishmentType}
             </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>
         </where>
         order by create_time desc
     </select>
@@ -93,6 +93,8 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="categoryCodeOne != null">category_code_one,</if>
+            <if test="categoryNameOne != null">category_name_one,</if>
             <if test="categoryCode != null and categoryCode != ''">category_code,</if>
             <if test="categoryName != null and categoryName != ''">category_name,</if>
             <if test="code != null">code,</if>
@@ -102,8 +104,6 @@
             <if test="unit != null">unit,</if>
             <if test="leaveType != null">leave_type,</if>
             <if test="rewardPunishmentType != null">reward_punishment_type,</if>
-            <if test="categoryCodeOne != null">category_code_one,</if>
-            <if test="categoryNameOne != null">category_name_one,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -113,6 +113,8 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="categoryCodeOne != null">#{categoryCodeOne},</if>
+            <if test="categoryNameOne != null">#{categoryNameOne},</if>
             <if test="categoryCode != null and categoryCode != ''">#{categoryCode},</if>
             <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
             <if test="code != null">#{code},</if>
@@ -122,8 +124,6 @@
             <if test="unit != null">#{unit},</if>
             <if test="leaveType != null">#{leaveType},</if>
             <if test="rewardPunishmentType != null">#{rewardPunishmentType},</if>
-            <if test="categoryCodeOne != null">#{categoryCodeOne},</if>
-            <if test="categoryNameOne != null">#{categoryNameOne},</if>
         </trim>
     </insert>
 
@@ -137,6 +137,8 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="categoryCodeOne != null">category_code_one = #{categoryCodeOne},</if>
+            <if test="categoryNameOne != null">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="code != null">code = #{code},</if>
@@ -146,8 +148,6 @@
             <if test="unit != null">unit = #{unit},</if>
             <if test="leaveType != null">leave_type = #{leaveType},</if>
             <if test="rewardPunishmentType != null">reward_punishment_type = #{rewardPunishmentType},</if>
-            <if test="categoryCodeOne != null">category_code_one = #{categoryCodeOne},</if>
-            <if test="categoryNameOne != null">category_name_one = #{categoryNameOne},</if>
         </trim>
         where id = #{id}
     </update>