feat: 新增顶班

guzijian
1 parent dd1aa88f
Showing 10 changed files with 167 additions and 13 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/RuleSchedulingProperties.java
ruoyi-admin/src/main/java/com/ruoyi/controller/AttendanceController.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportErrorRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/UpdatePeopleAttendanceRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/AttendanceService.java
ruoyi-admin/src/main/java/com/ruoyi/service/RuleAttendanceMainService.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
@@ -65,4 +65,14 @@ public interface RuleSchedulingProperties {
      */
     Integer FREE_FLAG = 0;
  
+    /**
+     * 顶班 当前规则
+     */
+    Integer NOW_RULE = 1;
+
+    /**
+     * 顶班 其他规则
+     */
+    Integer OTHER_RULE = 2;
+
 }
@@ -137,4 +137,18 @@ public class AttendanceController extends BaseController {
     }
  
  
+    @ApiOperation("用户顶班")
+    @PutMapping("/update/people/attendance")
+    @Log(title = "用户顶班", businessType = BusinessType.UPDATE)
+    public Result<?> updateSchedulingByUser( @RequestBody @Validated UpdatePeopleAttendanceRequestVo vo){
+        attendanceService.updateSchedulingByUser(vo);
+        return Result.OK("顶班成功");
+    }
+
+    @ApiOperation("获取当日休息的用户")
+    @GetMapping("/getToday/freeUser")
+    public Result<?> getTodayFreeUser(@RequestParam("date") String date){
+        return Result.OK(attendanceService.getTodayFreeUser(date));
+    }
+
 }
 package com.ruoyi.pojo.request;
  
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
  
 /**
  * 异常报表请求
@@ -28,10 +23,15 @@ public class ReportErrorRequestVo {
     @ApiModelProperty("错误类型")
     private Integer exType;
     /**
-     * 错误类型
+     * 车队|部门
+     */
+    @ApiModelProperty("车队|部门")
+    private String fleetName;
+    /**
+     * 线路
      */
-    @ApiModelProperty("场地名称")
-    private String siteName;
+    @ApiModelProperty("线路")
+    private String lineName;
     /**
      * 指定日期
      */
+package com.ruoyi.pojo.vo;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 修改用户的顶班
+ * @author 20412
+ */
+@Data
+public class UpdatePeopleAttendanceRequestVo {
+    @NotBlank
+    private String jobCode;
+    @NotBlank
+    private String otherJobCode;
+    @NotBlank
+    private String date;
+    private Integer ruleId;
+    @NotNull
+    private Integer type;
+}
@@ -62,4 +62,15 @@ public interface AttendanceService {
      */
     List<TableMonthResponseVo> getTableMonth(PeopleRequestVo vo);
  
+    /**
+     * 顶班
+     * @param vo
+     */
+    void updateSchedulingByUser(UpdatePeopleAttendanceRequestVo vo);
+
+    /**
+     * 获取当日休息的人员信息
+     * @return
+     */
+    List<PeopleResponseVo> getTodayFreeUser(String date);
 }
@@ -9,6 +9,7 @@ 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;
  
 /**
@@ -45,4 +46,6 @@ public interface RuleAttendanceMainService extends IService&lt;RuleAttendanceMain&gt; 
      * @return
      */
     List<RuleAttendanceMain> queryNowMonthDate(PeopleRequestVo vo, List<String> jobCodes);
+
+
 }
