Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/HighTemperatureSetController.java

@@ -66,6 +66,13 @@ public class HighTemperatureSetController {
         return httpRespMsg;
     }
 
+    @RequestMapping("/deleteHigh")
+    private HttpRespMsg deleteHigh(Integer id){
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        highTemperatureSetService.removeById(id);
+        return httpRespMsg;
+    }
+
 
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/HighTemperatureSet.java

@@ -36,7 +36,9 @@ public class HighTemperatureSet extends Model<HighTemperatureSet> {
      * 开始日期
      */
     @TableField("start_date")
-    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDate;
 
     /**
      * 结束日期

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/AttendanceStaffServiceImpl.java

@@ -203,7 +203,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
     public HttpRespMsg getAttendanceUserData(String month, String date, String userId, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<AttendanceStaff> wrapper = new QueryWrapper<AttendanceStaff>()
-                .eq("month", month).eq("date", date);
+                .eq("month", month);
         if (userId==null|| StringUtils.isEmpty(userId)){
             User user = userService.getById(request.getHeader("Token"));
             wrapper.eq("job_number", user.getJobNumber());
@@ -235,7 +235,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         maplist.add(map);
                     }
 
-                    if (endTime.isBefore(LocalTime.of(15,0,0))){
+                    if (endTime.isBefore(LocalTime.of(17,0,0))){
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("msg",endTime+"下班考勤打卡");
                         map.put("res","早退");
@@ -244,7 +244,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("msg",endTime+"下班考勤打卡");
                         map.put("res","正常");
-                        double v = calculateOvertimeHours(startTime, endTime);
+                        double v = calculateOvertimeHours(LocalTime.of(17,0),endTime );
                         if (v>0) {
                             map.put("extra", "(17:00-"+endTime+"加班"+v+"小时)");
                         }
@@ -273,9 +273,9 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("msg",endTime+"下班考勤打卡");
                         map.put("res","正常");
-                        double v = calculateOvertimeHours(startTime, endTime);
+                        double v = calculateOvertimeHours(LocalTime.of(21,0,0), endTime);
                         if (v>0) {
-                            map.put("extra", "(13:00-"+endTime+"加班"+v+"小时)");
+                            map.put("extra", "(21:00-"+endTime+"加班"+v+"小时)");
                         }
                         maplist.add(map);
                     }
@@ -293,7 +293,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         maplist.add(map);
                     }
 
-                    if (endTime.isBefore(LocalTime.of(23,59,59))){
+                    if (endTime.isBefore(LocalTime.of(23,59,59))&&endTime.isAfter(LocalTime.of(16,0,0))){
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("msg",endTime+"下班考勤打卡");
                         map.put("res","早退");
@@ -302,7 +302,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("msg",endTime+"下班考勤打卡");
                         map.put("res","正常");
-                        double v = calculateOvertimeHours(startTime, endTime);
+                        double v = calculateOvertimeHours(LocalTime.of(23,59,59), endTime);
                         if (v>0) {
                             map.put("extra", "(00:00-"+endTime+"加班"+v+"小时)");
                         }
@@ -331,7 +331,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("msg",endTime+"下班考勤打卡");
                         map.put("res","正常");
-                        double v = calculateOvertimeHours(startTime, endTime);
+                        double v = calculateOvertimeHours(LocalTime.of(8,0,0), endTime);
                         if (v>0) {
                             map.put("extra", "(08:00-"+endTime+"加班"+v+"小时)");
                         }
@@ -340,9 +340,10 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                     break;
 
             }
+            staff.setMaplist(maplist);
         }
         msg.setData(list);
-        return null;
+        return msg;
     }
 
     public static BigDecimal calculateWorkHours(LocalDateTime start, LocalDateTime end) {
@@ -380,8 +381,8 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
 
         if (totalMinutes <= 60) return 0;
 
-        long overtimeMinutes = totalMinutes - 60;
-        return (int) Math.round(overtimeMinutes / 30.0);
+        long overtimeMinutes = totalMinutes;
+        return (int) Math.floor(overtimeMinutes / 30.0);
     }