fix: 修改签到报表获取接口，使用左连接保证签到报表数据完整性

guzijian
1 parent c3754053
Showing 8 changed files with 65 additions and 17 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
@@ -127,4 +127,11 @@ public interface DriverMapper
      * @param list
      */
     void deleteNotEmptyJob(List<String> list);
+
+    /**
+     * 获取已经存在的工号
+     * @param list
+     * @return
+     */
+    List<String> queryEmptyJob(List<String> list);
 }
@@ -112,4 +112,11 @@ public interface IDriverService
      * 计算异常班次
      */
     void computedExceptionScheduling();
+
+    /**
+     * 获取已经存在的工号
+     * @param jobList
+     * @return
+     */
+    List<String> queryEmptyJob(List<String> jobList);
 }
@@ -547,6 +547,11 @@ public class DriverServiceImpl implements IDriverService {
         sendNotice(nowTimerList);
     }
  
+    @Override
+    public List<String> queryEmptyJob(List<String> jobList) {
+        return driverMapper.queryEmptyJob(jobList);
+    }
+
     private void sendNotice(List<DriverSignInRecommendation> nowTimerList) {
         List<SysNotice> noticeList = new ArrayList<>(nowTimerList.size());
         for (DriverSignInRecommendation item : nowTimerList) {
@@ -410,8 +410,11 @@ public class DriverJob implements InitializingBean {
         for (int i = 2; i <= countPage; i++) {
             drivers.addAll(getDrivers(date, getPersonInfo(accessToken, 100, i)));
         }
-        List<String> jobList = drivers.stream().map(driver -> driver.getJobCode()).collect(Collectors.toList());
+        List<String> jobList = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
+        // 删除离职员工
         handleNotEmptyJob(jobList);
+        // 过滤已经存在的员工工号
+        drivers = filterEmptyJob(drivers, jobList);
 //        updateDrivers(drivers);
         List<List<Driver>> splitList = ListUtils.splitList(drivers, 200);
         for (List<Driver> driverList : splitList) {
@@ -427,6 +430,17 @@ public class DriverJob implements InitializingBean {
 //        }
     }
  
+    private static List<Driver> filterEmptyJob(List<Driver> drivers, List<String> jobList) {
+        List<String> jobs = DRIVER_SERVICE.queryEmptyJob(jobList);
+        Map<String, String> jobMap = new HashMap<>(jobs.size());
+        for (String job : jobs) {
+            jobMap.put(job, job);
+        }
+
+        // 过滤
+        return drivers.stream().filter(item -> StringUtils.isEmpty(jobMap.get(item.getJobCode()))).collect(Collectors.toList());
+    }
+
     private static void handleNotEmptyJob(List<String> jobList) {
         DRIVER_SERVICE.deleteNotEmptyJob(jobList);
     }
@@ -39,6 +39,10 @@ public class ExportReportViewResponseVo {
     @ExcelProperty(value = "线路")
     private String lineName;
  
+    @ApiModelProperty("路牌")
+    @ExcelProperty(value = "路牌")
+    private String lpName;
+
     @ApiModelProperty("部门")
     @ExcelProperty(value = "部门")
     @ColumnWidth(12)
@@ -34,7 +34,7 @@ public class ReportViewResponseVo {
     @ApiModelProperty("车辆自编号")
     private String nbbm;
  
-    @ApiModelProperty("车辆自编号")
+    @ApiModelProperty("路牌")
     private String lpName;
  
  
@@ -199,6 +199,17 @@
         FROM driver
 --         WHERE driver.posts != "驾驶员" and driver.posts != "售票员"
     </select>
+    <select id="queryEmptyJob" resultType="java.lang.String">
+        SELECT
+        d1.job_code
+        FROM
+        (
+        SELECT job_code FROM driver WHERE job_code IN
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        ) d1
+    </select>
  
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
@@ -309,9 +320,9 @@
     <update id="updateSignStatusDriversByJobCodes">
         <foreach collection="list" item="item" separator=";">
             update driver set face_sign_in = 1,update_time = #{item.updateTime}
-                          <if test="item.image != null and item.image != ''">
-                              ,image = #{item.image}
-                          </if>
+            <if test="item.image != null and item.image != ''">
+                ,image = #{item.image}
+            </if>
             where job_code = #{item.jobCode,jdbcType=VARCHAR}
         </foreach>
     </update>
@@ -346,16 +357,16 @@
     <delete id="deleteNotEmptyJob">
         DELETE
         FROM driver WHERE job_code NOT IN (
-            SELECT
-                d1.job_code
-            FROM
-                (
-                SELECT job_code FROM driver WHERE job_code IN
-                <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-                ) d1
-            )
+        SELECT
+        d1.job_code
+        FROM
+        (
+        SELECT job_code FROM driver WHERE job_code IN
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        ) d1
+        )
     </delete>
  
  
@@ -57,10 +57,10 @@
  
     <select id="queryToDay" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
         select scheduling.*,driver.fleet_name fleetName from
-        scheduling join driver on driver.job_code = scheduling.job_code
+        scheduling left join driver on driver.job_code = scheduling.job_code
         where schedule_date = #{date}
         <if test="jobCode !=null and jobCode != ''">
-            and driver.job_code = #{jobCode}
+            and scheduling.job_code = #{jobCode}
         </if>
         <if test="name !=null and name != ''">
             and `name` = #{name}