排班

ltrq-entity/src/main/java/api/entity/database/scheduling/SchedulingClass.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 /** scheduling_class */

ltrq-entity/src/main/java/api/entity/database/scheduling/SchedulingManage.java

@@ -3,6 +3,7 @@ package api.entity.database.scheduling;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,7 +22,7 @@ public class SchedulingManage {
     private Long id;
     /** 排班日期 */
     @ApiModelProperty("排班日期")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "UTC")
     private Date schedulingDate;
     /** 排班人员 */
     @ApiModelProperty("排班人员")

ltrq-entity/src/main/java/api/entity/database/scheduling/SchedulingRule.java

@@ -3,6 +3,7 @@ package api.entity.database.scheduling;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,11 +22,11 @@ public class SchedulingRule {
     private Long ruleId;
     /** 开始时间 */
     @ApiModelProperty("开始时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date startTime;
     /** 结束时间 */
     @ApiModelProperty("结束时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date endTime;
     /** 最大连续工作天数 */
     @ApiModelProperty("最大连续工作天数")

ltrq-service/src/main/java/api/service/scheduling/impl/SchedulingClassServiceImpl.java

@@ -36,16 +36,30 @@ public class SchedulingClassServiceImpl extends BaseServiceImpl<SchedulingClassM
         {
             LocalTime restStart = LocalTime.parse(input.getWorkStartTime(), formatter);
             LocalTime restEnd = LocalTime.parse(input.getWorkEndTime(), formatter);
-            // 计算时间差
-            Duration duration = Duration.between(restStart, restEnd);
-            double hoursDifference = duration.toMinutes() / 60.0; // 转为小时（含小数）
+            double hoursDifference=0;
+            if (restStart.isBefore(restEnd))
+             {
+                 // 计算时间差
+                 Duration duration = Duration.between(restStart, restEnd);
+                 hoursDifference  = duration.toMinutes() / 60.0; // 转为小时（含小数）
+             }
+            else
+            {
+                LocalTime restEnd1 = LocalTime.parse("00:00:00", formatter);
+                LocalTime restStart1 = LocalTime.parse("23:59:59", formatter);
+                Duration duration = Duration.between(restStart, restStart1);
+                Duration duration1 = Duration.between(restEnd1, restEnd);
+                hoursDifference = (duration.plusSeconds(1).toMinutes() / 60.0)+
+                        (duration1.toMinutes() / 60.0); // 转为小时（含小数）
+            }
+
             if (input.getRestDuration()!=null&&input.getRestDuration()>0)
             {
-                input.setRestDuration(hoursDifference-input.getRestDuration());
+                input.setWorkDuration(hoursDifference-input.getRestDuration());
             }
             else
             {
-                input.setRestDuration(hoursDifference);
+                input.setWorkDuration(hoursDifference);
             }
 
         }

ltrq-service/src/main/java/api/service/scheduling/impl/SchedulingRuleServiceImpl.java

@@ -59,25 +59,25 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
         Map<User, Map<Date, Long>> UserSchedules = new HashMap<>();
         Map<Date, Map<Long, Integer>> dailyShiftCount = new HashMap<>();
         // 步骤1: 整合现有排班（若不替换）
-        if (constraint.getIsReplace()==0 ) {
+
             for (User emp : Users) {
                 Map<Date, Long> empSchedule = new HashMap<>();
-                if (existingShifts.containsKey(emp)) {
-                    for (SchedulingManage shift : existingShifts.get(emp)) {
-                        if (shift.getSchedulingDate().after(constraint.getStartTime()) &&
-                                shift.getSchedulingDate().before(constraint.getEndTime())) {
-                            empSchedule.put( shift.getSchedulingDate(), shift.getClassId());
-                            // 更新班别人数计数
-                            dailyShiftCount
-                                    .computeIfAbsent(shift.getSchedulingDate(), k -> initializeShiftCount(constraint))
-                                    .merge(shift.getClassId(), 1, Integer::sum);
+                if (constraint.getIsReplace()==0 ) {
+                    if (existingShifts.containsKey(emp)) {
+                        for (SchedulingManage shift : existingShifts.get(emp)) {
+                            if (shift.getSchedulingDate().after(constraint.getStartTime()) &&
+                                    shift.getSchedulingDate().before(constraint.getEndTime())) {
+                                empSchedule.put(shift.getSchedulingDate(), shift.getClassId());
+                                // 更新班别人数计数
+                                dailyShiftCount
+                                        .computeIfAbsent(shift.getSchedulingDate(), k -> initializeShiftCount(constraint))
+                                        .merge(shift.getClassId(), 1, Integer::sum);
+                            }
                         }
                     }
                 }
-                UserSchedules.put(emp, empSchedule);
-            }
-        }
-        else
+                UserSchedules.put(emp, empSchedule);}
+        if (constraint.getIsReplace()==1 )
         {
             //删除现有排班
             LambdaUpdateWrapper<SchedulingManage> ManageUpdate =new LambdaUpdateWrapper<>();
@@ -92,7 +92,7 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
         Date currentDate = constraint.getStartTime();
         Calendar calendar=Calendar.getInstance();
         calendar.setTime(currentDate);
-        while (currentDate.before(constraint.getEndTime())) {
+        while (currentDate.compareTo(constraint.getEndTime()) <= 0) {
             // 初始化当天班别人数计数
             Map<Long, Integer> shiftCount = dailyShiftCount
                     .computeIfAbsent(currentDate, k -> initializeShiftCount(constraint));
@@ -193,9 +193,16 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
     private List<User> getAvailableEmployees(List<User> employees,
                                                  Map<User, Map<Date, Long>> schedules,
                                                  Date date) {
-        return employees.stream()
-                .filter(emp -> !schedules.get(emp).containsKey(date))
-                .collect(Collectors.toList());
+        if (schedules.size()>0)
+        {
+            return employees.stream()
+                    .filter(emp -> !schedules.get(emp).containsKey(date))
+                    .collect(Collectors.toList());
+        }
+        else
+        {
+            return new ArrayList<>();
+        }
     }
 
     private Map<Long, Integer> initializeShiftCount(SchedulingRule constraint) {
@@ -329,8 +336,11 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
             List<String> intersection = availableShifts.stream()
                     .filter( Arrays.asList(emp.getPreference().split(","))::contains) // 检查元素是否在list2中
                     .collect(Collectors.toList());
+            if (intersection.size()>0)
+            {
+                return intersection.get(new Random().nextInt(intersection.size()));
+            }
 
-            return intersection.get(new Random().nextInt(availableShifts.size()));
         }
 
         // 随机选择可用班别