feat: 修复修改排班日期规则工作日期bug

guzijian
1 parent 6443d13d
Showing 7 changed files with 90 additions and 49 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/mapper/RuleAttendanceMainMapper.java
ruoyi-admin/src/main/java/com/ruoyi/service/RuleAttendanceMainService.java
ruoyi-admin/src/main/java/com/ruoyi/service/SchedulingService.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/RuleAttendanceMainServiceImpl.java
ruoyi-admin/src/main/resources/mapper/RuleAttendanceMainMapper.xml
@@ -159,7 +159,7 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
         GlobalIndex globalIndex = new GlobalIndex();
-        long now = System.currentTimeMillis();
+        long now = signIn.getCreateTime().getTime();
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
         // 签到检查
         if (checkSignIn(now, dto, globalIndex, signIn, driver)) {
@@ -182,6 +182,10 @@ public class SignInServiceImpl implements ISignInService {
         threadJobService.asyncInsertExceptionRecord(signIn, driver, dto, globalIndex);
         // 驾驶人员二次签到酒精测试异常
+        return handleAjaxResult(signIn, driver, vo);
+    }
+
+    private AjaxResult handleAjaxResult(SignIn signIn, Driver driver, SignInResponseVo vo) {
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
@@ -10,33 +10,35 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 /**
-* @author 20412
-* @description 针对表【rule_attendance_main(考勤表)】的数据库操作Mapper
-* @createDate 2023-09-03 12:15:39
-* @Entity .domain.RuleAttendanceMain
-*/
+ * @author 20412
+ * @description 针对表【rule_attendance_main(考勤表)】的数据库操作Mapper
+ * @createDate 2023-09-03 12:15:39
+ * @Entity .domain.RuleAttendanceMain
+ */
 public interface RuleAttendanceMainMapper extends BaseMapper<RuleAttendanceMain> {
     /**
      * 批量更新
      *
      * @param vo
-     * @param main
+     * @param mainList
      */
-    void updateByIdTotalQuantity(@Param("vo") UpdateAttendanceVo vo,@Param("main") RuleAttendanceMain main);
+    void updateByIdTotalQuantity(@Param("vo") UpdateAttendanceVo vo, @Param("mainList") List<RuleAttendanceMain> mainList);
     /**
      * 批量删除
+     *
      * @param vo
      */
     void deleteByJobCodeTotalRecord(DeleteAttendanceVo vo);
     /**
      * 获取当月的日期数据
+     *
      * @param vo
      * @param jobCodes
      * @return
      */
-    List<RuleAttendanceMain> queryNowMonthDate(@Param("vo") PeopleRequestVo vo, @Param("jobCodes")List<String> jobCodes);
+    List<RuleAttendanceMain> queryNowMonthDate(@Param("vo") PeopleRequestVo vo, @Param("jobCodes") List<String> jobCodes);
 }
@@ -5,11 +5,9 @@ import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
 import com.ruoyi.pojo.vo.DeleteAttendanceVo;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
-import com.ruoyi.pojo.vo.PeopleResponseVo;
 import com.ruoyi.pojo.vo.UpdateAttendanceVo;
 import org.apache.ibatis.annotations.Param;
-import java.time.LocalDate;
 import java.util.List;
 /**
@@ -24,7 +22,7 @@ public interface RuleAttendanceMainService extends IService&lt;RuleAttendanceMain&gt; 
      * @param vo
      * @param main
      */
-    void updateByJobCodeTotalQuantity(@Param("vo") UpdateAttendanceVo vo, @Param("main") RuleAttendanceMain main);
+    void updateByJobCodeTotalQuantity(@Param("vo") UpdateAttendanceVo vo, @Param("main") List<RuleAttendanceMain> main);
     /**
      * 删除排班
@@ -118,16 +118,17 @@ public class SchedulingService {
             return;
         }
+        String remark = getRemark(dto, signIn, globalIndex.getIndex());
         // 更新最新的签到记录判断是否需要更新考勤
         // 记录为空直接插入记录
         if (Objects.isNull(dto.get(globalIndex.getIndex()).getSignInId()) || dto.size() == 1) {
-            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
             // 更新缓存
             nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
         }
         // 之前的无效
         else if (!dto.get(globalIndex.getIndex()).getExType().equals(SIGN_NO_EX_NUM)) {
-            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
             nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
         }
         // 之前的有效
@@ -137,17 +138,31 @@ public class SchedulingService {
     }
+    private String getRemark(List<DriverScheduling> dto, SignIn signIn, Integer globalIndex) {
+        DriverScheduling scheduling = dto.get(globalIndex);
+        long date = scheduling.getBcType().equals(BC_TYPE_IN) ? scheduling.getZdsjT() : scheduling.getFcsjT();
+        long nowBetween = ChronoUnit.MINUTES.between(ConstDateUtil.getLocalDateTimeByLongTime(date), ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime()));
+        if (!(Math.abs(nowBetween) <= 60)) {
+            if (nowBetween < -60L) {
+                return "早签";
+            } else {
+                return "迟到";
+            }
+        }
+        return signIn.getRemark();
+    }
+
     private void handlerRecord(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex) {
         if (globalIndex.getIndex() == dto.size() - 1) {
             return;
         }
-        long timer = 1000 * 60 * 5;
-        // 有效的在一分钟内重复签到不做修改
+        long timer = 1000 * 60 * 60;
+        // 有效的在一小时内内重复签到不做修改
         if (signIn.getExType().equals(SIGN_NO_EX_NUM) && (DateUtils.getNowDate().getTime() - dto.get(globalIndex.getIndex()).getSignTime().getTime()) <= timer) {
-            signIn.setRemark("您已经打卡过了，您已完成" + (globalIndex.getIndex() + 1) + "次打卡，请勿在5分钟内重复打卡");
+            signIn.setRemark("您已经打卡过了，请勿在一小时内重复打卡");
             return;
         }
-        Integer index = globalIndex.getIndex() + 1;
+        int index = globalIndex.getIndex() + 1;
         // 之前是签到 |  目前有效记录 -》进行修改  变成无效
         if (signIn.getExType().equals(SIGN_NO_EX_NUM)) {
             signIn.setStatus(SIGN_IN_FAIL);
@@ -160,7 +175,9 @@ public class SchedulingService {
         signIn.setRemark((scheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
         signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
         // 之前是签到 |  目前无效 -》往后更新
-        schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+
+        String remark = getRemark(dto, signIn, index);
+        schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
         nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn);
     }
@@ -175,26 +175,45 @@ public class AttendanceServiceImpl implements AttendanceService {
         RuleAttendanceMain main = new RuleAttendanceMain();
         RuleScheduling ruleScheduling = ruleSchedulingService.selectRuleSchedulingById(vo.getRuleId().longValue());
         BeanUtils.copyProperties(ruleScheduling, main);
-        main.setFirstWorkSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstWorkSignInTime())));
+        List<RuleAttendanceMain> mainList = handleRuleUpdate(vo, main, ruleScheduling);
+        attendanceMainService.updateByJobCodeTotalQuantity(vo, mainList);
+    }
+
+    private static  List<RuleAttendanceMain> handleRuleUpdate(UpdateAttendanceVo vo, RuleAttendanceMain main, RuleScheduling ruleScheduling) {
+        List<RuleAttendanceMain> mainList = new ArrayList<>();
+        LocalDate startDate = LocalDate.parse(vo.getStartDate());
+        LocalDate endDate = LocalDate.parse(vo.getEndDate());
+        while (startDate.compareTo(endDate) <= 0) {
+            handleSegmentation(main, ruleScheduling, mainList, startDate);
+            startDate = startDate.plusDays(1);
+        }
+        return mainList;
+    }
+
+    private static void handleSegmentation(RuleAttendanceMain main, RuleScheduling ruleScheduling, List<RuleAttendanceMain> mainList, LocalDate startDate) {
+        RuleAttendanceMain nowMain = new RuleAttendanceMain();
+        BeanUtils.copyProperties(main,nowMain);
+        nowMain.setFirstWorkSignInTime(ConstDateUtil.dateAddition(startDate.toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getFirstWorkSignInTime())));
         if (HAVE_SEGMENTATION.equals(ruleScheduling.getSecondFlag())) {
-            main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
-            main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
+            nowMain.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(startDate.toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getFirstQuittingSignInTime())));
+            nowMain.setSecondWorkSignInTime(ConstDateUtil.dateAddition(startDate.toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getSecondWorkSignInTime())));
             // 处理隔天
             if (TOMORROW_YES.equals(ruleScheduling.getFirstSignInDayTomorrow())) {
-                main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
+                nowMain.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(startDate.plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getSecondQuittingSignInTime())));
             } else {
-                main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
+                nowMain.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(startDate.toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getSecondQuittingSignInTime())));
             }
         } else {
             // 处理隔天
             if (TOMORROW_YES.equals(ruleScheduling.getFirstSignInDayTomorrow())) {
-                main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
+                nowMain.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(startDate.plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getFirstQuittingSignInTime())));
             } else {
-                main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
+                nowMain.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(startDate.toString(), ConstDateUtil.formatDate("HH:mm:ss", nowMain.getFirstQuittingSignInTime())));
             }
         }
-        main.setWorkFlag(ruleScheduling.getId() == 0 ? FREE_FLAG : WORK_FLAG);
-        attendanceMainService.updateByJobCodeTotalQuantity(vo, main);
+        nowMain.setWorkFlag(ruleScheduling.getId() == 0 ? FREE_FLAG : WORK_FLAG);
+        nowMain.setSchedulingDate(Date.from(startDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+        mainList.add(nowMain);
     }
     @Override
@@ -6,7 +6,6 @@ import com.ruoyi.domain.RuleAttendanceMainHelp;
 import com.ruoyi.mapper.RuleAttendanceMainMapper;
 import com.ruoyi.pojo.vo.DeleteAttendanceVo;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
-import com.ruoyi.pojo.vo.PeopleResponseVo;
 import com.ruoyi.pojo.vo.UpdateAttendanceVo;
 import com.ruoyi.service.RuleAttendanceMainHelpService;
 import com.ruoyi.service.RuleAttendanceMainService;
@@ -28,8 +27,8 @@ public class RuleAttendanceMainServiceImpl extends ServiceImpl&lt;RuleAttendanceMai
     private RuleAttendanceMainHelpService helpService;
     @Override
-    public void updateByJobCodeTotalQuantity(UpdateAttendanceVo vo, RuleAttendanceMain main) {
-        baseMapper.updateByIdTotalQuantity(vo, main);
+    public void updateByJobCodeTotalQuantity(UpdateAttendanceVo vo, List<RuleAttendanceMain> mainList) {
+        baseMapper.updateByIdTotalQuantity(vo, mainList);
     }
     @Override
@@ -33,25 +33,27 @@
         second_quitting_sign_in_time,second_sign_in_quitting_range,scheduling_date,work_flag
     </sql>
     <update id="updateByIdTotalQuantity">
-        update rule_attendance_main set
-                                working_hour_plan = #{main.workingHourPlan},
-                                working_hour_type = #{main.workingHourType},
-                                first_work_sign_in_time = #{main.firstWorkSignInTime},
-                                first_sign_in_working_range = #{main.firstSignInWorkingRange},
-                                first_quitting_sign_in_time = #{main.firstQuittingSignInTime},
-                                first_sign_in_quitting_range = #{main.firstSignInQuittingRange},
-                                sign_in_time_out_range = #{main.signInTimeOutRange},
-                                second_work_sign_in_time = #{main.secondWorkSignInTime},
-                                second_sign_in_working_range = #{main.secondSignInWorkingRange},
-                                second_quitting_sign_in_time = #{main.secondQuittingSignInTime},
-                                second_sign_in_quitting_range = #{main.secondSignInQuittingRange},
-                                work_flag = #{main.workFlag}
+        <foreach collection="mainList" item="main" index="index" separator=";">
+            update rule_attendance_main set
+            working_hour_plan = #{main.workingHourPlan},
+            working_hour_type = #{main.workingHourType},
+            first_work_sign_in_time = #{main.firstWorkSignInTime},
+            first_sign_in_working_range = #{main.firstSignInWorkingRange},
+            first_quitting_sign_in_time = #{main.firstQuittingSignInTime},
+            first_sign_in_quitting_range = #{main.firstSignInQuittingRange},
+            sign_in_time_out_range = #{main.signInTimeOutRange},
+            second_work_sign_in_time = #{main.secondWorkSignInTime},
+            second_sign_in_working_range = #{main.secondSignInWorkingRange},
+            second_quitting_sign_in_time = #{main.secondQuittingSignInTime},
+            second_sign_in_quitting_range = #{main.secondSignInQuittingRange},
+            work_flag = #{main.workFlag}
             where
-                job_code IN
-                <foreach collection="vo.jobCode" index="index" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-                and scheduling_date &gt;= #{vo.startDate} and scheduling_date &lt;= #{vo.endDate}
+            job_code IN
+            <foreach collection="vo.jobCode" index="index" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            and scheduling_date = #{main.schedulingDate}
+        </foreach>
     </update>
     <delete id="deleteByJobCodeTotalRecord">
         delete from rule_attendance_main