周期及等级增加重复判断项

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -86,7 +86,8 @@ public enum ResultStatus {
     ALARM_NAME_ALREADY_EXISTS(500017, "该告警名称已存在，请修改"),
     PRODUCT_DELETE_ERROR(500018,"该产品已经有设备安装，无法删除"),
     CUSTOMER_DELETE_ERROR(500019,"该客户已经有设备安装，无法删除"),
-
+    GRADE_ALREADY_EXISTS(500020,"存在相同考评等级，请修改"),
+    CYCLE_ALREADY_EXISTS(500021,"存在相同考评周期，请修改"),
     //600 运维模块
     CHILD_ORDER_ING(600001,"子单未完成，不能提交"),
     PARENT_ORDER_ING(600002,"父单未完成，不能提交"),

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationCycleController.java

@@ -63,6 +63,8 @@ public class EvaluationCycleController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public AjaxMessage<Integer> addCycle(@ApiParam(value = "周期信息", required = true) @RequestBody EvaluationCycleEntity evaluationCycle) {
         LoginUser currentUser = UserUtil.getCurrentUser();
+        boolean isOk = true;
+        List<EvaluationCycleEntity> evaluationCycleEntities = new ArrayList<>();
         for (Integer companyOrgId : evaluationCycle.getCompanyOrgIds()) {
             evaluationCycle.setCompanyOrgId(companyOrgId);
             if (currentUser != null) {
@@ -73,7 +75,17 @@ public class EvaluationCycleController {
                 evaluationCycle.setTenantId(currentUser.getTenantId());
             }
             evaluationCycle.setStatus(1);
-            evaluationCycleService.addEvaluationCycle(evaluationCycle);
+            evaluationCycleEntities.add(evaluationCycle);
+            List<EvaluationCycleEntity> list = evaluationCycleService.findList(evaluationCycle);
+            if (list.size() > 0) {
+                isOk = false;
+                break;
+            }
+        }
+        if (isOk) {
+            evaluationCycleService.addBatchEvaluationCycle(evaluationCycleEntities);
+        } else {
+            return new AjaxMessage<>(ResultStatus.CYCLE_ALREADY_EXISTS, 0);
         }
         return new AjaxMessage<>(ResultStatus.OK, 1);
     }
@@ -97,6 +109,15 @@ public class EvaluationCycleController {
             evaluationCycle.setUpdateBy(currentUser.getUsername());
             evaluationCycle.setDateUpdate(new Date());
         }
+        EvaluationCycleEntity evaluationCycleEntity = new EvaluationCycleEntity();
+        evaluationCycleEntity.setType(evaluationCycle.getType());
+        evaluationCycleEntity.setCompanyOrgId(evaluationCycle.getCompanyOrgId());
+        evaluationCycleEntity.setTenantId(currentUser.getTenantId());
+        evaluationCycleEntity.setId(evaluationCycle.getId());
+        List<EvaluationCycleEntity> list = evaluationCycleService.findList(evaluationCycleEntity);
+        if (list.size() > 0) {
+            return new AjaxMessage<>(ResultStatus.CYCLE_ALREADY_EXISTS, 0);
+        }
         int result= evaluationCycleService.updateEvaluationCycleById(evaluationCycle)? 1: 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationGradeController.java

@@ -56,6 +56,7 @@ public class EvaluationGradeController {
         Pagination<EvaluationGradeEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+
     /**
      * 新增
      */
@@ -63,6 +64,8 @@ public class EvaluationGradeController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public AjaxMessage<Integer> addGrade(@ApiParam(value = "等级信息", required = true) @RequestBody EvaluationGradeEntity evaluationGrade) {
         LoginUser currentUser = UserUtil.getCurrentUser();
+        List<EvaluationGradeEntity> evaluationGradeEntities = new ArrayList<>();
+        boolean isOk = true;
         for (Integer companyOrgId : evaluationGrade.getCompanyOrgIds()) {
             evaluationGrade.setCompanyOrgId(companyOrgId);
             if (currentUser != null) {
@@ -73,7 +76,17 @@ public class EvaluationGradeController {
                 evaluationGrade.setTenantId(currentUser.getTenantId());
             }
             evaluationGrade.setStatus(1);
-            evaluationGradeService.addEvaluationGrade(evaluationGrade);
+            evaluationGradeEntities.add(evaluationGrade);
+            List<EvaluationGradeEntity> list = evaluationGradeService.findList(evaluationGrade);
+            if (list.size() > 0) {
+                isOk = false;
+                break;
+            }
+        }
+        if (isOk) {
+            evaluationGradeService.addBatchEvaluationGrade(evaluationGradeEntities);
+        } else {
+            return new AjaxMessage<>(ResultStatus.GRADE_ALREADY_EXISTS, 0);
         }
         return new AjaxMessage<>(ResultStatus.OK, 1);
     }
@@ -91,13 +104,22 @@ public class EvaluationGradeController {
      */
     @ApiOperation(value = "修改保存考评等级")
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
-    public  AjaxMessage<Integer> editEvaluationGrade(@ApiParam(value = "绩效等级", required = true) @RequestBody EvaluationGradeEntity evaluationGrade){
+    public  AjaxMessage<Integer> editEvaluationGrade(@ApiParam(value = "绩效等级", required = true) @RequestBody EvaluationGradeEntity evaluationGrade) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if (currentUser != null) {
             evaluationGrade.setUpdateBy(currentUser.getUsername());
             evaluationGrade.setDateUpdate(new Date());
         }
-        int result= evaluationGradeService.updateEvaluationGradeById(evaluationGrade)? 1: 0;
+        EvaluationGradeEntity evaluationGradeEntity = new EvaluationGradeEntity();
+        evaluationGradeEntity.setEvaluationGrade(evaluationGrade.getEvaluationGrade());
+        evaluationGradeEntity.setCompanyOrgId(evaluationGrade.getCompanyOrgId());
+        evaluationGradeEntity.setTenantId(currentUser.getTenantId());
+        evaluationGradeEntity.setId(evaluationGrade.getId());
+        List<EvaluationGradeEntity> list = evaluationGradeService.findList(evaluationGradeEntity);
+        if (list.size() > 0) {
+            return new AjaxMessage<>(ResultStatus.GRADE_ALREADY_EXISTS, 0);
+        }
+        int result = evaluationGradeService.updateEvaluationGradeById(evaluationGrade) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
     /**
@@ -136,8 +158,8 @@ public class EvaluationGradeController {
     @ApiOperation(value = "获取绩效等级")
     @RequestMapping(value = "/getScoreGrade", method = RequestMethod.POST)
     public AjaxMessage<String> getScoreGrade(@ApiParam(value = "租户ID", required = true) @RequestParam String tenantId,
-                                         @ApiParam(value = "租户ID", required = true) @RequestParam Integer companyOrgId,
-                                         @ApiParam(value = "租户ID", required = true) @RequestParam BigDecimal score) {
+                                         @ApiParam(value = "公司ID", required = true) @RequestParam Integer companyOrgId,
+                                         @ApiParam(value = "分数", required = true) @RequestParam BigDecimal score) {
         return new AjaxMessage<>(ResultStatus.OK, evaluationGradeService.getScoreGrade(tenantId, companyOrgId, score, true));
     }
 }

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationCycleService.java

@@ -52,6 +52,11 @@ public interface EvaluationCycleService {
      */
     public boolean addEvaluationCycle(EvaluationCycleEntity evaluationCycle);
 
+    /**
+     * 批量保存
+     */
+    public boolean addBatchEvaluationCycle(List<EvaluationCycleEntity> evaluationCycles);
+
     /**
      * 修改根居ID
      */

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationGradeService.java

@@ -53,6 +53,11 @@ public interface EvaluationGradeService {
      */
     public boolean addEvaluationGrade(EvaluationGradeEntity evaluationGrade);
 
+    /**
+     * 批量保存
+     */
+    public boolean addBatchEvaluationGrade(List<EvaluationGradeEntity> evaluationGrades);
+
     /**
      * 修改根居ID
      */

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationCycleServiceImpl.java

@@ -98,6 +98,14 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
         return false;
     }
 
+    @Override
+    public boolean addBatchEvaluationCycle(List<EvaluationCycleEntity> evaluationCycles) {
+        for (EvaluationCycleEntity item : evaluationCycles) {
+            this.save(item);
+        }
+        return true;
+    }
+
     /**
      * 修改根居ID
      */

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationGradeServiceImpl.java

@@ -103,6 +103,14 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
         return false;
     }
 
+    @Override
+    public boolean addBatchEvaluationGrade(List<EvaluationGradeEntity> evaluationGrades) {
+        for (EvaluationGradeEntity item : evaluationGrades) {
+            this.save(item);
+        }
+        return true;
+    }
+
     /**
      * 修改根居ID
      */

operation_manager/src/main/resources/mapper/evaluation/EvaluationCycleMapper.xml

@@ -56,6 +56,7 @@
             and a.status=1
             <if test="type != null ">and a.type = #{type}</if>
             <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
+            <if test="id != null ">and a.id &lt;&gt; #{id}</if>
         </where>
     </select>
 

operation_manager/src/main/resources/mapper/evaluation/EvaluationGradeMapper.xml

@@ -52,13 +52,13 @@
         SELECT
         <include refid="evaluationGradeColumns"/>
         FROM sc_evaluation_grade a
-
         <where>
             <if test="companyOrgId!=null">
                 and a.COMPANY_ORG_ID = #{companyOrgId}
             </if>
             <if test="evaluationGrade != null ">and a.evaluation_grade = #{evaluationGrade}</if>
             <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
+            <if test="id != null ">and a.id &lt;&gt; #{id}</if>
             and a.status=1
         </where>
     </select>