Merge remote-tracking branch 'origin/master'

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

@@ -129,6 +129,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         }
         //添加绩效异常信息
         try {
+            if(entity.getRemark().indexOf("申诉成功") < 0){
                 if(!entity.getErrorTime().after(new Date())){
                     PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
                     errorMessageEntity.initAttrValue();
@@ -138,6 +139,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                     errorMessageEntity.setPerformType(PerformTypeEnum.考勤绩效.getValue());
                     performErrorMessageService.save(errorMessageEntity);
                 }
+            }
         }catch (Exception e) {
             log.error("新增绩效异常信息核查状态出错", e);
         }

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

@@ -124,6 +124,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
     protected void saveAfter(CheckComplainRecordEntity entity, Context context) throws AppException {
         //添加绩效异常信息
         try {
+            if(entity.getRemark().indexOf("申诉成功") < 0) {
                 PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
                 errorMessageEntity.initAttrValue();
                 BeanUtils.copyProperties(entity, errorMessageEntity, BeanUtil.getNullPropertyNames(entity));
@@ -131,6 +132,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
                 errorMessageEntity.setErrorTime(entity.getComplainTime());
                 errorMessageEntity.setPerformType(PerformTypeEnum.评价投诉绩效.getValue());
                 performErrorMessageService.save(errorMessageEntity);
+            }
         }catch (Exception e) {
             log.error("新增绩效异常信息核查状态出错", e);
         }

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

@@ -121,6 +121,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
     protected void saveAfter(CheckGoworkRecordEntity entity, Context context) throws AppException {
         //添加绩效异常信息
         try {
+            if(entity.getRemark().indexOf("申诉成功") < 0) {
                 PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
                 errorMessageEntity.initAttrValue();
                 BeanUtils.copyProperties(entity, errorMessageEntity, BeanUtil.getNullPropertyNames(entity));
@@ -128,6 +129,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                 errorMessageEntity.setErrorTime(entity.getGoworkTime());
                 errorMessageEntity.setPerformType(PerformTypeEnum.办件绩效.getValue());
                 performErrorMessageService.save(errorMessageEntity);
+            }
         }catch (Exception e) {
             log.error("新增绩效异常信息核查状态出错", e);
         }

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

@@ -122,6 +122,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
     protected void saveAfter(CheckOtherRecordEntity entity, Context context) throws AppException {
         //添加绩效异常信息
         try {
+            if(entity.getRemark().indexOf("申诉成功") < 0) {
                 PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
                 errorMessageEntity.initAttrValue();
                 BeanUtils.copyProperties(entity, errorMessageEntity, BeanUtil.getNullPropertyNames(entity));
@@ -129,6 +130,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                 errorMessageEntity.setErrorTime(entity.getHappenTime());
                 errorMessageEntity.setPerformType(PerformTypeEnum.其它绩效.getValue());
                 performErrorMessageService.save(errorMessageEntity);
+            }
         }catch (Exception e) {
             log.error("新增绩效异常信息核查状态出错", e);
         }

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

@@ -124,6 +124,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
     protected void saveAfter(CheckReviewRecordEntity entity, Context context) throws AppException {
         //添加绩效异常信息
         try {
+            if(entity.getRemark().indexOf("申诉成功") < 0) {
                 PerformErrorMessageEntity errorMessageEntity = new PerformErrorMessageEntity();
                 errorMessageEntity.initAttrValue();
                 BeanUtils.copyProperties(entity, errorMessageEntity, BeanUtil.getNullPropertyNames(entity));
@@ -131,6 +132,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                 errorMessageEntity.setErrorTime(entity.getReviewTime());
                 errorMessageEntity.setPerformType(PerformTypeEnum.评价差评绩效.getValue());
                 performErrorMessageService.save(errorMessageEntity);
+            }
         }catch (Exception e) {
             log.error("新增绩效异常信息核查状态出错", e);
         }