feat: 修改班次删除，和规则删除。

guzijian
1 parent c7ffeb90
Showing 6 changed files with 59 additions and 4 deletions
Bsth-admin/src/main/java/com/ruoyi/mapper/RuleNumSettingMapper.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/service/RuleNumSettingService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
Bsth-admin/src/main/resources/mapper/RuleNumSettingMapper.xml
@@ -32,6 +32,8 @@ public interface RuleNumSettingMapper extends BaseMapper&lt;RuleNumSetting&gt; {
      * @return
      */
     List<AttendanceDto> getPeopleListByMonth(@Param("month") String month);
+
+    List<SchedulingResponseVo> getSchedulingListById(Long[] ids);
 }
@@ -6,19 +6,20 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 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 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 static com.ruoyi.common.RuleSchedulingProperties.*;
 /**
@@ -33,6 +34,9 @@ public class RuleNumServiceImpl implements IRuleNumService
     @Autowired
     private RuleNumMapper ruleNumMapper;
+    @Autowired
+    private RuleNumSettingService ruleNumSettingService;
+
     /**
      * 查询班次管理
      * 
@@ -97,7 +101,12 @@ public class RuleNumServiceImpl implements IRuleNumService
     @Override
     public int deleteRuleNumByIds(Long[] ids)
     {
-        return ruleNumMapper.deleteRuleNumByIds(ids);
+        // TODO 检查改班次是被使用 使用后提示
+        List<SchedulingResponseVo> list = ruleNumSettingService.getSchedulingListById(ids);
+        if (CollectionUtil.isEmpty(list)){
+            return ruleNumMapper.deleteRuleNumByIds(ids);
+        }
+        throw new RuntimeException("该班次正在被使用,请在排班设置中解绑该班次!");
     }
     /**
@@ -2,17 +2,23 @@ package com.ruoyi.scheduling.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.domain.RuleNumSetting;
+import com.ruoyi.domain.RuleSettingScheduling;
 import com.ruoyi.pojo.dto.AttendanceDto;
 import com.ruoyi.pojo.dto.RuleSchedulingDto;
 import com.ruoyi.pojo.vo.RuleSchedulingResponseVo;
 import com.ruoyi.pojo.vo.RuleSchedulingVo;
+import com.ruoyi.service.RuleNumSettingService;
+import com.ruoyi.service.RuleSettingSchedulingService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +40,12 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     @Autowired
     private RuleSchedulingMapper ruleSchedulingMapper;
+    @Autowired
+    private RuleSettingSchedulingService ruleSettingSchedulingService;
+
+    @Autowired
+    private RuleNumSettingService ruleNumSettingService;
+
     /**
      * 查询排版规则
      *
@@ -107,7 +119,20 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
      */
     @Override
     public int deleteRuleSchedulingByIds(Long[] ids) {
-        return ruleSchedulingMapper.deleteRuleSchedulingByIds(ids);
+        // TODO 检查是否有做绑定
+        LambdaQueryWrapper<RuleSettingScheduling> qw = new LambdaQueryWrapper<>();
+        qw.in(RuleSettingScheduling::getRuleSchedulingId, Arrays.asList(ids));
+        List<RuleSettingScheduling> list = ruleSettingSchedulingService.list(qw);
+        if (CollectionUtil.isEmpty(list)) {
+            return ruleSchedulingMapper.deleteRuleSchedulingByIds(ids);
+        }
+        String prompt = "";
+        List<Integer> settingIds = list.stream().map(RuleSettingScheduling::getSettingId).distinct().collect(Collectors.toList());
+        List<RuleNumSetting> settingList = ruleNumSettingService.listByIds(settingIds);
+        for (RuleNumSetting setting : settingList) {
+            prompt = prompt + setting.getRuleDictName()+ ",";
+        }
+        throw new RuntimeException("该排班规则已班次名称为" + prompt.replaceFirst(",$", "。") + "等班次绑定，请在排班设置中解绑后删除！");
     }
     /**
@@ -46,4 +46,6 @@ public interface RuleNumSettingService extends IService&lt;RuleNumSetting&gt; {
      * @return
      */
     List<AttendanceDto> getPeopleListByMonth(String month);
+
+    List<SchedulingResponseVo> getSchedulingListById(Long[] ids);
 }
@@ -339,6 +339,11 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         return baseMapper.getPeopleListByMonth(month);
     }
+    @Override
+    public List<SchedulingResponseVo> getSchedulingListById(Long[] ids) {
+        return baseMapper.getSchedulingListById(ids);
+    }
+
     private List<DriverScheduling> handleOtherPostsScheduling() {
         QueryWrapper<RuleAttendanceMain> qw = new QueryWrapper<>();
         qw.lambda()
@@ -112,5 +112,17 @@
                 DATE_FORMAT( scheduling_date, '%Y-%m' ) = #{month}
         )
     </select>
+    <select id="getSchedulingListById" resultType="com.ruoyi.pojo.vo.SchedulingResponseVo">
+        SELECT
+        setting.*,
+        num.rule_dict_name,
+        num.rule_type
+        FROM
+        `rule_num_setting` setting,rule_num num
+        WHERE setting.rule_num_id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>