fix: 修复重新生成导致日志丢失问题

guzijian
1 parent 1e978a3f
Showing 8 changed files with 65 additions and 65 deletions
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/num/service/impl/RuleNumServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/controller/RuleSchedulingController.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/domain/RuleScheduling.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/mapper/RuleSchedulingMapper.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/IRuleSchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/RuleSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
@@ -282,7 +282,7 @@ public class DriverJob implements InitializingBean {
     }
     /**
-     * 生成排班 每天早上在获取调度排版前生成
+     * 生成排班 每天早上在获取调度排班前生成
      */
     public void createAttendance() {
         RULE_NUM_SETTING_SERVICE.createAttendance();
@@ -106,7 +106,7 @@ public class RuleNumServiceImpl implements IRuleNumService
         if (CollectionUtil.isEmpty(list)){
             return ruleNumMapper.deleteRuleNumByIds(ids);
         }
-        throw new RuntimeException("该班次正在被使用,请在排班设置中解绑该班次!");
+        throw new RuntimeException("班次正在被使用,请在排班设置中解绑该班次!");
     }
     /**
@@ -25,7 +25,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 /**
- * 排版规则Controller
+ * 排班规则Controller
  *
  * @author guzijian
  * @date 2023-08-04
@@ -37,7 +37,7 @@ public class RuleSchedulingController extends BaseController {
     private IRuleSchedulingService ruleSchedulingService;
     /**
-     * 查询排版规则列表
+     * 查询排班规则列表
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:list')")
     @GetMapping("/list")
@@ -49,7 +49,7 @@ public class RuleSchedulingController extends BaseController {
     }
     /**
-     * 查询排版规则列表
+     * 查询排班规则列表
      */
     @GetMapping("/list/all")
     public AjaxResult listAll(RuleScheduling ruleScheduling) {
@@ -57,7 +57,7 @@ public class RuleSchedulingController extends BaseController {
     }
     /**
-     * 查询排版规则列表
+     * 查询排班规则列表
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:list')")
     @GetMapping("/list/scheduling/{settingId}")
@@ -67,19 +67,19 @@ public class RuleSchedulingController extends BaseController {
     /**
-     * 导出排版规则列表
+     * 导出排班规则列表
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:export')")
-    @Log(title = "排版规则", businessType = BusinessType.EXPORT)
+    @Log(title = "排班规则", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, RuleScheduling ruleScheduling) {
         List<RuleScheduling> list = ruleSchedulingService.selectRuleSchedulingList(ruleScheduling);
         ExcelUtil<RuleScheduling> util = new ExcelUtil<RuleScheduling>(RuleScheduling.class);
-        util.exportExcel(response, list, "排版规则数据");
+        util.exportExcel(response, list, "排班规则数据");
     }
     /**
-     * 获取排版规则详细信息
+     * 获取排班规则详细信息
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:query')")
     @GetMapping(value = "/{id}")
@@ -88,30 +88,30 @@ public class RuleSchedulingController extends BaseController {
     }
     /**
-     * 新增排版规则
+     * 新增排班规则
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:add')")
-    @Log(title = "排版规则", businessType = BusinessType.INSERT)
+    @Log(title = "排班规则", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody RuleScheduling ruleScheduling) {
         return toAjax(ruleSchedulingService.insertRuleScheduling(ruleScheduling));
     }
     /**
-     * 修改排版规则
+     * 修改排班规则
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:edit')")
-    @Log(title = "排版规则", businessType = BusinessType.UPDATE)
+    @Log(title = "排班规则", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody RuleScheduling ruleScheduling) {
         return toAjax(ruleSchedulingService.updateRuleScheduling(ruleScheduling));
     }
     /**
-     * 删除排版规则
+     * 删除排班规则
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:remove')")
-    @Log(title = "排版规则", businessType = BusinessType.DELETE)
+    @Log(title = "排班规则", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(ruleSchedulingService.deleteRuleSchedulingByIds(ids));
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 /**
- * 排版规则对象 rule_scheduling
+ * 排班规则对象 rule_scheduling
  * 
  * @author guzijian
  * @date 2023-08-07
@@ -8,54 +8,54 @@ import com.ruoyi.scheduling.domain.RuleScheduling;
 import org.apache.ibatis.annotations.Param;
 /**
- * 排版规则Mapper接口
+ * 排班规则Mapper接口
  *
  * @author guzijian
  * @date 2023-08-04
  */
 public interface RuleSchedulingMapper {
     /**
-     * 查询排版规则
+     * 查询排班规则
      *
-     * @param id 排版规则主键
-     * @return 排版规则
+     * @param id 排班规则主键
+     * @return 排班规则
      */
     public RuleScheduling selectRuleSchedulingById(Long id);
     /**
-     * 查询排版规则列表
+     * 查询排班规则列表
      *
-     * @param ruleScheduling 排版规则
-     * @return 排版规则集合
+     * @param ruleScheduling 排班规则
+     * @return 排班规则集合
      */
     public List<RuleScheduling> selectRuleSchedulingList(RuleScheduling ruleScheduling);
     /**
-     * 新增排版规则
+     * 新增排班规则
      *
-     * @param ruleScheduling 排版规则
+     * @param ruleScheduling 排班规则
      * @return 结果
      */
     public int insertRuleScheduling(RuleScheduling ruleScheduling);
     /**
-     * 修改排版规则
+     * 修改排班规则
      *
-     * @param ruleScheduling 排版规则
+     * @param ruleScheduling 排班规则
      * @return 结果
      */
     public int updateRuleScheduling(RuleScheduling ruleScheduling);
     /**
-     * 删除排版规则
+     * 删除排班规则
      *
-     * @param id 排版规则主键
+     * @param id 排班规则主键
      * @return 结果
      */
     public int deleteRuleSchedulingById(Long id);
     /**
-     * 批量删除排版规则
+     * 批量删除排班规则
      *
      * @param ids 需要删除的数据主键集合
      * @return 结果
@@ -9,56 +9,56 @@ import com.ruoyi.pojo.vo.RuleSchedulingVo;
 import com.ruoyi.scheduling.domain.RuleScheduling;
 /**
- * 排版规则Service接口
+ * 排班规则Service接口
  *
  * @author guzijian
  * @date 2023-08-04
  */
 public interface IRuleSchedulingService {
     /**
-     * 查询排版规则
+     * 查询排班规则
      *
-     * @param id 排版规则主键
-     * @return 排版规则
+     * @param id 排班规则主键
+     * @return 排班规则
      */
     public RuleScheduling selectRuleSchedulingById(Long id);
     /**
-     * 查询排版规则列表
+     * 查询排班规则列表
      *
-     * @param ruleScheduling 排版规则
-     * @return 排版规则集合
+     * @param ruleScheduling 排班规则
+     * @return 排班规则集合
      */
     public List<RuleScheduling> selectRuleSchedulingList(RuleScheduling ruleScheduling);
     /**
-     * 新增排版规则
+     * 新增排班规则
      *
-     * @param ruleScheduling 排版规则
+     * @param ruleScheduling 排班规则
      * @return 结果
      */
     public int insertRuleScheduling(RuleScheduling ruleScheduling);
     /**
-     * 修改排版规则
+     * 修改排班规则
      *
-     * @param ruleScheduling 排版规则
+     * @param ruleScheduling 排班规则
      * @return 结果
      */
     public int updateRuleScheduling(RuleScheduling ruleScheduling);
     /**
-     * 批量删除排版规则
+     * 批量删除排班规则
      *
-     * @param ids 需要删除的排版规则主键集合
+     * @param ids 需要删除的排班规则主键集合
      * @return 结果
      */
     public int deleteRuleSchedulingByIds(Long[] ids);
     /**
-     * 删除排版规则信息
+     * 删除排班规则信息
      *
-     * @param id 排版规则主键
+     * @param id 排班规则主键
      * @return 结果
      */
     public int deleteRuleSchedulingById(Long id);
@@ -30,7 +30,7 @@ import static com.ruoyi.common.RuleSchedulingProperties.*;
 import static com.ruoyi.common.WeekEnum.FREE;
 /**
- * 排版规则Service业务层处理
+ * 排班规则Service业务层处理
  *
  * @author guzijian
  * @date 2023-08-04
@@ -47,10 +47,10 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     private RuleNumSettingService ruleNumSettingService;
     /**
-     * 查询排版规则
+     * 查询排班规则
      *
-     * @param id 排版规则主键
-     * @return 排版规则
+     * @param id 排班规则主键
+     * @return 排班规则
      */
     @Override
     public RuleScheduling selectRuleSchedulingById(Long id) {
@@ -58,10 +58,10 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     }
     /**
-     * 查询排版规则列表
+     * 查询排班规则列表
      *
-     * @param ruleScheduling 排版规则
-     * @return 排版规则
+     * @param ruleScheduling 排班规则
+     * @return 排班规则
      */
     @Override
     public List<RuleScheduling> selectRuleSchedulingList(RuleScheduling ruleScheduling) {
@@ -69,9 +69,9 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     }
     /**
-     * 新增排版规则
+     * 新增排班规则
      *
-     * @param ruleScheduling 排版规则
+     * @param ruleScheduling 排班规则
      * @return 结果
      */
     @Override
@@ -98,9 +98,9 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     }
     /**
-     * 修改排版规则
+     * 修改排班规则
      *
-     * @param ruleScheduling 排版规则
+     * @param ruleScheduling 排班规则
      * @return 结果
      */
     @Override
@@ -112,9 +112,9 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     }
     /**
-     * 批量删除排版规则
+     * 批量删除排班规则
      *
-     * @param ids 需要删除的排版规则主键
+     * @param ids 需要删除的排班规则主键
      * @return 结果
      */
     @Override
@@ -130,15 +130,15 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
         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()+ ",";
+            prompt = prompt + setting.getRuleDictName()+ "、";
         }
