绩效核查确实时将核查时间改为绩效扣分发生时间

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

@@ -152,6 +152,10 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         if (entity.getId() == null) {
             throw new AppException("核查记录ID不能为空");
         }
+        CheckAttendRecordEntity temp = this.get(entity.getId());
+        if (temp == null) {
+            throw new AppException("核查记录ID不正确");
+        }
         if (context != null && context.getUser() != null) {
             IUser user = context.getUser();
             entity.setUpdateUserId(user.getId());
@@ -162,29 +166,26 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
             AuditUtil.audit(entity);
         }
 
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckTime(temp.getErrorTime());
+        entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);
         try {
-            CheckAttendRecordEntity temp = this.get(entity.getId());
-            if (temp != null) {
-                if (!ObjectUtils.isEmpty(entity.getRecordId())) {
-                    PerformAttendRecordEntity performAttendRecordEntity = attendRecordService.get(entity.getRecordId());
-                    if (!ObjectUtils.isEmpty(performAttendRecordEntity)) {
-                        performAttendRecordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
-                        performAttendRecordEntity.setUpdateTime(new Date());
-                        performAttendRecordEntity.setUpdateUserId(this.getContextUserId(context));
-                        attendRecordService.update(performAttendRecordEntity);
-                    }
+            if (!ObjectUtils.isEmpty(entity.getRecordId())) {
+                PerformAttendRecordEntity performAttendRecordEntity = attendRecordService.get(entity.getRecordId());
+                if (!ObjectUtils.isEmpty(performAttendRecordEntity)) {
+                    performAttendRecordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+                    performAttendRecordEntity.setUpdateTime(new Date());
+                    performAttendRecordEntity.setUpdateUserId(this.getContextUserId(context));
+                    attendRecordService.update(performAttendRecordEntity);
                 }
+            }
 /*                AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
                 ThreadPool.getInstance().execute(attendPostServiceThread);*/
-                sendCheckDingTalk(temp);
-                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-                query.setStaffId(temp.getStaffId());
-                summaryCheck(query);
-            }
+            sendCheckDingTalk(temp);
+            StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+            query.setStaffId(temp.getStaffId());
+            summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
         }

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

@@ -150,6 +150,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
         if (entity.getId() == null) {
             throw new AppException("核查记录ID不能为空");
         }
+        CheckComplainRecordEntity temp = this.get(entity.getId());
+        if (temp == null) {
+            throw new AppException("核查记录ID不正确");
+        }
         if (context != null && context.getUser() != null) {
             IUser user = context.getUser();
             entity.setUpdateUserId(user.getId());
@@ -158,27 +162,24 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
         if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
             AuditUtil.audit(entity);
         }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckTime(temp.getComplainTime());
+        entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);
         try {
-            CheckComplainRecordEntity temp = this.get(entity.getId());
-            if (temp != null) {
-                if(!ObjectUtils.isEmpty(temp.getRecordId())){
-                    PerformComplainRecordEntity recordEntity = recordService.get(temp.getRecordId());
-                    if(!ObjectUtils.isEmpty(recordEntity)){
-                        recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
-                        recordEntity.setUpdateTime(new Date());
-                        recordEntity.setUpdateUserId(this.getContextUserId(context));
-                        recordService.update(recordEntity);
-                    }
+            if(!ObjectUtils.isEmpty(temp.getRecordId())){
+                PerformComplainRecordEntity recordEntity = recordService.get(temp.getRecordId());
+                if(!ObjectUtils.isEmpty(recordEntity)){
+                    recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+                    recordEntity.setUpdateTime(new Date());
+                    recordEntity.setUpdateUserId(this.getContextUserId(context));
+                    recordService.update(recordEntity);
                 }
-                sendCheckDingTalk(entity);
-                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-                query.setStaffId(temp.getStaffId());
-                summaryCheck(query);
             }
+            sendCheckDingTalk(entity);
+            StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+            query.setStaffId(temp.getStaffId());
+            summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
         }

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

@@ -150,6 +150,10 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
         if(entity.getId()==null){
             throw new AppException("核查记录ID不能为空");
         }
+        CheckEffectRecordEntity temp = this.get(entity.getId());
+        if (temp == null) {
+            throw new AppException("核查记录ID不正确");
+        }
         if (context != null && context.getUser()!=null) {
             IUser user = context.getUser();
             entity.setUpdateUserId(user.getId());
@@ -158,28 +162,25 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
         if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
             AuditUtil.audit(entity);
         }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckTime(temp.getHappenTime());
+        entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);
         try{
-            CheckEffectRecordEntity temp = this.get(entity.getId());
-            if(temp!=null) {
-                if(!ObjectUtils.isEmpty(temp.getRecordId())){
-                    PerformEffectRecordEntity recordEntity = recordService.get(temp.getRecordId());
-                    if(!ObjectUtils.isEmpty(recordEntity)){
-                        recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
-                        recordEntity.setUpdateTime(new Date());
-                        recordEntity.setUpdateUserId(this.getContextUserId(context));
-                        recordService.update(recordEntity);
-                    }
+            if(!ObjectUtils.isEmpty(temp.getRecordId())){
+                PerformEffectRecordEntity recordEntity = recordService.get(temp.getRecordId());
+                if(!ObjectUtils.isEmpty(recordEntity)){
+                    recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+                    recordEntity.setUpdateTime(new Date());
+                    recordEntity.setUpdateUserId(this.getContextUserId(context));
+                    recordService.update(recordEntity);
                 }
-
-                sendCheckDingTalk(temp);
-                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-                query.setStaffId(temp.getStaffId());
-                summaryCheck(query);
             }
+
+            sendCheckDingTalk(temp);
+            StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+            query.setStaffId(temp.getStaffId());
+            summaryCheck(query);
         }catch (Exception e){
             log.error("汇总已审核的核查记录出错",e);
         }

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

@@ -147,6 +147,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
         if(entity.getId()==null){
             throw new AppException("核查记录ID不能为空");
         }
+        CheckGoworkRecordEntity temp = this.get(entity.getId());
+        if (temp == null) {
+            throw new AppException("核查记录ID不正确");
+        }
         if (context != null && context.getUser()!=null) {
             IUser user = context.getUser();
             entity.setUpdateUserId(user.getId());
@@ -155,28 +159,25 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
         if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
             AuditUtil.audit(entity);
         }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckTime(temp.getGoworkTime());
+        entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);
         //发送钉钉通知信息
         try{
-            CheckGoworkRecordEntity temp = this.get(entity.getId());
-            if(temp!=null) {
-                if(!ObjectUtils.isEmpty(temp.getRecordId())){
-                    PerformGoworkRecordEntity recordEntity = recordService.get(temp.getRecordId());
-                    if(!ObjectUtils.isEmpty(recordEntity)){
-                        recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
-                        recordEntity.setUpdateTime(new Date());
-                        recordEntity.setUpdateUserId(this.getContextUserId(context));
-                        recordService.update(recordEntity);
-                    }
+            if(!ObjectUtils.isEmpty(temp.getRecordId())){
+                PerformGoworkRecordEntity recordEntity = recordService.get(temp.getRecordId());
+                if(!ObjectUtils.isEmpty(recordEntity)){
+                    recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+                    recordEntity.setUpdateTime(new Date());
+                    recordEntity.setUpdateUserId(this.getContextUserId(context));
+                    recordService.update(recordEntity);
                 }
-                sendCheckDingTalk(temp);
-                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-                query.setStaffId(temp.getStaffId());
-                summaryCheck(query);
             }
+            sendCheckDingTalk(temp);
+            StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+            query.setStaffId(temp.getStaffId());
+            summaryCheck(query);
         }catch (Exception e){
             log.error("汇总已审核的核查记录出错",e);
         }

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

@@ -152,6 +152,10 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
         if (entity.getId() == null) {
             throw new AppException("核查记录ID不能为空");
         }
+        CheckOtherRecordEntity temp = this.get(entity.getId());
+        if (temp == null) {
+            throw new AppException("核查记录ID不正确");
+        }
         if (context != null && context.getUser() != null) {
             IUser user = context.getUser();
             entity.setUpdateUserId(user.getId());
@@ -160,28 +164,26 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
         if (!ObjectUtils.isEmpty(entity.getSubAddType()) && !ObjectUtils.isEmpty(entity.getCheckResult())) {
             AuditUtil.audit(entity);
         }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
+
+        entity.setCheckTime(temp.getHappenTime());
+        entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);
         //发送钉钉通知信息
         try {
-            CheckOtherRecordEntity temp = this.get(entity.getId());
-            if (temp != null) {
-                if (!ObjectUtils.isEmpty(temp.getRecordId())) {
-                    PerformOtherRecordEntity recordEntity = recordService.get(temp.getRecordId());
-                    if (!ObjectUtils.isEmpty(recordEntity)) {
-                        recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
-                        recordEntity.setUpdateTime(new Date());
-                        recordEntity.setUpdateUserId(this.getContextUserId(context));
-                        recordService.update(recordEntity);
-                    }
+            if (!ObjectUtils.isEmpty(temp.getRecordId())) {
+                PerformOtherRecordEntity recordEntity = recordService.get(temp.getRecordId());
+                if (!ObjectUtils.isEmpty(recordEntity)) {
+                    recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+                    recordEntity.setUpdateTime(new Date());
+                    recordEntity.setUpdateUserId(this.getContextUserId(context));
+                    recordService.update(recordEntity);
                 }
-                sendCheckDingTalk(temp);
-                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-                query.setStaffId(temp.getStaffId());
-                summaryCheck(query);
             }
+            sendCheckDingTalk(temp);
+            StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+            query.setStaffId(temp.getStaffId());
+            summaryCheck(query);
 
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);

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

@@ -152,6 +152,10 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
         if (entity.getId() == null) {
             throw new AppException("核查记录ID不能为空");
         }
+        CheckReviewRecordEntity temp = this.get(entity.getId());
+        if (temp == null) {
+            throw new AppException("核查记录ID不正确");
+        }
         if (context != null && context.getUser() != null) {
             IUser user = context.getUser();
             entity.setUpdateUserId(user.getId());
@@ -160,28 +164,25 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
         if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
             AuditUtil.audit(entity);
         }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
+        entity.setCheckTime(temp.getReviewTime());
+        entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);
         //发送钉钉通知信息
         try {
-            CheckReviewRecordEntity temp = this.get(entity.getId());
-            if (temp != null) {
-                if(!ObjectUtils.isEmpty(temp.getRecordId())){
-                    PerformReviewRecordEntity recordEntity = recordService.get(temp.getRecordId());
-                    if(!ObjectUtils.isEmpty(recordEntity)){
-                        recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
-                        recordEntity.setUpdateTime(new Date());
-                        recordEntity.setUpdateUserId(this.getContextUserId(context));
-                        recordService.update(recordEntity);
-                    }
+            if(!ObjectUtils.isEmpty(temp.getRecordId())){
+                PerformReviewRecordEntity recordEntity = recordService.get(temp.getRecordId());
+                if(!ObjectUtils.isEmpty(recordEntity)){
+                    recordEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+                    recordEntity.setUpdateTime(new Date());
+                    recordEntity.setUpdateUserId(this.getContextUserId(context));
+                    recordService.update(recordEntity);
                 }
-                sendCheckDingTalk(temp);
-                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-                query.setStaffId(temp.getStaffId());
-                summaryCheck(query);
             }
+            sendCheckDingTalk(temp);
+            StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+            query.setStaffId(temp.getStaffId());
+            summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
         }