排班

ltrq-api/src/main/java/api/controller/scheduling/SchedulingClassController.java

@@ -30,7 +30,7 @@ import java.util.List;
 
 @Api(value = "班别管理",tags = "班别管理")
 @RestController
-@RequestMapping("/scheduling/schedulingclass")
+@RequestMapping("/scheduling/schedulingClass")
 public class SchedulingClassController extends BaseController {
     @Autowired
     private ISchedulingClassService schedulingclassService;
@@ -41,7 +41,7 @@ public class SchedulingClassController extends BaseController {
     @GetMapping
     public AjaxResult getList(SchedulingClass input, PageInput pageInput) {
         LambdaQueryWrapper<SchedulingClass> qw = new LambdaQueryWrapper<>();
-        qw.eq(input.getClassId() != null && input.getClassId() > 0, SchedulingClass::getClassId, input.getClassId());
+        qw.eq(input.getSchedulingClassId() != null && input.getSchedulingClassId() > 0, SchedulingClass::getSchedulingClassId, input.getSchedulingClassId());
         qw.like(!StringHelper.isEmpty(input.getClassName()), SchedulingClass::getClassName, input.getClassName());
         qw.eq(input.getIsRest() != null && input.getIsRest() > 0, SchedulingClass::getIsRest, input.getIsRest());
         qw.eq(input.getMinimumPeople() != null && input.getMinimumPeople() > 0, SchedulingClass::getMinimumPeople, input.getMinimumPeople());
@@ -139,7 +139,7 @@ public class SchedulingClassController extends BaseController {
     @DeleteMapping("/{ids}")
     public AjaxResult delete(@PathVariable List<Long> ids)  {
         LambdaUpdateWrapper<SchedulingClass> qw = new LambdaUpdateWrapper<>();
-        qw.in(SchedulingClass::getClassId, ids);
+        qw.in(SchedulingClass::getSchedulingClassId, ids);
         qw.set(SchedulingClass::getIsDelete, 1);
         boolean result = schedulingclassService.updateBatch(qw);
         if(result){

ltrq-api/src/main/java/api/controller/scheduling/SchedulingManageController.java

@@ -3,8 +3,10 @@ package api.controller.scheduling;
 import api.entity.database.scheduling.SchedulingClass;
 import api.entity.database.system.User;
 import api.entity.input.scheduling.SchedulingCopy;
+import api.entity.input.scheduling.SchedulingManageInput;
 import api.entity.input.scheduling.SchedulingPreference;
 import api.entity.view.scheduling.SchedulingClassView;
+import api.entity.view.scheduling.SchedulingManageUserView;
 import api.entity.view.scheduling.SchedulingManageView;
 import api.entity.view.system.UserView;
 import api.mapper.system.UserMapper;
@@ -32,10 +34,12 @@ import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Api(value = "排班管理",tags = "排班管理")
 @RestController
-@RequestMapping("/scheduling/schedulingmanage")
+@RequestMapping("/scheduling/schedulingManage")
 public class SchedulingManageController extends BaseController {
     @Autowired
     private ISchedulingManageService schedulingmanageService;
@@ -54,7 +58,7 @@ public class SchedulingManageController extends BaseController {
     @GetMapping
     public AjaxResult getList(SchedulingManage input, PageInput pageInput) {
         LambdaQueryWrapper<SchedulingManage> qw = new LambdaQueryWrapper();
-        qw.eq(input.getId() != null && input.getId() > 0, SchedulingManage::getId, input.getId());
+        qw.eq(input.getSchedulingManageId() != null && input.getSchedulingManageId() > 0, SchedulingManage::getSchedulingManageId, input.getSchedulingManageId());
         qw.eq(input.getSchedulingDate() != null , SchedulingManage::getSchedulingDate, input.getSchedulingDate());
         qw.like(!StringHelper.isEmpty(input.getSchedulingStaff()), SchedulingManage::getSchedulingStaff, input.getSchedulingStaff());
         qw.eq(input.getClassId() != null && input.getClassId() > 0, SchedulingManage::getClassId, input.getClassId());
@@ -63,6 +67,7 @@ public class SchedulingManageController extends BaseController {
         qw.eq(input.getCreateTime() != null , SchedulingManage::getCreateTime, input.getCreateTime());
         qw.like(!StringHelper.isEmpty(input.getUpdateUser()), SchedulingManage::getUpdateUser, input.getUpdateUser());
         qw.eq(input.getUpdateTime() != null , SchedulingManage::getUpdateTime, input.getUpdateTime());
+        qw.eq(SchedulingManage::getIsDelete,0);
         Page<SchedulingManage> page = GetPage(pageInput);
         List<SchedulingManage> list;Long total = null;
         if (page != null) {
@@ -83,6 +88,10 @@ public class SchedulingManageController extends BaseController {
                 {
                     item.setUpdateUserName(userMapper.selectName(item.getUpdateUser()));
                 }
+                if (StringHelper.isNotEmpty(item.getSchedulingStaff()) )
+                {
+                    item.setSchedulingStaffName(userMapper.selectName(item.getSchedulingStaff()));
+                }
                 if (item.getClassId()!=null &&item.getClassId()>0)
                 {
                     var SchedulingClass=schedulingClassService.getEntity(item.getClassId());
@@ -101,7 +110,65 @@ public class SchedulingManageController extends BaseController {
             return Success("成功", schedulingManageViews);
         }
     }
+    @ApiOperation("列表")
+    @Log(title = "查询排班列表",businessType = BusinessType.QUERY)
+    @GetMapping("/getViewList")
+    public AjaxResult getViewList(SchedulingManageInput input) {
+        LambdaQueryWrapper<SchedulingManage> qw = new LambdaQueryWrapper();
+        qw.eq(input.getSchedulingManageId() != null && input.getSchedulingManageId() > 0, SchedulingManage::getSchedulingManageId, input.getSchedulingManageId());
+        qw.eq(input.getSchedulingDate() != null , SchedulingManage::getSchedulingDate, input.getSchedulingDate());
+        qw.like(!StringHelper.isEmpty(input.getSchedulingStaff()), SchedulingManage::getSchedulingStaff, input.getSchedulingStaff());
+        qw.eq(input.getClassId() != null && input.getClassId() > 0, SchedulingManage::getClassId, input.getClassId());
+        qw.eq(input.getDeptId() != null && input.getDeptId() > 0, SchedulingManage::getDeptId, input.getDeptId());
+        qw.like(!StringHelper.isEmpty(input.getCreateUser()), SchedulingManage::getCreateUser, input.getCreateUser());
+        qw.like(!StringHelper.isEmpty(input.getUpdateUser()), SchedulingManage::getUpdateUser, input.getUpdateUser());
+        qw.eq(input.getUpdateTime() != null , SchedulingManage::getUpdateTime, input.getUpdateTime());
+        qw.ge(!StringHelper.isEmpty(input.getStartTime()), SchedulingManage::getCreateTime, input.getStartTime());
+        qw.le(!StringHelper.isEmpty(input.getEndTime()), SchedulingManage::getCreateTime, input.getEndTime());
+        qw.eq(SchedulingManage::getIsDelete,0);
+        List<SchedulingManage> list=  schedulingmanageService.getList(qw);
+        List<SchedulingManageView>  schedulingManageViews=  JSON.parseArray(JSON.toJSONString(list), SchedulingManageView.class);
+        if (schedulingManageViews!=null && schedulingManageViews.size()>0)
+        {
+            for (SchedulingManageView item : schedulingManageViews) {
+                if (item.getClassId()!=null &&item.getClassId()>0)
+                {
+                    var SchedulingClass=schedulingClassService.getEntity(item.getClassId());
+                    if (SchedulingClass!=null)
+                    {
+                        item.setSchedulingClass(SchedulingClass);
+                    }
+                }
+            }
+        }
+        if (schedulingManageViews != null && schedulingManageViews.size() > 0) {
+            List<String> nameList = schedulingManageViews.stream()
+                    .map(SchedulingManageView::getSchedulingStaff)
+                    .distinct()
+                    .collect(Collectors.toList());
+            List<SchedulingManageUserView> views = new ArrayList<>();
+            if (nameList.size() > 0) {
+                for (String item : nameList) {
+                    SchedulingManageUserView view = new SchedulingManageUserView();
+                    view.setUserCode(item);
+                    if (StringHelper.isNotEmpty(view.getUserCode())) {
+                        view.setUserName(userMapper.selectName(view.getUserCode()));
+                    }
+                    List<SchedulingManageView> manages = schedulingManageViews.stream()
+                            .filter(x -> Objects.equals(x.getSchedulingStaff(), item))
+                            .collect(Collectors.toList());
+                    view.setManages(manages);
+                    views.add(view);
 
+                }
+            }
+            return Success("成功", views);
+        }
+        else
+        {
+            return Success("成功", schedulingManageViews);
+        }
+    }
     @ApiOperation("详情")
     @Log(title = "查询排班详情",businessType = BusinessType.QUERY)
     @GetMapping("/{id}")
@@ -143,6 +210,7 @@ public class SchedulingManageController extends BaseController {
         {
             return  Error("请选择排班人员");
         }
+        input.setDeptId(CurrentUser().getDeptId());
         input.setCreateUser(CurrentUser().getUserName());
         boolean result = schedulingmanageService.insert(input);
         if (result) {
@@ -256,9 +324,9 @@ public class SchedulingManageController extends BaseController {
     @ApiOperation("删除")
     @Log(title = "删除排班",businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable Long[] ids)  {
+    public AjaxResult delete(@PathVariable List<Long> ids)  {
         LambdaUpdateWrapper<SchedulingManage> qw = new LambdaUpdateWrapper<>();
-        qw.in(SchedulingManage::getId, ids);
+        qw.in(SchedulingManage::getSchedulingManageId, ids);
         qw.set(SchedulingManage::getIsDelete, 1);
         boolean result = schedulingmanageService.updateBatch(qw);
         if(result){

ltrq-api/src/main/java/api/controller/scheduling/SchedulingRuleController.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 
 @Api(value = "自动排班",tags = "自动排班")
 @RestController
-@RequestMapping("/scheduling/schedulingrule")
+@RequestMapping("/scheduling/schedulingRule")
 public class SchedulingRuleController extends BaseController {
     @Autowired
     private ISchedulingRuleService schedulingruleService;
@@ -29,7 +29,7 @@ public class SchedulingRuleController extends BaseController {
     @GetMapping
     public AjaxResult getList(SchedulingRule input, PageInput pageInput) {
         LambdaQueryWrapper<SchedulingRule> qw = new LambdaQueryWrapper();
-        qw.eq(input.getRuleId() != null && input.getRuleId() > 0, SchedulingRule::getRuleId, input.getRuleId());
+        qw.eq(input.getSchedulingRuleId() != null && input.getSchedulingRuleId() > 0, SchedulingRule::getSchedulingRuleId, input.getSchedulingRuleId());
         qw.eq(input.getStartTime() != null , SchedulingRule::getStartTime, input.getStartTime());
         qw.eq(input.getEndTime() != null , SchedulingRule::getEndTime, input.getEndTime());
         qw.eq(input.getMaximumWork() != null && input.getMaximumWork() > 0, SchedulingRule::getMaximumWork, input.getMaximumWork());

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

@@ -19,7 +19,7 @@ public class SchedulingClass {
     /** 班别id */
     @ApiModelProperty("班别id")
     @TableId(type = IdType.AUTO)
-    private Long classId;
+    private Long schedulingClassId;
     /** 班别名称 */
     @ApiModelProperty("班别名称")
     private String className;

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

@@ -19,7 +19,7 @@ public class SchedulingManage {
     /** id */
     @ApiModelProperty("id")
     @TableId(type = IdType.AUTO)
-    private Long id;
+    private Long schedulingManageId;
     /** 排班日期 */
     @ApiModelProperty("排班日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "UTC")

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

@@ -19,7 +19,10 @@ public class SchedulingRule {
     /** 规则id */
     @ApiModelProperty("规则id")
     @TableId(type = IdType.AUTO)
-    private Long ruleId;
+    private Long schedulingRuleId;
+    /** 排班班别 */
+    @ApiModelProperty("自动排班名称")
+    private String name;
     /** 开始时间 */
     @ApiModelProperty("开始时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")

ltrq-entity/src/main/java/api/entity/input/scheduling/SchedulingManageInput.java

@@ -0,0 +1,16 @@
+package api.entity.input.scheduling;
+
+import api.entity.database.scheduling.SchedulingManage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class SchedulingManageInput extends SchedulingManage {
+    /** 开始时间 */
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    /** 结束时间 */
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}

ltrq-entity/src/main/java/api/entity/view/scheduling/SchedulingManageUserView.java

@@ -0,0 +1,21 @@
+package api.entity.view.scheduling;
+
+import api.entity.database.scheduling.SchedulingManage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SchedulingManageUserView {
+    /** 创建人 */
+    @ApiModelProperty("name")
+    private String UserName;
+
+    /** 创建人 */
+    @ApiModelProperty("code")
+    private String userCode;
+    @ApiModelProperty("Manages")
+    private List<SchedulingManageView>  Manages;
+
+}

ltrq-entity/src/main/java/api/entity/view/scheduling/SchedulingManageView.java

@@ -14,6 +14,11 @@ public class SchedulingManageView extends SchedulingManage {
     /** 创建人 */
     @ApiModelProperty("更新人名称")
     private String updateUserName;
+    /** 创建人 */
+    @ApiModelProperty("姓名")
+    private String schedulingStaffName;
+
+
 
     /** 班别名称 */
     @ApiModelProperty("班别")

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

@@ -105,10 +105,10 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
                 var schedulingClass=schedulingClassService.getEntity(Long.parseLong(item));
                 if (schedulingClass!=null)
                 {
-                    int currentCount = shiftCount.get(schedulingClass.getClassId());
+                    int currentCount = shiftCount.get(schedulingClass.getSchedulingClassId());
                     int needed = (int) (schedulingClass.getMaximumPeople() - currentCount);
                     if (needed > 0) {
-                        assignShiftToEmployees(availableEmployees, currentDate, schedulingClass.getClassId(),
+                        assignShiftToEmployees(availableEmployees, currentDate, schedulingClass.getSchedulingClassId(),
                                 needed, UserSchedules, finalAssignments,
                                 shiftCount, constraint,current);
                     }
@@ -131,7 +131,7 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
         List<SchedulingManage> newManage = new ArrayList<>();
         for(SchedulingManage item :finalAssignments)
         {
-            if (item.getId()!=null&&item.getId()>0)
+            if (item.getSchedulingManageId()!=null&&item.getSchedulingManageId()>0)
             {
             }
             else
@@ -164,7 +164,7 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
         // 检查是否满足最低人数
         if (assigned < needed) {
             System.err.println("警告: " + date + " 班别 " + shiftType +
-                    " 无法满足最低人数需求 (" + needed + "/" + needed + ")");
+                    " 无法满足最低人数需求 (" + assigned + "/" + needed + ")");
         }
     }
     private void assignShift(User emp, Date date, Long shiftType,
@@ -185,7 +185,7 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
         manage.setSchedulingStaff(emp.getUserName());
         manage.setClassId(shiftType);
         manage.setDeptId(emp.getDeptId());
-        manage.setRuleId(constraint.getRuleId());
+        manage.setRuleId(constraint.getSchedulingRuleId());
         manage.setCreateUser(current.getUserName());
         return  manage;
     }
@@ -307,8 +307,7 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
         cal.set(Calendar.SECOND, 59); // 设置为周日最后一秒
         // 计算剩余天数（当前时间到周日结束）
         long diffMillis = cal.getTimeInMillis() - date.getTime();
-        int daysRemaining = (int) (diffMillis / (1000 * 60 * 60 * 24));
-        return  daysRemaining;
+        return (int) (diffMillis / (1000 * 60 * 60 * 24));
     }
 
     // 增强版班别选择（考虑人数限制）
@@ -321,7 +320,7 @@ public class SchedulingRuleServiceImpl extends BaseServiceImpl<SchedulingRuleMap
                     var schedulingClass=schedulingClassService.getEntity(Long.parseLong(shift));
                     if (schedulingClass!=null)
                     {
-                        return shiftCount.get(schedulingClass.getClassId()) < schedulingClass.getMaximumPeople();
+                        return shiftCount.get(schedulingClass.getSchedulingClassId()) < schedulingClass.getMaximumPeople();
                     }
                     return false;
                 })