fix: 补充重新生成日志，修复重新生成时界面生成生成人员当月多条记录情况

guzijian
1 parent 29221cef
Showing 6 changed files with 31 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/AttendanceController.java
Bsth-admin/src/main/java/com/ruoyi/mapper/RuleAttendanceMainHelpMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/RuleAttendanceMainHelpService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleAttendanceMainHelpServiceImpl.java
Bsth-admin/src/main/resources/mapper/RuleAttendanceMainHelpMapper.xml
@@ -153,6 +153,7 @@ public class AttendanceController extends BaseController {
  
     @ApiOperation("生成指定月份的排班")
     @PostMapping("/create/attendance/{month}")
+    @Log(title = "生成当月", businessType = BusinessType.INSERT)
     public Result<?> createAttendance(@PathVariable("month") String month){
         attendanceService.createAttendance(month);
         return Result.OK();
@@ -160,6 +161,7 @@ public class AttendanceController extends BaseController {
  
     @ApiOperation("生成指定月份的指定人员的排班")
     @PostMapping("/again/create/attendance")
+    @Log(title = "重新生成", businessType = BusinessType.INSERT)
     public Result<?> againCreateAttendance(@RequestBody @Validated AgainCreateRequestVo vo){
         attendanceService.againCreateAttendance(vo);
         return Result.OK();
@@ -30,6 +30,8 @@ public interface RuleAttendanceMainHelpMapper extends BaseMapper&lt;RuleAttendanceM
     void insertHelpList(@Param("list") List<RuleAttendanceMainHelp> helpList);
  
     List<RuleAttendanceMainHelp> queryNowMonthPeopleByJobCodes(@Param("list") List<AttendanceDto> peopleList, @Param("month") String month);
+
+    void deleteNowMathCreateLog(@Param("nowMonth") String nowMonth,@Param("list") List<String> jobCode);
 }
  
  
@@ -26,4 +26,5 @@ public interface RuleAttendanceMainHelpService extends IService&lt;RuleAttendanceMa
  
     List<RuleAttendanceMainHelp> queryNowMonthPeopleByJobCodes(List<AttendanceDto> peopleList, String month);
  
+    void deleteNowMathCreateLog(String nowMonth, List<String> jobCode);
 }
@@ -68,6 +68,9 @@ public class AttendanceServiceImpl implements AttendanceService {
     private RuleAttendanceMainService attendanceMainService;
  
     @Autowired
+    private RuleAttendanceMainHelpService attendanceMainHelpService;
+
+    @Autowired
     private IRuleSchedulingService schedulingService;
  
     @Autowired
@@ -319,6 +322,8 @@ public class AttendanceServiceImpl implements AttendanceService {
         String month = vo.getMonth();
         String nowMonth = strDate.substring(0, strDate.lastIndexOf("-"));
         int compare = month.compareTo(nowMonth);
+        // 删除生成日志
+        attendanceMainHelpService.deleteNowMathCreateLog(nowMonth,vo.getJobCode());
         if (compare > 0) {
             LocalDate endDay;
             endDay = getEndDay(vo.getMonth());
 package com.ruoyi.service.impl;
+
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
@@ -12,13 +13,13 @@ import java.util.Collection;
 import java.util.List;
  
 /**
-* @author 20412
-* @description 针对表【rule_attendance_main_help(考勤表)】的数据库操作Service实现
-* @createDate 2023-09-05 15:39:18
-*/
+ * @author 20412
+ * @description 针对表【rule_attendance_main_help(考勤表)】的数据库操作Service实现
+ * @createDate 2023-09-05 15:39:18
+ */
 @Service
 public class RuleAttendanceMainHelpServiceImpl extends ServiceImpl<RuleAttendanceMainHelpMapper, RuleAttendanceMainHelp>
-    implements RuleAttendanceMainHelpService {
+        implements RuleAttendanceMainHelpService {
  
     @Override
     public List<RuleAttendanceMainHelp> queryNowMonthPeople(PeopleRequestVo vo) {
@@ -27,7 +28,7 @@ public class RuleAttendanceMainHelpServiceImpl extends ServiceImpl&lt;RuleAttendanc
  
     @Override
     public void insertHelpList(List<RuleAttendanceMainHelp> helpList) {
-        if (CollectionUtil.isEmpty(helpList)){
+        if (CollectionUtil.isEmpty(helpList)) {
             return;
         }
         baseMapper.insertHelpList(helpList);
@@ -35,7 +36,12 @@ public class RuleAttendanceMainHelpServiceImpl extends ServiceImpl&lt;RuleAttendanc
  
     @Override
     public List<RuleAttendanceMainHelp> queryNowMonthPeopleByJobCodes(List<AttendanceDto> peopleList, String month) {
-        return baseMapper.queryNowMonthPeopleByJobCodes(peopleList,month);
+        return baseMapper.queryNowMonthPeopleByJobCodes(peopleList, month);
+    }
+
+    @Override
+    public void deleteNowMathCreateLog(String nowMonth, List<String> jobCode) {
+        baseMapper.deleteNowMathCreateLog(nowMonth, jobCode);
     }
 }
  
@@ -34,6 +34,14 @@
         on duplicate key update
         job_code = values(job_code)
     </insert>
+    <delete id="deleteNowMathCreateLog">
+        delete from rule_attendance_main_help
+        where DATE_FORMAT(date_flag, '%Y-%m') = #{nowMonth}
+        and job_code in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
     <select id="queryNowMonthPeople" resultMap="BaseResultMap" resultType="com.ruoyi.domain.RuleAttendanceMainHelp">
         SELECT * from rule_attendance_main_help WHERE DATE_FORMAT( date_flag, '%Y-%m' ) = #{date}
         <if test="jobCode != null and jobCode != ''">