fix: 优化重新生成排班，生成时间记录优化

guzijian
1 parent 1e56cac3
Showing 5 changed files with 61 additions and 16 deletions
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
@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
+import com.ruoyi.pojo.dto.AttendanceDto;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
 import org.apache.ibatis.annotations.Param;
@@ -27,6 +28,8 @@ public interface RuleAttendanceMainHelpMapper extends BaseMapper&lt;RuleAttendanceM
      * @param helpList
      */
     void insertHelpList(@Param("list") List<RuleAttendanceMainHelp> helpList);
+
+    List<RuleAttendanceMainHelp> queryNowMonthPeopleByJobCodes(@Param("list") List<AttendanceDto> peopleList, @Param("month") String month);
 }
@@ -2,6 +2,7 @@ package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
+import com.ruoyi.pojo.dto.AttendanceDto;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
 import com.ruoyi.pojo.vo.TableMonthRequestVo;
@@ -22,4 +23,7 @@ public interface RuleAttendanceMainHelpService extends IService&lt;RuleAttendanceMa
     List<RuleAttendanceMainHelp> queryNowMonthPeople(PeopleRequestVo vo);
     void insertHelpList(List<RuleAttendanceMainHelp> helpList);
+
+    List<RuleAttendanceMainHelp> queryNowMonthPeopleByJobCodes(List<AttendanceDto> peopleList, String month);
+
 }
@@ -316,7 +316,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     private void deleteScheduleByRule(AgainCreateRequestVo vo) {
         String strDate = LocalDate.now().toString();
-        String month = vo.getMonth().substring(0, vo.getMonth().lastIndexOf("-"));
+        String month = vo.getMonth();
         String nowMonth = strDate.substring(0, strDate.lastIndexOf("-"));
         int compare = month.compareTo(nowMonth);
         if (compare > 0) {
@@ -371,6 +371,7 @@ public class AttendanceServiceImpl implements AttendanceService {
             }
             ruleAttendanceMainList.addAll(mainList);
         }
+        // 记录日志
         backCreatePeopleListLog(peopleList, ruleNumMap, dateList);
         return ruleAttendanceMainList;
     }
@@ -520,7 +521,14 @@ public class AttendanceServiceImpl implements AttendanceService {
     }
     public void backCreatePeopleListLog(List<AttendanceDto> peopleList, Map<Integer, RuleNumDto> ruleNumDtoList, List<LocalDate> dateList) {
-        List<RuleAttendanceMainHelp> helpList = new ArrayList<>(peopleList.size());
+        if (CollectionUtil.isEmpty(dateList)){
+            return;
+        }
+        String month = dateList.get(0).getYear() + "-" + dateList.get(0).getMonthValue();
+        List<RuleAttendanceMainHelp> monthPeople = helpService.queryNowMonthPeopleByJobCodes(peopleList,month);
+        Map<String,Object> map = transFormMonthPeople(monthPeople);
+        peopleList = peopleList.stream().filter(item->Objects.isNull(map.get(item.getJobCode()))).collect(Collectors.toList());
+        List<RuleAttendanceMainHelp> helpList = new ArrayList<>(monthPeople.size());
         LocalDate localDate = dateList.get(0);
         Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
         for (AttendanceDto dto : peopleList) {
@@ -533,6 +541,14 @@ public class AttendanceServiceImpl implements AttendanceService {
         helpService.insertHelpList(helpList);
     }
+    private Map<String, Object> transFormMonthPeople(List<RuleAttendanceMainHelp> monthPeople) {
+        Map<String, Object> map = new HashMap<>(monthPeople.size());
+        for (RuleAttendanceMainHelp help : monthPeople) {
+            map.put(help.getJobCode(),help);
+        }
+        return map;
+    }
+
     private List<PeopleResponseVo> mainTransformPeopleResponseVo(List<RuleAttendanceMain> mainList) {
         List<PeopleResponseVo> vos = new ArrayList<>(mainList.size());
         for (RuleAttendanceMain main : mainList) {
 package com.ruoyi.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
 import com.ruoyi.mapper.RuleAttendanceMainHelpMapper;
+import com.ruoyi.pojo.dto.AttendanceDto;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
 import com.ruoyi.service.RuleAttendanceMainHelpService;
 import org.springframework.stereotype.Service;
+import java.util.Collection;
 import java.util.List;
 /**
@@ -24,8 +27,16 @@ public class RuleAttendanceMainHelpServiceImpl extends ServiceImpl&lt;RuleAttendanc
     @Override
     public void insertHelpList(List<RuleAttendanceMainHelp> helpList) {
+        if (CollectionUtil.isEmpty(helpList)){
+            return;
+        }
         baseMapper.insertHelpList(helpList);
     }
+
+    @Override
+    public List<RuleAttendanceMainHelp> queryNowMonthPeopleByJobCodes(List<AttendanceDto> peopleList, String month) {
+        return baseMapper.queryNowMonthPeopleByJobCodes(peopleList,month);
+    }
 }
@@ -5,29 +5,30 @@
 <mapper namespace="com.ruoyi.mapper.RuleAttendanceMainHelpMapper">
     <resultMap id="BaseResultMap" type="com.ruoyi.domain.RuleAttendanceMainHelp">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="jobCode" column="job_code" jdbcType="VARCHAR"/>
-            <result property="posts" column="posts" jdbcType="VARCHAR"/>
-            <result property="dateFlag" column="dateFlag" jdbcType="DATE"/>
-            <result property="fleetName" column="fleet_name" jdbcType="VARCHAR"/>
-            <result property="ruleDictName" column="rule_dict_name" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="INTEGER"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="jobCode" column="job_code" jdbcType="VARCHAR"/>
+        <result property="posts" column="posts" jdbcType="VARCHAR"/>
+        <result property="dateFlag" column="dateFlag" jdbcType="DATE"/>
+        <result property="fleetName" column="fleet_name" jdbcType="VARCHAR"/>
+        <result property="ruleDictName" column="rule_dict_name" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id,`name`,job_code,
+        id
+        ,`name`,job_code,
         posts,date_flag,fleet_name
     </sql>
     <insert id="insertHelpList" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into rule_attendance_main_help (`name`,job_code,posts,date_flag,fleet_name,rule_dict_name) values
         <foreach collection="list" separator="," item="item" index="index">
             (
-             #{item.name},
-             #{item.jobCode},
-             #{item.posts},
-             #{item.dateFlag},
-             #{item.fleetName},
-             #{item.ruleDictName}
+            #{item.name},
+            #{item.jobCode},
+            #{item.posts},
+            #{item.dateFlag},
+            #{item.fleetName},
+            #{item.ruleDictName}
             )
         </foreach>
         on duplicate key update
@@ -45,4 +46,14 @@
             and name = #{name}
         </if>
     </select>
+    <select id="queryNowMonthPeopleByJobCodes" resultMap="BaseResultMap"
+            resultType="com.ruoyi.domain.RuleAttendanceMainHelp">
+        SELECT * from rule_attendance_main_help WHERE DATE_FORMAT( date_flag, '%Y-%m' ) = #{month}
+        <if test="list != null and list.size() > 0">
+            and job_code in
+            <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+                #{item.jobCode}
+            </foreach>
+        </if>
+    </select>
 </mapper>