feat: 班次修改和规则修改设置。

guzijian
1 parent 5e0a6bbc
Showing 5 changed files with 62 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/common/WeekEnum.java
Bsth-admin/src/main/java/com/ruoyi/num/service/impl/RuleNumServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/RuleSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/ToolUtils.java
Bsth-admin/src/main/resources/mapper/scheduling/RuleSchedulingMapper.xml
@@ -13,6 +13,9 @@ public enum WeekEnum {
     FRIDAY(5,"FRIDAY","星期五"),
     SATURDAY(6,"SATURDAY","星期六"),
     SUNDAY(7,"SUNDAY","星期天"),
+    /**
+     * 休息的id在表中必须为0
+     */
     FREE(0,"休息","休息");
     private String description;
@@ -8,18 +8,25 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.domain.RuleNumSetting;
 import com.ruoyi.pojo.dto.RuleNumDto;
 import com.ruoyi.pojo.vo.RuleNumTemplateVo;
 import com.ruoyi.pojo.vo.RuleNumVo;
 import com.ruoyi.pojo.vo.SchedulingResponseVo;
 import com.ruoyi.service.RuleNumSettingService;
+import com.ruoyi.utils.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.num.mapper.RuleNumMapper;
 import com.ruoyi.num.domain.RuleNum;
 import com.ruoyi.num.service.IRuleNumService;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+
 import static com.ruoyi.common.RuleSchedulingProperties.*;
 /**
@@ -75,6 +82,7 @@ public class RuleNumServiceImpl implements IRuleNumService
         ruleNum.setUpdateBy(username);
         ruleNum.setCreateTime(DateUtils.getNowDate());
         ruleNum.setUpdateTime(DateUtils.getNowDate());
+        ToolUtils.handlerRuleNum(ruleNum);
         return ruleNumMapper.insertRuleNum(ruleNum);
     }
@@ -87,6 +95,14 @@ public class RuleNumServiceImpl implements IRuleNumService
     @Override
     public int updateRuleNum(RuleNum ruleNum)
     {
+        // TODO 判断是否已绑定到排班设置中
+        LambdaQueryWrapper<RuleNumSetting> qw = new LambdaQueryWrapper<>();
+        qw.eq(RuleNumSetting::getRuleNumId,ruleNum.getId());
+        List<RuleNumSetting> settingList = ruleNumSettingService.list(qw);
+        if (CollectionUtil.isNotEmpty(settingList)) {
+            throw new ServiceException("该班次已被绑定，无法修改，请解除绑定后再试！");
+        }
+        ToolUtils.handlerRuleNum(ruleNum);
         ruleNum.setUpdateTime(DateUtils.getNowDate());
         ruleNum.setUpdateBy(ruleNum.getUpdateBy());
         return ruleNumMapper.updateRuleNum(ruleNum);
@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.RuleNumSetting;
@@ -19,6 +20,7 @@ import com.ruoyi.pojo.vo.RuleSchedulingResponseVo;
 import com.ruoyi.pojo.vo.RuleSchedulingVo;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.service.RuleSettingSchedulingService;
+import com.ruoyi.utils.ToolUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,6 +85,7 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
         Date date = DateUtils.getNowDate();
         ruleScheduling.setCreateTime(date);
         ruleScheduling.setUpdateTime(date);
+        ToolUtils.handleRuleScheduling(ruleScheduling);
         return ruleSchedulingMapper.insertRuleScheduling(ruleScheduling);
     }
@@ -106,8 +109,19 @@ 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);
         return ruleSchedulingMapper.updateRuleScheduling(ruleScheduling);
     }
@@ -3,6 +3,7 @@ package com.ruoyi.utils;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.RuleAttendanceMain;
+import com.ruoyi.num.domain.RuleNum;
 import com.ruoyi.pojo.dto.RuleSchedulingDto;
 import com.ruoyi.scheduling.domain.RuleScheduling;
 import org.springframework.beans.BeanUtils;
@@ -13,7 +14,7 @@ import java.util.Objects;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_TIME_OUT_EX_NUM;
-import static com.ruoyi.common.RuleSchedulingProperties.TOMORROW_NO;
+import static com.ruoyi.common.RuleSchedulingProperties.*;
 import static com.ruoyi.common.SignStatusEnum.SIGN_STATUS_DELAY_ENUM;
 import static com.ruoyi.common.SignStatusEnum.SIGN_STATUS_ZONE_ENUM;
@@ -41,6 +42,7 @@ public class ToolUtils {
     /**
      * 更新报表记录
+     *
      * @param scheduling
      */
     public static void updateReport(DriverScheduling scheduling) {
@@ -65,12 +67,32 @@ public class ToolUtils {
             // 计划签退时间
             Long zdsjT = scheduling.getZdsjT();
             // 一小时内约束
-            if ( date.getTime() - zdsjT > 60 * 60 * 1000 ) {
+            if (date.getTime() - zdsjT > 60 * 60 * 1000) {
                 scheduling.setExType(SIGN_TIME_OUT_EX_NUM);
                 scheduling.setRemark(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
             }
         }
     }
+    public static void handlerRuleNum(RuleNum ruleNum) {
+        if (RULE_TYPE_FIXED.equals(ruleNum.getRuleType())) {
+            ruleNum.setRuleWeek("");
+        }
+        if (RULE_TYPE_WEEK.equals(ruleNum.getRuleType())) {
+            ruleNum.setWorkDay(null);
+            ruleNum.setFreeDay(null);
+        }
+    }
+
+    public static void handleRuleScheduling(RuleScheduling ruleScheduling) {
+        if (ruleScheduling.getSecondFlag().equals(NO_SEGMENTATION)) {
+            ruleScheduling.setSecondSignDayTomorrow(null);
+            ruleScheduling.setSecondQuittingSignInTime(null);
+            ruleScheduling.setSecondSignInQuittingRange(null);
+            ruleScheduling.setSecondWorkSignInTime(null);
+            ruleScheduling.setSecondSignInWorkingRange(null);
+        }
+    }
+
 }
@@ -187,11 +187,11 @@
             <if test="firstSignInQuittingRange != null">first_sign_in_quitting_range = #{firstSignInQuittingRange},</if>
             <if test="signInTimeOutRange != null">sign_in_time_out_range = #{signInTimeOutRange},</if>
             <if test="secondFlag != null">second_flag = #{secondFlag},</if>
-            <if test="secondWorkSignInTime != null">second_work_sign_in_time = #{secondWorkSignInTime},</if>
-            <if test="secondSignInWorkingRange != null">second_sign_in_working_range = #{secondSignInWorkingRange},</if>
-            <if test="secondQuittingSignInTime != null">second_quitting_sign_in_time = #{secondQuittingSignInTime},</if>
-            <if test="secondSignInQuittingRange != null">second_sign_in_quitting_range = #{secondSignInQuittingRange},</if>
-            <if test="secondSignDayTomorrow != null">second_sign_day_tomorrow = #{secondSignDayTomorrow},</if>
+            second_work_sign_in_time = #{secondWorkSignInTime},
+           second_sign_in_working_range = #{secondSignInWorkingRange},
+            second_quitting_sign_in_time = #{secondQuittingSignInTime},
+            second_sign_in_quitting_range = #{secondSignInQuittingRange},
+            second_sign_day_tomorrow = #{secondSignDayTomorrow},
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>