测试bug修改

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

@@ -221,6 +221,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         }
 
         entity.setCheckTime(temp.getErrorTime());
+        entity.setDeductTime(temp.getErrorTime());
         entity.setUpdateTime(new Date());
         entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
         dao.update(entity);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java

@@ -73,12 +73,12 @@ public class CheckAllRecordController extends BaseJsonBodyController {
                 calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
                 String endTime = format.format(calendar.getTime());
                 query.setCheckTimeStart(startTime);
-                String summaryTime =  cacheService.get(STAFF_PERFORM_SUMMARY);
-                if(StringUtils.isNotEmpty(summaryTime)){
-                    query.setCheckTimeEnd(summaryTime);
-                }else {
-                    query.setCheckTimeEnd(endTime +" 23:59:59");
-                }
+//                String summaryTime =  cacheService.get(STAFF_PERFORM_SUMMARY);
+//                if(StringUtils.isNotEmpty(summaryTime)){
+//                    query.setCheckTimeEnd(summaryTime);
+//                }else {
+//                    query.setCheckTimeEnd(endTime +" 23:59:59");
+//                }
             }else {
                 if(StringUtils.isNotEmpty(query.getCheckTimeEnd()) && query.getCheckTimeEnd().length()>9) {
                     query.setCheckTimeEnd(query.getCheckTimeEnd() + " 23:59:59");

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java

@@ -151,6 +151,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
                         checkAttendRecordEntity.setRemark(appealMsg);
                         checkAttendRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
                         checkAttendRecordEntity.setCheckTime(checkAttendRecordEntity.getErrorTime());
+                        checkAttendRecordEntity.setDeductTime(checkAttendRecordEntity.getErrorTime());
                         checkAttendRecordEntity.setUpdateTime(new Date());
                         checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
                         checkAttendRecordEntity.setAuditStatus(AuditStatusEnum.通过.getValue());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java

@@ -192,6 +192,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         checkAttendRecordEntity.setId(null);
         checkAttendRecordEntity.setRecordId(entity.getId());
         checkAttendRecordEntity.setCheckTime(entity.getErrorTime());
+        checkAttendRecordEntity.setDeductTime(entity.getErrorTime());
         if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
             checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
             if(checkAttendRecordEntity.getSubAddType()==SubAddTypeEnum.增加.getValue()){

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java

@@ -138,27 +138,28 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
             if(StringUtils.isNotEmpty(verify)&&verify.equals("true")){
                 throw new AppException("汇总任务正在执行，请勿重复操作");
             }
-            if(StringUtils.isNotEmpty(query.getCheckTimeStart())){
-                Date date = DateUtils.StrToDateTime(query.getCheckTimeStart());
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(date);
-                int year = calendar.get(Calendar.YEAR);
-                int month = calendar.get(Calendar.MONTH) + 1;
-                StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
-                staffPerformSummaryEntity.setReviewScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setOtherScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setGoworkScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setEffectScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setComplainScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setTotalScore(StaffPerformUtil.SCORE100);
-                staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO);
-                staffPerformSummaryEntity.setUpdateTime(new Date());
-                Map<String,Object> condition = new HashMap<>();
-                condition.put("year",year);
-                condition.put("month",month);
-                this.service.getDao().update(staffPerformSummaryEntity,condition);
-            }
+//            if(StringUtils.isNotEmpty(query.getCheckTimeStart())){
+//                Date date = DateUtils.StrToDateTime(query.getCheckTimeStart());
+//                Calendar calendar = Calendar.getInstance();
+//                calendar.setTime(date);
+//                int year = calendar.get(Calendar.YEAR);
+//                int month = calendar.get(Calendar.MONTH) + 1;
+//                StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
+//                staffPerformSummaryEntity.setReviewScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setOtherScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setGoworkScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setEffectScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setComplainScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setTotalScore(StaffPerformUtil.SCORE100);
+//                staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO);
+//                staffPerformSummaryEntity.setUpdateTime(new Date());
+//                staffPerformSummaryEntity.setStaffId(query.getStaffId());
+//                Map<String,Object> condition = new HashMap<>();
+//                condition.put("year",year);
+//                condition.put("month",month);
+//                this.service.getDao().update(staffPerformSummaryEntity,condition);
+//            }
             cacheService.lpush(KEY_CHECK_SUMMARY_CACHE,query);
             cacheService.set(SUMMARY_TASK_KEY,"true",900);     //15分钟过期
             model.put("message_info", "开始执行绩效汇总,请稍后查看");