绩效异常消息测试bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java

@@ -129,13 +129,15 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         }
         //添加绩效异常信息
         try {
-            PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
-            errorMessageEntity.initAttrValue();
-            BeanUtils.copyProperties(entity, errorMessageEntity, BeanUtil.getNullPropertyNames(entity));
-            errorMessageEntity.setCheckRecordId(entity.getId());
-            errorMessageEntity.setErrorTime(entity.getErrorTime());
-            errorMessageEntity.setPerformType(PerformTypeEnum.考勤绩效.getValue());
-            performErrorMessageService.save(errorMessageEntity);
+            if(!entity.getErrorTime().after(new Date())){
+                PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
+                errorMessageEntity.initAttrValue();
+                BeanUtils.copyProperties(entity, errorMessageEntity, BeanUtil.getNullPropertyNames(entity));
+                errorMessageEntity.setCheckRecordId(entity.getId());
+                errorMessageEntity.setErrorTime(entity.getErrorTime());
+                errorMessageEntity.setPerformType(PerformTypeEnum.考勤绩效.getValue());
+                performErrorMessageService.save(errorMessageEntity);
+            }
         }catch (Exception e) {
             log.error("新增绩效异常信息核查状态出错", e);
         }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformErrorMessageController.java

@@ -89,27 +89,27 @@ public class PerformErrorMessageController extends BaseCRUDJsonBodyMappingContro
                 ret.put("data", entity);
                 if(entity.getPerformType().equals(PerformTypeEnum.考勤绩效.getValue())){
                     CheckAttendRecordEntity checkAttendRecordEntity = checkAttendRecordService.get(entity.getCheckRecordId());
-                    ret.put("checkRecordData", checkAttendRecordEntity);
+                    ret.put(PerformTypeEnum.考勤绩效.getValue(), checkAttendRecordEntity);
                 }
                 if(entity.getPerformType().equals(PerformTypeEnum.效能绩效.getValue())){
                     CheckEffectRecordEntity checkEffectRecordEntity = checkEffectRecordService.get(entity.getCheckRecordId());
-                    ret.put("checkRecordData", checkEffectRecordEntity);
+                    ret.put(PerformTypeEnum.效能绩效.getValue(), checkEffectRecordEntity);
                 }
                 if(entity.getPerformType().equals(PerformTypeEnum.办件绩效.getValue())){
                     CheckGoworkRecordEntity checkGoworkRecordEntity = checkGoworkRecordService.get(entity.getCheckRecordId());
-                    ret.put("checkRecordData", checkGoworkRecordEntity);
+                    ret.put(PerformTypeEnum.办件绩效.getValue(), checkGoworkRecordEntity);
                 }
                 if(entity.getPerformType().equals(PerformTypeEnum.评价差评绩效.getValue())){
                     CheckReviewRecordEntity checkReviewRecordEntity = checkReviewRecordService.get(entity.getCheckRecordId());
-                    ret.put("checkRecordData", checkReviewRecordEntity);
+                    ret.put(PerformTypeEnum.评价差评绩效.getValue(), checkReviewRecordEntity);
                 }
                 if(entity.getPerformType().equals(PerformTypeEnum.评价投诉绩效.getValue())){
                     CheckComplainRecordEntity checkComplainRecordEntity = checkComplainRecordService.get(entity.getCheckRecordId());
-                    ret.put("checkRecordData", checkComplainRecordEntity);
+                    ret.put(PerformTypeEnum.评价投诉绩效.getValue(), checkComplainRecordEntity);
                 }
                 if(entity.getPerformType().equals(PerformTypeEnum.其它绩效.getValue())){
                     CheckOtherRecordEntity checkOtherRecordEntity = checkOtherRecordService.get(entity.getCheckRecordId());
-                    ret.put("checkRecordData", checkOtherRecordEntity);
+                    ret.put(PerformTypeEnum.其它绩效.getValue(), checkOtherRecordEntity);
                 }
                 if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                     this.recordSysLog(this.request, busiDesc + " 【成功】");