Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java

@@ -98,7 +98,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                             staffPerformSummaryEntity.setTotalScore(StaffPerformUtil.SCORE100);
                             //staffPerformSummaryEntity.setAddTotalScore(BigDecimal.ZERO);
                             staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO);
-                            staffPerformSummaryEntity.setSumScore(StaffPerformUtil.SCORE100);
+                            //staffPerformSummaryEntity.setSumScore(StaffPerformUtil.SCORE100);
                             staffPerformSummaryEntity.setUpdateTime(new Date());
                             Map<String,Object> condition = new HashMap<>();
                             condition.put("year",year);

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

@@ -653,6 +653,13 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             params.setSummaryTimeStart(DateUtil.offsetDay(new Date(), -30).toDateStr());
             params.setSummaryTimeEnd(DateUtils.getCurrStrDate());
         }
+        if(StringUtils.isNotEmpty(params.getSummaryTimeStart()) && StringUtils.isNotEmpty(params.getSummaryTimeEnd())) {
+            String start = params.getSummaryTimeStart().substring(0, 7);
+            String end = params.getSummaryTimeEnd().substring(0, 7);
+            if(!start.equals(end)){
+                throw new AppException("时间范围不能跨月");
+            }
+        }
         if (StringUtils.isNotEmpty(params.getStaffName())) {
             params.setStaffName("%" + params.getStaffName() + "%");
         }
@@ -775,4 +782,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
 
     }
 
+    public static void main(String[] args) {
+        String ss = "2024-08-01";
+        System.out.println(ss.substring(0,7));
+    }
 }
\ No newline at end of file