@@ -209,6 +209,82 @@ public class AttendanceServiceImpl implements AttendanceService {
         return handleTableMonthResponseVo(vo.getDate(), helpList, mainList);
     }
  
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSchedulingByUser(UpdatePeopleAttendanceRequestVo vo) {
+        if (NOW_RULE.equals(vo.getType())) {
+            ruleCopyToOtherUser(vo);
+        } else if (OTHER_RULE.equals(vo.getType())) {
+            handleOtherRule(vo);
+        }
+    }
+
+    @Override
+    public List<PeopleResponseVo> getTodayFreeUser(String date) {
+        LocalDate localDate = LocalDate.parse(date);
+        QueryWrapper<RuleAttendanceMain> qw = new QueryWrapper<>();
+        qw.lambda()
+                .eq(RuleAttendanceMain::getSchedulingDate, localDate)
+                .eq(RuleAttendanceMain::getWorkFlag, FREE_FLAG);
+        List<RuleAttendanceMain> mainList = attendanceMainService.list(qw);
+        List<PeopleResponseVo> peopleList = mainTransformPeopleResponseVo(mainList);
+        return peopleList;
+    }
+
+    private List<PeopleResponseVo> mainTransformPeopleResponseVo(List<RuleAttendanceMain> mainList) {
+        List<PeopleResponseVo> vos = new ArrayList<>(mainList.size());
+        for (RuleAttendanceMain main : mainList) {
+            PeopleResponseVo vo = new PeopleResponseVo();
+            BeanUtils.copyProperties(main, vo);
+            vos.add(vo);
+        }
+        return vos;
+    }
+
+    private void handleOtherRule(UpdatePeopleAttendanceRequestVo vo) {
+        RuleAttendanceMain main = getRuleAttendanceMain(vo.getJobCode(), vo);
+        RuleAttendanceMain otherMain = getRuleAttendanceMain(vo.getOtherJobCode(), vo);
+        RuleScheduling ruleScheduling = ruleSchedulingService.selectRuleSchedulingById(vo.getRuleId().longValue());
+        // 更新休息
+        BeanUtils.copyProperties(otherMain, main, "id", "name", "posts", "fleetName", "ruleDictName", "jobCode");
+        attendanceMainService.updateById(main);
+
+        // 更新顶班人员规则
+        handleOtherMain(ruleScheduling, otherMain, vo.getDate());
+        attendanceMainService.updateById(otherMain);
+    }
+
+    private void handleOtherMain(RuleScheduling ruleScheduling, RuleAttendanceMain otherMain, String date) {
+        RuleSchedulingDto dto = new RuleSchedulingDto();
+        BeanUtils.copyProperties(ruleScheduling, dto);
+
+        BeanUtils.copyProperties(dto, otherMain);
+        RuleNumSettingServiceImpl.handleSegmentationByDate(LocalDate.parse(date), otherMain, dto);
+        otherMain.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
+    }
+
+    private void ruleCopyToOtherUser(UpdatePeopleAttendanceRequestVo vo) {
+        RuleAttendanceMain main = getRuleAttendanceMain(vo.getJobCode(), vo);
+
+        RuleAttendanceMain otherMain = getRuleAttendanceMain(vo.getOtherJobCode(), vo);
+        RuleAttendanceMain backMain = new RuleAttendanceMain();
+        BeanUtils.copyProperties(otherMain, backMain);
+
+        BeanUtils.copyProperties(main, otherMain, "id", "name", "posts", "fleetName", "ruleDictName", "jobCode");
+        attendanceMainService.updateById(otherMain);
+        // 更新休息
+        BeanUtils.copyProperties(backMain, main, "id", "name", "posts", "fleetName", "ruleDictName", "jobCode");
+        attendanceMainService.updateById(main);
+    }
+
+    private RuleAttendanceMain getRuleAttendanceMain(String vo, UpdatePeopleAttendanceRequestVo vo1) {
+        QueryWrapper<RuleAttendanceMain> qw = new QueryWrapper<>();
+        qw.lambda().eq(RuleAttendanceMain::getJobCode, vo)
+                .eq(RuleAttendanceMain::getSchedulingDate, vo1.getDate());
+        RuleAttendanceMain main = attendanceMainService.getOne(qw);
+        return main;
+    }
+
     private List<TableMonthResponseVo> handleTableMonthResponseVo(@NotBlank String date, List<RuleAttendanceMainHelp> helpList, List<RuleAttendanceMain> mainList) {
         Map<String, List<RuleAttendanceMain>> mainMap = transformMapByRuleAttendanceMain(mainList);
         List<TableMonthResponseVo> vos = new ArrayList<>(10);
@@ -237,7 +313,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         int month = Integer.parseInt(split[1]);
         List<LocalDate> dateList = ConstDateUtil.getAllDatesOfTheMonth(year, month);
         if (vos.size() != dateList.size()) {
-            int diff = dateList.size() - vos.size();
+            int diff = DateUtils.differentDaysByMillisecond(Date.from(dateList.get(0).atStartOfDay(ZoneId.systemDefault()).toInstant()), vos.get(0).getSchedulingDate());
             if (diff > 0) {
                 for (int i = 0; i < diff; i++) {
                     TableMonthResponseVo.WorkItemVo itemVo = new TableMonthResponseVo.WorkItemVo();
@@ -159,7 +159,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         mainList.add(main);
     }
  
-    private void handleSegmentationByDate(LocalDate date, RuleAttendanceMain main, RuleSchedulingDto dto) {
+    public static void handleSegmentationByDate(LocalDate date, RuleAttendanceMain main, RuleSchedulingDto dto) {
         main.setFirstWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstWorkSignInTime())));
         // 不存在分段
         if (NO_SEGMENTATION.equals(dto.getSecondFlag())) {
@@ -243,7 +243,12 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         return ruleSchedulingDtoList.get(daysDifference % length);
     }
  
-    private static RuleSchedulingDto getFreeRuleSchedulingDto(Date startDate) {
+    /**
+     * 获取休息rule
+     * @param startDate
+     * @return
+     */
+    public static RuleSchedulingDto getFreeRuleSchedulingDto(Date startDate) {
         RuleSchedulingDto dto = new RuleSchedulingDto();
         dto.setId(0L);
         dto.setRuleName("休息");
@@ -259,7 +264,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
     }
  
  
-    private Date handleTimeTomorrowByRule(LocalDate date, Date time) {
+    private static Date handleTimeTomorrowByRule(LocalDate date, Date time) {
         // 隔天日期需要加1
         return ConstDateUtil.dateAddition(date.plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", time));
     }
 package com.ruoyi.utils;
  
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
@@ -14,6 +15,15 @@ public class ConstDateUtil {
         return simpleDateFormat.format(new Date());
     }
  
+    public static Date parseDate(String date){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            return simpleDateFormat.parse(date);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static String formatDate(String pattern,Date date){
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
         return simpleDateFormat.format(date);
@@ -96,7 +96,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             join equipment on equipment.device_id = equipment_exception.device_id
         <where>
             equipment_exception.`status` != 1
-            <if test="siteName != null  and siteName != ''"> and equipment.site_name = #{siteName}</if>
+            <if test="fleetName != null  and fleetName != ''"> and equipment_exception.fleet_name like concat(#{fleetName},'%')</if>
+            <if test="lineName != null  and lineName != ''"> and equipment_exception.line_name like concat(#{lineName},'%')</if>
             <if test="jobCode != null  and jobCode != ''"> and driver.job_code = #{jobCode}</if>
             <if test="exType != null "> and ex_type = #{exType}</if>
             <if test="id != null "> and equipment_exception.id #{id}</if>