feat: 新增规则修改校验，修改签退时间规则.

guzijian
1 parent 1b7bcae8
Showing 6 changed files with 52 additions and 28 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/AttendanceController.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/RuleSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/AttendanceService.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
@@ -132,7 +132,7 @@ public class AttendanceController extends BaseController {
     @ApiOperation("获取一个月的排班table")
     @GetMapping("/list/people")
-    public TableDataInfo getTableMonth(@ModelAttribute PeopleRequestVo vo){
+    public TableDataInfo getTableMonth(@ModelAttribute PeopleRequestVo vo) {
         return attendanceService.getTableMonth(vo);
     }
@@ -140,21 +140,21 @@ public class AttendanceController extends BaseController {
     @ApiOperation("用户顶班")
     @PutMapping("/update/people/attendance")
     @Log(title = "用户顶班", businessType = BusinessType.UPDATE)
-    public Result<?> updateSchedulingByUser( @RequestBody @Validated UpdatePeopleAttendanceRequestVo vo){
+    public Result<?> updateSchedulingByUser(@RequestBody @Validated UpdatePeopleAttendanceRequestVo vo) {
         attendanceService.updateSchedulingByUser(vo);
         return Result.OK("顶班成功");
     }
     @ApiOperation("获取当日休息的用户")
     @GetMapping("/getToday/freeUser")
-    public Result<?> getTodayFreeUser(@RequestParam("date") String date){
+    public Result<?> getTodayFreeUser(@RequestParam("date") String date) {
         return Result.OK(attendanceService.getTodayFreeUser(date));
     }
     @ApiOperation("生成指定月份的排班")
     @PostMapping("/create/attendance/{month}")
     @Log(title = "生成当月", businessType = BusinessType.INSERT)
-    public Result<?> createAttendance(@PathVariable("month") String month){
+    public Result<?> createAttendance(@PathVariable("month") String month) {
         attendanceService.createAttendance(month);
         return Result.OK();
     }
@@ -162,10 +162,17 @@ public class AttendanceController extends BaseController {
     @ApiOperation("生成指定月份的指定人员的排班")
     @PostMapping("/again/create/attendance")
     @Log(title = "重新生成", businessType = BusinessType.INSERT)
-    public Result<?> againCreateAttendance(@RequestBody @Validated AgainCreateRequestVo vo){
+    public Result<?> againCreateAttendance(@RequestBody @Validated AgainCreateRequestVo vo) {
         attendanceService.againCreateAttendance(vo);
         return Result.OK();
     }
+    /**
+     * 规则检查
+     */
+    @GetMapping("/check/scheduleRule/{ruleId}")
+    public Result<?> checkScheduleRule(@PathVariable("ruleId") String ruleId) {
+        return attendanceService.checkScheduleRule(ruleId);
+    }
 }
@@ -287,12 +287,13 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public List<SignInResponseVo> selectSignInByIds(List<Long> collect) {
-        if (CollectionUtil.isEmpty(collect)){
+        if (CollectionUtil.isEmpty(collect)) {
             return new ArrayList<>();
         }
         return signInMapper.selectSignInByIds(collect);
     }
+
     private String handleDate(String dateString) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         // 解析字符串日期为 LocalDate 对象
@@ -544,8 +545,8 @@ public class SignInServiceImpl implements ISignInService {
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
-                    // 上一次无记无|签到,type:签退  当前时间小于最近签到时间 -> 早签 或者 超时
-                    else  {
+                    // 当前无记|签到,type:签退  当前时间小于最近签到时间 -> 早签 或者 超时
+                    else {
                         signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(currentScheduling));
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
@@ -578,7 +579,6 @@ public class SignInServiceImpl implements ISignInService {
                         globalIndex.setIndex(nextScheduling.getIndex());
                         prompt = getPrompt(nextScheduling);
                         signIn.setRemark((nextScheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
-
                     } else {
                         globalIndex.setIndex(currentScheduling.getIndex());
                         prompt = getPrompt(currentScheduling);
@@ -600,8 +600,8 @@ public class SignInServiceImpl implements ISignInService {
     }
     private boolean handleTimeOut(String bcType, long nowBetween, GlobalIndex globalIndex, DriverSignInRecommendation currentScheduling) {
-        if ((BC_TYPE_OUT.equals(bcType) && nowBetween > 0 )
-                ||( BC_TYPE_IN.equals(bcType) && nowBetween <= 60L)) {
+        if ((BC_TYPE_OUT.equals(bcType) && nowBetween > 0L)
+                || (BC_TYPE_IN.equals(bcType) && nowBetween > 60L)) {
             return true;
         } else {
             return false;
@@ -612,23 +612,22 @@ public class SignInServiceImpl implements ISignInService {
         if (BC_TYPE_OUT.equals(currentScheduling.getBcType())) {
             return "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前一小时内打卡。";
         } else {
-            // 正1小时 负 1小时
+            // 延后一小时
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
             LocalDateTime addHours = time.plusHours(1);
-            LocalDateTime hours = time.plusHours(-1);
-            return "请在" + ConstDateUtil.formatDate("HH:mm", hours) + "到"
+            return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到"
                     + ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
         }
     }
     public static boolean checkTimerSign(long nowBetween, String bcType) {
-        // 如果是签到就是正负一小时内有效
+        // 如果是签到就是提前一小时内有效
         if (BC_TYPE_OUT.equals(bcType)) {
             return !(nowBetween <= 0L && nowBetween >= -60L);
         } else {
-            // 如果是签退就是就是正负一小时内有效
-            return !(Math.abs(nowBetween) <= 60);
+            // 如果是签退就是就是延后一小时内有效
+            return !(nowBetween <= 60 && nowBetween >= 0L);
         }
     }
@@ -109,16 +109,6 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     @Override
     public int updateRuleScheduling(RuleScheduling ruleScheduling) {
         handleNewAddScheduling(ruleScheduling);
-        // TODO 规则是否绑定
-        LambdaQueryWrapper<RuleSettingScheduling> qw = new LambdaQueryWrapper<>();
-        qw.eq(RuleSettingScheduling::getRuleSchedulingId,ruleScheduling.getId());
-        List<RuleSettingScheduling> list = ruleSettingSchedulingService.list(qw);
-        if (CollectionUtil.isNotEmpty(list)) {
-            String ruleDictName = ruleNumSettingService.listByIds(list.stream()
-                            .map(RuleSettingScheduling::getSettingId).collect(Collectors.toList()))
-                    .stream().map(RuleNumSetting::getRuleDictName).distinct().collect(Collectors.joining(","));
-            throw new ServiceException("该规则已经与" + ruleDictName + "等班次绑定，请解绑对应班次后修改！");
-        }
         ruleScheduling.setUpdateTime(DateUtils.getNowDate());
         ruleScheduling.setUpdateBy(SecurityUtils.getUsername());
         ToolUtils.handleRuleScheduling(ruleScheduling);
 package com.ruoyi.service;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.global.Result;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.pojo.dto.SchedulingDto;
 import com.ruoyi.pojo.dto.SchedulingSettingDto;
@@ -87,4 +88,11 @@ public interface AttendanceService {
      * @param vo
      */
     void againCreateAttendance(AgainCreateRequestVo vo);
+
+    /**
+     * 检查规则
+     * @param ruleId
+     * @return
+     */
+    Result<?> checkScheduleRule(String ruleId);
 }
@@ -145,7 +145,7 @@ public class SchedulingService {
         long date = scheduling.getBcType().equals(BC_TYPE_IN) ? scheduling.getZdsjT() : scheduling.getFcsjT();
         long nowBetween = ChronoUnit.MINUTES.between(ConstDateUtil.getLocalDateTimeByLongTime(date), ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime()));
         if (SignInServiceImpl.checkTimerSign(nowBetween, scheduling.getBcType())) {
-            if (nowBetween < -60L) {
+            if (nowBetween < -60L || (BC_TYPE_IN.equals(scheduling.getBcType()) && nowBetween < 0L) ) {
                 sb.append(EARLY);
             } else {
                 sb.append(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
 package com.ruoyi.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.global.Result;
+import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -65,6 +69,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     @Autowired
     private RuleSettingSchedulingService settingSchedulingService;
+
     @Autowired
     private RuleAttendanceMainService attendanceMainService;
@@ -310,6 +315,21 @@ public class AttendanceServiceImpl implements AttendanceService {
         createAttendanceByStartDate(vo);
     }
+    @Override
+    public Result<?> checkScheduleRule(String ruleId) {
+        // TODO 规则是否绑定
+        LambdaQueryWrapper<RuleSettingScheduling> qw = new LambdaQueryWrapper<>();
+        qw.eq(RuleSettingScheduling::getRuleSchedulingId,ruleId);
+        List<RuleSettingScheduling> list = settingSchedulingService.list(qw);
+        if (CollectionUtil.isNotEmpty(list)) {
+            String ruleDictName = ruleNumSettingService.listByIds(list.stream()
+                            .map(RuleSettingScheduling::getSettingId).collect(Collectors.toList()))
+                    .stream().map(RuleNumSetting::getRuleDictName).distinct().collect(Collectors.joining(","));
+            return Result.ERROR(ResultCode.CODE_202,"该规则已经与" + ruleDictName + "等班次绑定！");
+        }
+        return Result.OK();
+    }
+
     private void createAttendanceByStartDate(AgainCreateRequestVo vo) {
         List<AttendanceDto> peopleList = ruleSchedulingService.getPeopleListByJobCodes(vo.getJobCode());
         LocalDate parse = LocalDate.parse(vo.getDate());