周期及等级设置

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

@@ -11,6 +11,7 @@ import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -66,17 +67,19 @@ public class EvaluationCycleController {
         boolean isOk = true;
         List<EvaluationCycleEntity> evaluationCycleEntities = new ArrayList<>();
         for (Integer companyOrgId : evaluationCycle.getCompanyOrgIds()) {
-            evaluationCycle.setCompanyOrgId(companyOrgId);
+            EvaluationCycleEntity item= new EvaluationCycleEntity();
+            BeanUtils.copyProperties(evaluationCycle,item);
+            item.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());
+                item.setUpdateBy(currentUser.getUsername());
+                item.setCreateBy(currentUser.getUsername());
+                item.setDateCreate(new Date());
+                item.setDateUpdate(new Date());
+                item.setTenantId(currentUser.getTenantId());
             }
-            evaluationCycle.setStatus(1);
-            evaluationCycleEntities.add(evaluationCycle);
-            List<EvaluationCycleEntity> list = evaluationCycleService.findList(evaluationCycle);
+            item.setStatus(1);
+            evaluationCycleEntities.add(item);
+            List<EvaluationCycleEntity> list = evaluationCycleService.findList(item);
             if (list.size() > 0) {
                 isOk = false;
                 break;
@@ -109,9 +112,10 @@ public class EvaluationCycleController {
             evaluationCycle.setUpdateBy(currentUser.getUsername());
             evaluationCycle.setDateUpdate(new Date());
         }
+        EvaluationCycleEntity itemCycle = evaluationCycleService.findEvaluationCycleById(evaluationCycle.getId());
         EvaluationCycleEntity evaluationCycleEntity = new EvaluationCycleEntity();
         evaluationCycleEntity.setType(evaluationCycle.getType());
-        evaluationCycleEntity.setCompanyOrgId(evaluationCycle.getCompanyOrgId());
+        evaluationCycleEntity.setCompanyOrgId(itemCycle.getCompanyOrgId());
         evaluationCycleEntity.setTenantId(currentUser.getTenantId());
         evaluationCycleEntity.setId(evaluationCycle.getId());
         List<EvaluationCycleEntity> list = evaluationCycleService.findList(evaluationCycleEntity);

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.models.auth.In;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -67,17 +68,20 @@ public class EvaluationGradeController {
         List<EvaluationGradeEntity> evaluationGradeEntities = new ArrayList<>();
         boolean isOk = true;
         for (Integer companyOrgId : evaluationGrade.getCompanyOrgIds()) {
-            evaluationGrade.setCompanyOrgId(companyOrgId);
+
+            EvaluationGradeEntity item = new EvaluationGradeEntity();
+            BeanUtils.copyProperties(evaluationGrade, item);
+            item.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());
+                item.setUpdateBy(currentUser.getUsername());
+                item.setCreateBy(currentUser.getUsername());
+                item.setDateCreate(new Date());
+                item.setDateUpdate(new Date());
+                item.setTenantId(currentUser.getTenantId());
             }
-            evaluationGrade.setStatus(1);
-            evaluationGradeEntities.add(evaluationGrade);
-            List<EvaluationGradeEntity> list = evaluationGradeService.findList(evaluationGrade);
+            item.setStatus(1);
+            evaluationGradeEntities.add(item);
+            List<EvaluationGradeEntity> list = evaluationGradeService.findList(item);
             if (list.size() > 0) {
                 isOk = false;
                 break;
@@ -110,9 +114,10 @@ public class EvaluationGradeController {
             evaluationGrade.setUpdateBy(currentUser.getUsername());
             evaluationGrade.setDateUpdate(new Date());
         }
+        EvaluationGradeEntity orgGrade = evaluationGradeService.findEvaluationGradeById(evaluationGrade.getId());
         EvaluationGradeEntity evaluationGradeEntity = new EvaluationGradeEntity();
         evaluationGradeEntity.setEvaluationGrade(evaluationGrade.getEvaluationGrade());
-        evaluationGradeEntity.setCompanyOrgId(evaluationGrade.getCompanyOrgId());
+        evaluationGradeEntity.setCompanyOrgId(orgGrade.getCompanyOrgId());
         evaluationGradeEntity.setTenantId(currentUser.getTenantId());
         evaluationGradeEntity.setId(evaluationGrade.getId());
         List<EvaluationGradeEntity> list = evaluationGradeService.findList(evaluationGradeEntity);