-        throw new RuntimeException("该排班规则已班次名称为" + prompt.replaceFirst(",$", "。") + "等班次绑定，请在排班设置中解绑后删除！");
+        throw new RuntimeException("排班规则已班次名称为:" + prompt.replaceFirst("、$", "") + "等班次绑定，请在排班设置中解绑后删除！");
     }
     /**
-     * 删除排版规则信息
+     * 删除排班规则信息
      *
-     * @param id 排版规则主键
+     * @param id 排班规则主键
      * @return 结果
      */
     @Override
@@ -304,7 +304,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void againCreateAttendance(AgainCreateRequestVo vo) {
-        // 删除排班
+        // 删除排班和生成日志
         deleteScheduleByRule(vo);
         //生成排班
         createAttendanceByStartDate(vo);
@@ -324,7 +324,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         String nowMonth = strDate.substring(0, strDate.lastIndexOf("-"));
         int compare = month.compareTo(nowMonth);
         // 删除生成日志
-        attendanceMainHelpService.deleteNowMathCreateLog(nowMonth, vo.getJobCode());
+        attendanceMainHelpService.deleteNowMathCreateLog(vo.getMonth(), vo.getJobCode());
         if (compare > 0) {
             LocalDate endDay;
             endDay = getEndDay(vo.getMonth());