fix: 抽离公共方法

guzijian
1 parent 127936a8
Showing 3 changed files with 39 additions and 16 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/ToolUtils.java
@@ -21,6 +21,7 @@ import com.ruoyi.scheduling.service.IRuleSchedulingService;
 import com.ruoyi.scheduling.service.impl.RuleSchedulingServiceImpl;
 import com.ruoyi.service.*;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.ToolUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -180,7 +181,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     public void updateAttendance(UpdateAttendanceVo vo) {
         RuleAttendanceMain main = new RuleAttendanceMain();
         RuleScheduling ruleScheduling = ruleSchedulingService.selectRuleSchedulingById(vo.getRuleId().longValue());
-        BeanUtils.copyProperties(ruleScheduling, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
+        ToolUtils.copyRule(ruleScheduling, main);
         List<RuleAttendanceMain> mainList = handleRuleUpdate(vo, main, ruleScheduling);
         attendanceMainService.updateByJobCodeTotalQuantity(vo, mainList);
     }
@@ -323,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(nowMonth, vo.getJobCode());
         if (compare > 0) {
             LocalDate endDay;
             endDay = getEndDay(vo.getMonth());
@@ -350,7 +351,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     public List<RuleAttendanceMain> handleAttendanceMain(List<AttendanceDto> peopleList, List<RuleSchedulingDto> ruleList, List<RuleNumDto> ruleNumDtoList, List<LocalDate> dateList) {
-        if (CollectionUtil.isEmpty(peopleList) || CollectionUtil.isEmpty(ruleList) || CollectionUtil.isEmpty(ruleNumDtoList) ) {
+        if (CollectionUtil.isEmpty(peopleList) || CollectionUtil.isEmpty(ruleList) || CollectionUtil.isEmpty(ruleNumDtoList)) {
             return null;
         }
         Map<Integer, List<AttendanceDto>> peopleMap = transformMapByPeople(peopleList);
@@ -391,7 +392,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         // 匹配当天应设置的规则
         RuleSchedulingDto dto = getNowRuleByFixed(nowDate, startDate, ruleSchedulingDtoList);
         main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
-        BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
+        ToolUtils.copyRule(dto, main);
         main.setName(attendanceDto.getName());
         main.setJobCode(attendanceDto.getJobCode());
         // 处理是否分段
@@ -447,7 +448,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         RuleSchedulingDto dto = null;
         dto = getRuleByWeek(main, ruleSchedulingDtoList, date, attendanceDto.getStartDate());
         main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
-        BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
+        ToolUtils.copyRule(dto, main);
         main.setName(attendanceDto.getName());
         main.setJobCode(attendanceDto.getJobCode());
         handleSegmentationByDate(date, main, dto);
@@ -526,13 +527,13 @@ public class AttendanceServiceImpl implements AttendanceService {
     }
     public void backCreatePeopleListLog(List<AttendanceDto> peopleList, Map<Integer, RuleNumDto> ruleNumDtoList, List<LocalDate> dateList) {
-        if (CollectionUtil.isEmpty(dateList)){
+        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> 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());
@@ -549,7 +550,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     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);
+            map.put(help.getJobCode(), help);
         }
         return map;
     }
@@ -580,8 +581,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     private void handleOtherMain(RuleScheduling ruleScheduling, RuleAttendanceMain otherMain, String date) {
         RuleSchedulingDto dto = new RuleSchedulingDto();
         BeanUtils.copyProperties(ruleScheduling, dto);
-
-        BeanUtils.copyProperties(dto, otherMain,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
+        ToolUtils.copyRule(dto, otherMain);
         RuleNumSettingServiceImpl.handleSegmentationByDate(LocalDate.parse(date), otherMain, dto);
         otherMain.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
     }
@@ -21,6 +21,7 @@ import com.ruoyi.service.RuleAttendanceMainHelpService;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.ToolUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -152,7 +153,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         RuleSchedulingDto dto = null;
         dto = getRuleByWeek(main, ruleSchedulingDtoList, date, attendanceDto.getStartDate());
         main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
-        BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
+        ToolUtils.copyRule(dto, main);
         main.setName(attendanceDto.getName());
         main.setJobCode(attendanceDto.getJobCode());
         handleSegmentationByDate(date, main, dto);
@@ -224,7 +225,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         // 匹配当天应设置的规则
         RuleSchedulingDto dto = getNowRuleByFixed(nowDate, startDate, ruleSchedulingDtoList);
         main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
-        BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
+        ToolUtils.copyRule(dto, main);
         main.setName(attendanceDto.getName());
         main.setJobCode(attendanceDto.getJobCode());
         // 处理是否分段
 package com.ruoyi.utils;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.RuleAttendanceMain;
+import com.ruoyi.pojo.dto.RuleSchedulingDto;
+import com.ruoyi.scheduling.domain.RuleScheduling;
+import org.springframework.beans.BeanUtils;
+
+import static com.ruoyi.common.RuleSchedulingProperties.TOMORROW_NO;
 public class ToolUtils {
-    public static String getUUID(){
-        return UUID.randomUUID().toString().replaceAll("-","");
+    public static String getUUID() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
+    public static void copyRule(RuleScheduling dto, RuleAttendanceMain main) {
+        if (dto.getSecondFlag().equals(TOMORROW_NO)) {
+            BeanUtils.copyProperties(dto, main, "secondWorkSignInTime", "secondSignInWorkingRange", "secondQuittingSignInTime", "secondSignInQuittingRange", "secondSignDayTomorrow");
+        } else {
+            BeanUtils.copyProperties(dto, main);
+        }
+    }
+
+    public static void copyRule(RuleSchedulingDto dto, RuleAttendanceMain main) {
+        if (dto.getSecondFlag().equals(TOMORROW_NO)) {
+            BeanUtils.copyProperties(dto, main, "secondWorkSignInTime", "secondSignInWorkingRange", "secondQuittingSignInTime", "secondSignInQuittingRange", "secondSignDayTomorrow");
+        } else {
+            BeanUtils.copyProperties(dto, main);
+        }
     }
 }