fix: 更新排班数据

guzijian
1 parent 488d5554
Showing 5 changed files with 40 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/mapper/RuleAttendanceMainMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/RuleAttendanceMainService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleAttendanceMainServiceImpl.java
Bsth-admin/src/main/resources/mapper/RuleAttendanceMainMapper.xml
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Paths;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -11,6 +12,8 @@ import java.util.stream.Collectors;
  
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
@@ -24,6 +27,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
@@ -37,6 +41,8 @@ import com.ruoyi.pojo.response.DriverResponseVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.pojo.response.personnel.PersonnelResultResponseVo;
 import com.ruoyi.pojo.response.personnel.TokenResponseVo;
+import com.ruoyi.service.AttendanceService;
+import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.system.domain.SysNotice;
@@ -63,6 +69,7 @@ import javax.servlet.http.HttpServletResponse;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.RuleSchedulingProperties.WORK_FLAG;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
  
@@ -102,8 +109,6 @@ public class DriverServiceImpl implements IDriverService {
     private NowSchedulingCache nowSchedulingCache;
     @Autowired
     private EquipmentMapper equipmentMapper;
-    @Autowired
-    private DriverJob driverJob;
  
     @Autowired
     private ServerConfig serverConfig;
@@ -119,6 +124,9 @@ public class DriverServiceImpl implements IDriverService {
     @Value("${api.headImage}")
     private String headImagePre;
  
+    @Autowired
+    private RuleAttendanceMainService attendanceMainService;
+
     /**
      * 查询驾驶员信息
      *
@@ -468,6 +476,7 @@ public class DriverServiceImpl implements IDriverService {
         // 数据更新 更新人脸注册标识 更新基本数据
         for (List<Driver> list : lists) {
             driverMapper.updateDriverBaseInfoByJobCodes(list, 0);
+            attendanceMainService.updateAttendanceMainByJobCode(list);
         }
         if (insertDrivers.size() > 0) driverMapper.saveDrivers(insertDrivers);
  
@@ -611,6 +620,7 @@ public class DriverServiceImpl implements IDriverService {
         }
         if (CollectionUtil.isNotEmpty(drivers)) {
             driverMapper.updateDriverBaseInfoByJobCodes(drivers, 1);
+            attendanceMainService.updateAttendanceMainByJobCode(drivers);
         }
         return AjaxResult.success();
     }
@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.RuleAttendanceMain;
+import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.vo.DeleteAttendanceVo;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
 import com.ruoyi.pojo.vo.UpdateAttendanceVo;
@@ -39,6 +40,8 @@ public interface RuleAttendanceMainMapper extends BaseMapper&lt;RuleAttendanceMain&gt;
      * @return
      */
     List<RuleAttendanceMain> queryNowMonthDate(@Param("vo") PeopleRequestVo vo, @Param("jobCodes") List<String> jobCodes);
+
+    void updateAttendanceMainByJobCode(@Param("list") List<Driver> drivers);
 }
  
  
@@ -3,6 +3,7 @@ package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
+import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.vo.DeleteAttendanceVo;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
 import com.ruoyi.pojo.vo.UpdateAttendanceVo;
@@ -46,4 +47,5 @@ public interface RuleAttendanceMainService extends IService&lt;RuleAttendanceMain&gt; 
     List<RuleAttendanceMain> queryNowMonthDate(PeopleRequestVo vo, List<String> jobCodes);
  
  
+    void updateAttendanceMainByJobCode(List<Driver> drivers);
 }
@@ -3,6 +3,7 @@ package com.ruoyi.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
+import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.mapper.RuleAttendanceMainMapper;
 import com.ruoyi.pojo.vo.DeleteAttendanceVo;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
@@ -45,6 +46,11 @@ public class RuleAttendanceMainServiceImpl extends ServiceImpl&lt;RuleAttendanceMai
     public List<RuleAttendanceMain> queryNowMonthDate(PeopleRequestVo vo, List<String> jobCodes) {
         return baseMapper.queryNowMonthDate(vo, jobCodes);
     }
+
+    @Override
+    public void updateAttendanceMainByJobCode(List<Driver> drivers) {
+        baseMapper.updateAttendanceMainByJobCode(drivers);
+    }
 }
  
  
@@ -55,6 +55,23 @@
             and scheduling_date = #{main.schedulingDate}
         </foreach>
     </update>
+    <update id="updateAttendanceMainByJobCode">
+        <foreach collection="list" item="item" separator=";">
+            update rule_attendance_main
+                <trim prefix="set" suffixOverrides=",">
+                    <if test="item.fleetName != null and item.fleetName != ''">
+                        fleet_name =#{item.fleetName},
+                    </if>
+                    <if test="item.posts != null and item.posts != ''">
+                        `posts` =#{item.posts},
+                    </if>
+                    <if test="item.personnelName != null and item.personnelName != ''">
+                        `name` =#{item.personnelName},
+                    </if>
+                </trim>
+            where job_code = #{item.jobCode} and scheduling_date > NOW()
+        </foreach>
+    </update>
     <delete id="deleteByJobCodeTotalRecord">
         delete from rule_attendance_main
            where job_code IN