Merge remote-tracking branch 'origin/master'

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

@@ -66,11 +66,18 @@ public class CheckAllRecordController extends BaseJsonBodyController {
         int code = 1;
         try {
             PageInfo pageInfo = new PageInfo(-1);
-            if (StringUtils.isEmpty(query.getCheckTimeStart())) {
             Calendar calendar = Calendar.getInstance();
+            if (StringUtils.isEmpty(query.getCheckTimeStart())) {
                 calendar.add(Calendar.DAY_OF_MONTH,-1);
                 query.setCheckTimeEnd(DateUtils.getStrDate(calendar.getTime()));
                 query.setCheckTimeStart(DateUtil.beginOfMonth(calendar.getTime()).toDateStr());
+            }else {
+                String currMonth = DateUtils.getCurrMonth();
+                String checkTimeMonth = DateUtils.convertDateStrToStr(query.getCheckTimeStart(),"yyyy-MM-dd","yyyy-MM");
+                if(currMonth.equals(checkTimeMonth)){
+                    calendar.add(Calendar.DAY_OF_MONTH,-1);
+                    query.setCheckTimeEnd(DateUtils.getStrDate(calendar.getTime()));
+                }
             }
             Result<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query, pageInfo);
 
@@ -206,25 +213,26 @@ public class CheckAllRecordController extends BaseJsonBodyController {
         return ret;
     }
 
-    public static void main(String[] args) {
-        StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
-        query.setCheckTimeStart("2023-02-01");
-        query.setCheckTimeEnd("2023-02-29");
-        StaffCheckSummaryQuery lastQuery = new StaffCheckSummaryQuery();
-        String yyyy = query.getCheckTimeStart().substring(0, 4);
-        String mmdd = query.getCheckTimeStart().substring(4);
-        int lastyear = DataUtil.converStr2Int(yyyy, 0);
-        lastyear--;
-        if (query.getCheckTimeStart().substring(4).equals("-02-29")) {
-            lastQuery.setCheckTimeStart(lastyear + "-02-28");
-        } else {
-            lastQuery.setCheckTimeStart(lastyear + query.getCheckTimeStart().substring(4));
-        }
-        if (query.getCheckTimeEnd().substring(4).equals("-02-29")) {
-            lastQuery.setCheckTimeEnd(lastyear + "-02-28");
-        } else {
-            lastQuery.setCheckTimeEnd(lastyear + query.getCheckTimeEnd().substring(4));
-        }
-        System.out.println(JSONObject.toJSON(lastQuery).toString());
-    }
+//    public static void main(String[] args) {
+//        StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+//        query.setCheckTimeStart("2023-02-01");
+//        query.setCheckTimeEnd("2023-02-29");
+//        StaffCheckSummaryQuery lastQuery = new StaffCheckSummaryQuery();
+//        String yyyy = query.getCheckTimeStart().substring(0, 4);
+//        String mmdd = query.getCheckTimeStart().substring(4);
+//        int lastyear = DataUtil.converStr2Int(yyyy, 0);
+//        lastyear--;
+//        if (query.getCheckTimeStart().substring(4).equals("-02-29")) {
+//            lastQuery.setCheckTimeStart(lastyear + "-02-28");
+//        } else {
+//            lastQuery.setCheckTimeStart(lastyear + query.getCheckTimeStart().substring(4));
+//        }
+//        if (query.getCheckTimeEnd().substring(4).equals("-02-29")) {
+//            lastQuery.setCheckTimeEnd(lastyear + "-02-28");
+//        } else {
+//            lastQuery.setCheckTimeEnd(lastyear + query.getCheckTimeEnd().substring(4));
+//        }
+//        System.out.println(JSONObject.toJSON(lastQuery).toString());
+//    }
+
 }