考评周期、考评等级

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

@@ -61,18 +61,21 @@ public class EvaluationCycleController {
      */
     @ApiOperation(value = "新增考评周期")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public AjaxMessage<Integer> addCycle(@ApiParam(value = "周期信息", required = true) @RequestBody EvaluationCycleEntity evaluationCycle){
+    public AjaxMessage<Integer> addCycle(@ApiParam(value = "周期信息", required = true) @RequestBody EvaluationCycleEntity evaluationCycle) {
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if (currentUser != null) {
-            evaluationCycle.setUpdateBy(currentUser.getUsername());
-            evaluationCycle.setCreateBy(currentUser.getUsername());
-            evaluationCycle.setDateCreate(new Date());
-            evaluationCycle.setDateUpdate(new Date());
-            evaluationCycle.setTenantId(currentUser.getTenantId());
+        for (Integer companyOrgId : evaluationCycle.getCompanyOrgIds()) {
+            evaluationCycle.setCompanyOrgId(companyOrgId);
+            if (currentUser != null) {
+                evaluationCycle.setUpdateBy(currentUser.getUsername());
+                evaluationCycle.setCreateBy(currentUser.getUsername());
+                evaluationCycle.setDateCreate(new Date());
+                evaluationCycle.setDateUpdate(new Date());
+                evaluationCycle.setTenantId(currentUser.getTenantId());
+            }
+            evaluationCycle.setStatus(1);
+            evaluationCycleService.addEvaluationCycle(evaluationCycle);
         }
-        evaluationCycle.setStatus(1);
-        int result = evaluationCycleService.addEvaluationCycle(evaluationCycle)? 1: 0;
-        return new AjaxMessage<>(ResultStatus.OK, result);
+        return new AjaxMessage<>(ResultStatus.OK, 1);
     }
 
 

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

@@ -59,19 +59,22 @@ public class EvaluationGradeController {
      */
     @ApiOperation(value = "新增等级信息")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public AjaxMessage<Integer> addGrade(@ApiParam(value = "等级信息", required = true) @RequestBody EvaluationGradeEntity evaluationGrade){
+    public AjaxMessage<Integer> addGrade(@ApiParam(value = "等级信息", required = true) @RequestBody EvaluationGradeEntity evaluationGrade) {
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if (currentUser != null) {
-            evaluationGrade.setUpdateBy(currentUser.getUsername());
-            evaluationGrade.setCreateBy(currentUser.getUsername());
-            evaluationGrade.setDateCreate(new Date());
-            evaluationGrade.setDateUpdate(new Date());
-            evaluationGrade.setTenantId(currentUser.getTenantId());
+        for (Integer companyOrgId : evaluationGrade.getCompanyOrgIds()) {
+            evaluationGrade.setCompanyOrgId(companyOrgId);
+            if (currentUser != null) {
+                evaluationGrade.setUpdateBy(currentUser.getUsername());
+                evaluationGrade.setCreateBy(currentUser.getUsername());
+                evaluationGrade.setDateCreate(new Date());
+                evaluationGrade.setDateUpdate(new Date());
+                evaluationGrade.setTenantId(currentUser.getTenantId());
+            }
+            evaluationGrade.setStatus(1);
+            evaluationGradeService.addEvaluationGrade(evaluationGrade);
         }
-        evaluationGrade.setStatus(1);
-        int result = evaluationGradeService.addEvaluationGrade(evaluationGrade)? 1: 0;
-        return new AjaxMessage<>(ResultStatus.OK, result);
-    }    
+        return new AjaxMessage<>(ResultStatus.OK, 1);
+    }
 
 
     @ApiOperation(value = "按ID查询绩效等级")

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationCycleEntity.java

@@ -35,6 +35,10 @@ public class EvaluationCycleEntity extends BaseEntity {
     @JsonIgnore
     private Integer deptOrgId;
 
+    @ApiModelProperty(value = "所属公司IDs")
+    @TableField(exist = false)
+    private List<Integer> companyOrgIds;
+
     @ApiModelProperty(value = "所属公司名称")
     @TableField(exist = false)
     private String companyOrgName;

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationGradeEntity.java

@@ -34,6 +34,10 @@ public class EvaluationGradeEntity extends BaseEntity {
     @TableField(exist = false)
     private String companyOrgName;
 
+    @ApiModelProperty(value = "所属公司IDs")
+    @TableField(exist = false)
+    private List<Integer> companyOrgIds;
+
     /** 绩效等级(0A 1B 2C 3D 4E) */
     @ApiModelProperty(value = "绩效等级(0A 1B 2C 3D 4E)")
     private Long evaluationGrade;

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

@@ -54,4 +54,5 @@ public interface EvaluationItemValueService {
      * 根居ID获取对象
      */
     public EvaluationItemValueEntity findEvaluationItemValueById(Long id);
+
 }

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

@@ -124,7 +124,21 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
      * 修改根居ID
      */
     public boolean updateEvaluationItemById(EvaluationItemEntity evaluationItem) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
         if (this.updateById(evaluationItem)) {
+            evaluationItemValueService.updateByItemId(evaluationItem.getId());
+            for (EvaluationItemValueEntity item : evaluationItem.getItemValues()) {
+                if (currentUser != null) {
+                    item.setTenantId(currentUser.getTenantId());
+                    item.setCreateBy(currentUser.getUsername());
+                    item.setUpdateBy(currentUser.getUsername());
+                }
+                item.setEvaluationItemId(evaluationItem.getId());
+                item.setStatus(1);
+                item.setDateUpdate(new Date());
+                item.setDateCreate(new Date());
+                evaluationItemValueService.addEvaluationItemValue(item);
+            }
             return true;
         }
         return false;