fix: 添加测试人员

guzijian
1 parent af59a5ee
Showing 19 changed files with 300 additions and 113 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/mapper/RuleAttendanceMainMapper.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/ErrorTypeConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.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/ThreadJobService.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/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
ruoyi-admin/src/main/resources/mapper/RuleAttendanceMainMapper.xml
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
@@ -120,4 +120,10 @@ public interface DriverMapper
      * @return
      */
     List<PeopleResponseVo> queryAttendanceInfoAll();
+
+    /**
+     * 删除不存在的工号
+     * @param list
+     */
+    void deleteNotEmptyJob(List<String> list);
 }
@@ -103,4 +103,9 @@ public interface IDriverService
     void clearExceptionRecordByJobCode(String jobCode);
+    /**
+     * 删除不存在的工号
+     * @param jobList
+     */
+    void deleteNotEmptyJob(List<String> jobList);
 }
@@ -150,14 +150,14 @@ public class DriverServiceImpl implements IDriverService {
         LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
         long range = ChronoUnit.MINUTES.between(signTime, nowTime);
         // 如果当前记录靠近签退，但是未到签退小于合法范围 上一次记录未签到，则返回签到记录
-            if (    dto.size() > 1
-                    && BC_TYPE_IN.equals(timeMap.get(index).getBcType())
-                    && range < -60L
-                    && Objects.isNull(timeMap.get(index).getSignInId())
-                    && Objects.isNull(timeMap.get(index - 1).getSignInId())) {
-                // 定位上次操作
-                index = index - 1;
-            }
+        if (dto.size() > 1
+                && BC_TYPE_IN.equals(timeMap.get(index).getBcType())
+                && range < -60L
+                && Objects.isNull(timeMap.get(index).getSignInId())
+                && Objects.isNull(timeMap.get(index - 1).getSignInId())) {
+            // 定位上次操作
+            index = index - 1;
+        }
         // 如果当前记录是异常的记录且还在目前还在签到范围内
         if (!Objects.isNull(timeMap.get(index).getSignInId()) && dto.size() > 1) {
@@ -232,6 +232,12 @@ public class DriverServiceImpl implements IDriverService {
         // 获取考勤表进行比对，因为排班数据是会变化的
         List<DriverScheduling> dto = schedulingService.queryScheduling(jobCode, now);
         log.info("获取到排班数据:{}", cacheMapValue);
+        if (jobCode.equals("722717")){
+            return AjaxResult.success("");
+        }
+        if (jobCode.equals("700001")){
+            return AjaxResult.success("");
+        }
         // 优先从缓存中读取
         if (!CollectionUtil.isEmpty(cacheMapValue) && !CollectionUtil.isEmpty(dto)) {
             return AjaxResult.success(cacheMapValue);
@@ -336,6 +342,12 @@ public class DriverServiceImpl implements IDriverService {
             } else {
                 vos.add(vo);
             }
+            if (item.getJobCode().equals("722717")) {
+                vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, true, true, "测试", "测试", "测试"));
+            }
+            if (item.getJobCode().equals("700001")) {
+                vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, true, true, "测试", "测试", "测试"));
+            }
         }
         return vos;
     }
@@ -352,7 +364,7 @@ public class DriverServiceImpl implements IDriverService {
                 else
                     vo = DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
             } else if (BC_TYPE_IN.equals(recommendation.getBcType())) {
-               vo= DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_OUT_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+                vo = DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_OUT_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
             }
         }
         return vo;
@@ -480,6 +492,11 @@ public class DriverServiceImpl implements IDriverService {
         redisCache.deleteCacheMapValue(dateKey, jobCode);
     }
+    @Override
+    public void deleteNotEmptyJob(List<String> jobList) {
+        driverMapper.deleteNotEmptyJob(jobList);
+    }
+
     /**
      * 获取新的imageUrl
      *
@@ -50,4 +50,10 @@ public class EquipmentException extends BaseEntity
     @ApiModelProperty("异常类型")
     private Integer exType;
+    private String fleetName;
+
+    private String lineName;
+
+    private String nbbm;
+
 }
@@ -223,7 +223,7 @@ public class SignInServiceImpl implements ISignInService {
         schedulingService.computedSignInBySignIn(dto, signIn, globalIndex);
         // 异常保存到异常异常中
-        threadJobService.asyncInsertExceptionRecord(signIn);
+        threadJobService.asyncInsertExceptionRecord(signIn,driver,dto,globalIndex);
         // 驾驶人员二次签到酒精测试异常
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
@@ -359,16 +359,28 @@ public class DriverJob implements InitializingBean {
         int countPage = vo.getTotalCount() / pageSize;
         countPage = vo.getTotalCount() % pageSize == 0 ? countPage : countPage + 1;
         List<Driver> drivers = getDrivers(date, vo);
+        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());
+        handleNotEmptyJob(jobList);
 //        updateDrivers(drivers);
-        saveDrivers(drivers, accessToken);
-        for (int i = 1; i <= countPage; ) {
-            if (++i <= countPage) {
-                vo = getPersonInfo(accessToken, 100, i);
-                drivers = getDrivers(date, vo);
-//                updateDrivers(drivers);
-                saveDrivers(drivers, accessToken);
-            }
+        List<List<Driver>> splitList = ListUtils.splitList(drivers, 200);
+        for (List<Driver> driverList : splitList) {
+            saveDrivers(driverList, accessToken);
         }
+//        for (int i = 1; i <= countPage; ) {
+//            if (++i <= countPage) {
+////                vo = getPersonInfo(accessToken, 100, i);
+////                drivers = getDrivers(date, vo);
+////                updateDrivers(drivers);
+//                saveDrivers(drivers, accessToken);
+//            }
+//        }
+    }
+
+    private static void handleNotEmptyJob(List<String> jobList) {
+        DRIVER_SERVICE.deleteNotEmptyJob(jobList);
     }
     private static void updateDrivers(List<Driver> drivers) {
@@ -10,7 +10,11 @@ import com.ruoyi.domain.RuleAttendanceMain;
 * @Entity .domain.RuleAttendanceMain
 */
 public interface RuleAttendanceMainMapper extends BaseMapper<RuleAttendanceMain> {
-
+    /**
+     * 全量更新
+     * @param main
+     */
+    void updateByIdTotalQuantity(RuleAttendanceMain main);
 }
+package com.ruoyi.pojo.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_IN_OUT_STRING;
+
+/**
+ * 异常类型
+ * @author 20412
+ */
+public class ErrorTypeConverter implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return null;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String str = "";
+        if (SIGN_TIME_OUT_EX_NUM.equals(value)){
+            str = SIGN_TIME_OUT_EX_NUM_STRING;
+        }
+        if (SIGN_NO_SCHEDULING_EX_NUM.equals(value)){
+            str = SIGN_NO_SCHEDULING_EX_NUM_STRING;
+        }
+        if (SIGN_ALCOHOL_EX_NUM.equals(value)){
+            str = SIGN_ALCOHOL_EX_NUM_STRING;
+        }
+        if (EQUIPMENT_ALCOHOL_EX_NUM.equals(value)){
+            str = EQUIPMENT_ALCOHOL_EX_NUM_STRING;
+        }
+        return new CellData(str);
+    }
+}
 package com.ruoyi.pojo.response;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.pojo.converter.ErrorTypeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,34 +18,43 @@ import java.util.Date;
  */
 @Data
 @ApiModel("异常报表对象")
-public class ReportErrorResponseVo {;
-    @ApiModelProperty("异常类型")
-    @ExcelProperty(value = "异常类型")
-    private Integer exType;
-    @ApiModelProperty("姓名")
-    @ExcelProperty(value = "姓名")
-    private String name;
+@HeadFontStyle(fontHeightInPoints = 10,fontName = "黑体")
+public class ReportErrorResponseVo {
     @ApiModelProperty("工号")
     @ExcelProperty(value = "工号")
     private String jobCode;
+    @ApiModelProperty("姓名")
+    @ExcelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty("异常类型")
+    @ExcelProperty(value = "异常类型" , converter = ErrorTypeConverter.class)
+    private Integer exType;
     @ApiModelProperty("图片")
-    @ExcelProperty(value = "图片")
     private String image;
     @ApiModelProperty("设备id")
-    @ExcelProperty(value = "设备id")
     private String deviceId;
     @ExcelProperty(value = "场地名称")
+    @ColumnWidth(20)
     private String siteName;
-    @ApiModelProperty("发生时间")
-    @ExcelProperty(value = "发生时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    private Date createTime;
-
+    @ExcelProperty(value = "部门")
+    private String fleetName;
+    @ExcelProperty(value = "线路名称")
+    @ColumnWidth(20)
+    private String lineName;
+    @ExcelProperty(value = "车辆自编号")
+    @ColumnWidth(20)
+    private String nbbm;
     @ApiModelProperty("标题")
     @ExcelProperty(value = "标题")
     private String title;
     @ApiModelProperty("详情")
     @ExcelProperty(value = "详情")
+    @ColumnWidth(30)
     private String remark;
+    @ApiModelProperty("发生时间")
+    @ExcelProperty(value = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ColumnWidth(20)
+    private Date createTime;
 }
@@ -68,6 +68,9 @@ public class ReportService {
             vo.setExType(item.getExType());
             vo.setCreateTime(item.getCreateTime());
             vo.setTitle(item.getTitle());
+            vo.setNbbm(item.getNbbm());
+            vo.setFleetName(item.getFleetName());
+            vo.setLineName(item.getLineName());
             return vo;
         }).collect(Collectors.toList());
     }
@@ -10,4 +10,5 @@ import com.ruoyi.domain.RuleAttendanceMain;
 */
 public interface RuleAttendanceMainService extends IService<RuleAttendanceMain> {
+    void updateByIdTotalQuantity(RuleAttendanceMain main);
 }
@@ -54,6 +54,7 @@ public class SchedulingService {
      * @return
      */
     public List<DriverScheduling> queryScheduling(String jobCode, Long now) {
+
         List<DriverScheduling> dto = null;
         for (int i = 0; i > -2; i--) {
             dto = nowSchedulingCache.getCacheSchedulingMapValueByHKey(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)),jobCode);
@@ -21,6 +21,7 @@ import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.utils.ConstDateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -142,7 +143,7 @@ public class ThreadJobService {
     }
     @Async
-    public void asyncInsertExceptionRecord(SignIn signIn) {
+    public void asyncInsertExceptionRecord(SignIn signIn, Driver driver, List<DriverScheduling> dto, GlobalIndex globalIndex) {
         if (!SIGN_NO_EX_NUM.equals(signIn.getExType())) {
             EquipmentException exception = new EquipmentException();
             exception.setExType(signIn.getExType());
@@ -153,6 +154,11 @@ public class ThreadJobService {
             exception.setTitle("打卡异常");
             exception.setRemark(signIn.getRemark());
             exception.setCreateTime(signIn.getCreateTime());
+            exception.setFleetName(driver.getFleetName());
+            if (CollectionUtil.isNotEmpty(dto)) {
+                exception.setNbbm(dto.get(globalIndex.getIndex()).getNbbm());
+                exception.setLineName(dto.get(globalIndex.getIndex()).getLineName());
+            }
             exceptionMapper.insertEquipmentException(exception);
         }
     }
@@ -225,26 +231,26 @@ public class ThreadJobService {
         }
         int result = driverMapper.insertDriver(driver);
         log.debug("插入完毕");
-        if (result == 0) {
-            return;
-        }
-        log.info("图片开始上传");
-        // 获取图片数据
-        InputStream is = getImageInputStreamByUrl(imageUrl);
-        // 上传图片
-        try {
-            uploadImage(is, filePath);
-        } catch (IOException e) {
-            log.error("工号：{}的人脸图像，上传失败:{}", driver.getJobCode(), e.getMessage());
-            is = getImageInputStreamByUrl(imageUrl);
+        if (result != 0) {
+            log.info("图片开始上传");
+            // 获取图片数据
+            InputStream is = getImageInputStreamByUrl(imageUrl);
+            // 上传图片
             try {
                 uploadImage(is, filePath);
-            } catch (IOException ex) {
-                log.error("工号：{}的人脸图像，再次上传失败:{}", driver.getJobCode(), e.getMessage());
-                throw new RuntimeException(ex);
+            } catch (IOException e) {
+                log.error("工号：{}的人脸图像，上传失败:{}", driver.getJobCode(), e.getMessage());
+                is = getImageInputStreamByUrl(imageUrl);
+                try {
+                    uploadImage(is, filePath);
+                } catch (IOException ex) {
+                    log.error("工号：{}的人脸图像，再次上传失败:{}", driver.getJobCode(), e.getMessage());
+                    throw new RuntimeException(ex);
+                }
             }
+            log.info("图片上传完毕");
         }
-        log.info("图片上传完毕");
+
     }
     private InputStream getImageInputStreamByUrl(String imageUrl) {
@@ -323,12 +329,12 @@ public class ThreadJobService {
     @Async
     @Transactional(rollbackFor = {Exception.class})
     public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut) {
-        if (StringUtils.isNotEmpty(timeOut)){
+        if (StringUtils.isNotEmpty(timeOut)) {
             LocalDate date = LocalDate.now();
             Date date2 = ConstDateUtil.dateAddition(date.toString(), timeOut);
             Date date1 = new Date();
             // 如果当前日期小于设定时间就不获取固定排班
-            if (date1.compareTo(date2) < 0){
+            if (date1.compareTo(date2) < 0) {
                 return;
             }
         }
@@ -161,23 +161,28 @@ public class AttendanceServiceImpl implements AttendanceService {
     @Override
     public void updateAttendance(UpdateAttendanceVo vo) {
         RuleAttendanceMain main = attendanceMainService.getById(vo.getId());
-        RuleScheduling ruleScheduling = ruleSchedulingService.selectRuleSchedulingById(vo.getId().longValue());
-        BeanUtils.copyProperties(ruleScheduling,main);
+        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())));
-        if (HAVE_SEGMENTATION.equals(ruleScheduling.getSecondFlag())){
+        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())));
             // 处理隔天
-            if (TOMORROW_YES.equals(ruleScheduling.getFirstSignInDayTomorrow())){
-                main.setSecondQuittingSignInTime( ConstDateUtil.dateAddition(LocalDate.now().plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
+            if (TOMORROW_YES.equals(ruleScheduling.getFirstSignInDayTomorrow())) {
+                main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
+            }else {
+                main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
             }
-        }else {
-
+        } else {
             // 处理隔天
-            if (TOMORROW_YES.equals(ruleScheduling.getFirstSignInDayTomorrow())){
-               main.setFirstQuittingSignInTime( ConstDateUtil.dateAddition(LocalDate.now().plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
+            if (TOMORROW_YES.equals(ruleScheduling.getFirstSignInDayTomorrow())) {
+                main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().plusDays(1).toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
+            }else {
+                main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(LocalDate.now().toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
             }
         }
+        main.setWorkFlag(ruleScheduling.getId() == 0 ? FREE_FLAG : WORK_FLAG);
+        attendanceMainService.updateByIdTotalQuantity(main);
     }
     private static void getRumSettingByDto(SchedulingDto dto, RuleNumSetting setting) {
@@ -15,6 +15,10 @@ import org.springframework.stereotype.Service;
 public class RuleAttendanceMainServiceImpl extends ServiceImpl<RuleAttendanceMainMapper, RuleAttendanceMain>
     implements RuleAttendanceMainService {
+    @Override
+    public void updateByIdTotalQuantity(RuleAttendanceMain main) {
+        baseMapper.updateByIdTotalQuantity(main);
+    }
 }
@@ -108,6 +108,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         main.setRuleDictName(ruleDictName);
         RuleSchedulingDto dto = null;
         dto = getRuleByWeek(main,ruleSchedulingDtoList, date,attendanceDto.getStartDate());
+        main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
         BeanUtils.copyProperties(dto, main);
         main.setName(attendanceDto.getName());
         main.setJobCode(attendanceDto.getJobCode());
@@ -166,7 +167,6 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         if (daysDifference < 0) {
             return getFreeRuleSchedulingDto(startDate);
         }
-        main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
         return dto;
     }
@@ -32,4 +32,20 @@
         sign_in_time_out_range,second_work_sign_in_time,second_sign_in_working_range,
         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 = #{workingHourPlan},
+                                working_hour_type = #{workingHourType},
+                                first_work_sign_in_time = #{firstWorkSignInTime},
+                                first_sign_in_working_range = #{firstSignInWorkingRange},
+                                first_quitting_sign_in_time = #{firstQuittingSignInTime},
+                                first_sign_in_quitting_range = #{firstSignInQuittingRange},
+                                sign_in_time_out_range = #{signInTimeOutRange},
+                                second_work_sign_in_time = #{secondWorkSignInTime},
+                                second_sign_in_working_range = #{secondSignInWorkingRange},
+                                second_quitting_sign_in_time = #{secondQuittingSignInTime},
+                                second_sign_in_quitting_range = #{secondSignInQuittingRange},
+                                work_flag = #{workFlag}
+            where id = #{id}
+    </update>
 </mapper>
@@ -89,9 +89,9 @@
         driver.sign_in_equipment,
         driver.fleet_name
         from driver
-            left join driver_face_device_id on driver.job_code = driver_face_device_id.job_code
+        left join driver_face_device_id on driver.job_code = driver_face_device_id.job_code
         <where>
-            <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
+            <if test="deviceId != null and deviceId != ''">and device_id = #{deviceId}</if>
             <if test="jobCode != null  and jobCode != ''">and driver.job_code = #{jobCode}</if>
             <if test="companyCode != null  and companyCode != ''">and driver.company_code = #{companyCode}</if>
             <if test="brancheCompanyCode != null  and brancheCompanyCode != ''">and driver.branche_company_code =
@@ -122,24 +122,25 @@
     </select>
     <select id="getNameByJobCode" resultMap="DriverResult">
         select personnel_name,job_code
-            from driver
+        from driver
         <if test="jobCodes != null and jobCodes.size() > 0">
-        <where>
-            job_code IN
-            <foreach collection="jobCodes" item="item" open="(" separator="," close=")" >
-                #{item}
-            </foreach>
-        </where>
+            <where>
+                job_code IN
+                <foreach collection="jobCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </where>
         </if>
     </select>
     <select id="jobCodeIsEmpty" resultType="java.lang.Integer">
         select count(*)
-       from driver
+        from driver
         where job_code = #{jobCode}
     </select>
     <select id="getDriverImageByJobCode" resultType="String">
-        select image from driver
+        select image
+        from driver
         where job_code = #{jobCode}
     </select>
     <select id="getDrivers" resultType="com.ruoyi.driver.domain.Driver">
@@ -175,29 +176,27 @@
         select job_code
         from driver
         where job_code in
-            <foreach collection="jobCodes" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
+        <foreach collection="jobCodes" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
     <select id="queryAttendanceInfoById" resultType="com.ruoyi.pojo.vo.PeopleResponseVo" resultMap="PeopleResult">
-        SELECT
-            driver.job_code,
-            driver.personnel_name,
-            driver.posts,
-            driver.fleet_name,
-            rule_setting_driver.start_date
-        FROM
-            driver,rule_setting_driver
-        WHERE driver.job_code = rule_setting_driver.job_code and rule_setting_driver.setting_id = #{id}
+        SELECT driver.job_code,
+               driver.personnel_name,
+               driver.posts,
+               driver.fleet_name,
+               rule_setting_driver.start_date
+        FROM driver,
+             rule_setting_driver
+        WHERE driver.job_code = rule_setting_driver.job_code
+          and rule_setting_driver.setting_id = #{id}
     </select>
     <select id="queryAttendanceInfoAll" resultType="com.ruoyi.pojo.vo.PeopleResponseVo" resultMap="PeopleResult">
-        SELECT
-            job_code,
-            personnel_name,
-            posts,
-            fleet_name
-        FROM
-            driver
+        SELECT job_code,
+               personnel_name,
+               posts,
+               fleet_name
+        FROM driver
         WHERE driver.posts != "驾驶员" and driver.posts != "售票员"
     </select>
@@ -278,30 +277,34 @@
         where id = #{id}
     </update>
     <update id="updateDriverByComputed">
-        update driver set face_sign_in = 0
+        update driver
+        set face_sign_in = 0
         WHERE face_sign_in != 1 and job_code in (
             SELECT job_code
             FROM driver_face_device_id,equipment
             WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
             GROUP BY job_code
             HAVING COUNT(*) = #{count}
-        );
-        update driver set face_sign_in = 0
-        WHERE face_sign_in = 1 and job_code in (
-            SELECT job_code
-            FROM driver_face_device_id,equipment
-            WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
-            GROUP BY job_code
-            HAVING COUNT(*) = #{count}
-        );
-        update driver set face_sign_in = 2
+            );
+        update driver
+        set face_sign_in = 0
+        WHERE face_sign_in = 1
+          and job_code in (SELECT job_code
+                           FROM driver_face_device_id,
+                                equipment
+                           WHERE equipment.`status` = 1
+                             and driver_face_device_id.device_id = equipment.device_id
+                           GROUP BY job_code
+                           HAVING COUNT(*) = #{count});
+        update driver
+        set face_sign_in = 2
         WHERE face_sign_in != 1 and job_code not in (
             SELECT job_code
             FROM driver_face_device_id,equipment
             WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
             GROUP BY job_code
             HAVING COUNT(*) = #{count}
-        );
+            );
     </update>
     <update id="updateSignStatusDriversByJobCodes">
         <foreach collection="list" item="item" separator=";">
@@ -312,7 +315,8 @@
     <update id="updateDriverInfoByJobCodes">
         <foreach collection="drivers" item="item" separator=";">
             update driver set
-            line_name=#{item.lineName,jdbcType=VARCHAR},fleet_name=#{item.fleetName,jdbcType=VARCHAR},personnel_name = #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR}
+            line_name=#{item.lineName,jdbcType=VARCHAR},fleet_name=#{item.fleetName,jdbcType=VARCHAR},personnel_name =
+            #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR}
             where job_code = #{item.jobCode,jdbcType=VARCHAR}
         </foreach>
     </update>
@@ -331,10 +335,24 @@
     </delete>
     <delete id="deleteDeviceIdAssociatedJobCode">
         delete from driver_face_device_id where
-       job_code in
-       ( <foreach collection="jobCodes" item="item" separator=",">
-            #{item}
-        </foreach> )
+        job_code in
+        ( <foreach collection="jobCodes" item="item" separator=",">
+        #{item}
+    </foreach> )
+    </delete>
+    <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
+            )
     </delete>
@@ -366,7 +384,7 @@
             #{item.image},
             #{item.updateTime},
             #{item.signInEquipment},
-             #{item.fleetName}
+            #{item.fleetName}
             )
         </foreach>
         on duplicate key update
@@ -386,7 +404,8 @@
     </insert>
     <insert id="saveScheduling">
         insert into
-        scheduling (id,schedule_date,line_name,line_code,job_code,posts,lp_name,nbbm,jsy,spy,up_down,qdz_code,qdz_name,zdz_code,zdz_name,fcsj_t,dfsj_t,zdsj_t,fcsj_actual_time,zdsj_actual_time,jhlc,jhlc_orig,bcsj,bc_type,`status`,adjust_exps,sflj,remarks)
+        scheduling
+        (id,schedule_date,line_name,line_code,job_code,posts,lp_name,nbbm,jsy,spy,up_down,qdz_code,qdz_name,zdz_code,zdz_name,fcsj_t,dfsj_t,zdsj_t,fcsj_actual_time,zdsj_actual_time,jhlc,jhlc_orig,bcsj,bc_type,`status`,adjust_exps,sflj,remarks)
         values
         <foreach collection="responseSchedulingDto" item="item" open="(" separator="," close=")">
             #{item.id},
@@ -16,6 +16,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="exType"    column="ex_type"    />
         <result property="personnelName"    column="personnel_name"    />
         <result property="siteName"    column="site_name"    />
+        <result property="fleetName"    column="fleet_name"    />
+        <result property="nbbm"    column="nbbm"    />
+        <result property="lineName"    column="line_name"    />
     </resultMap>
     <resultMap type="EquipmentException" id="EquipmentExceptionResult">
         <result property="id"    column="id"    />
@@ -65,7 +68,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <select id="selectEquipmentExceptionListByVo"
             resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
-        select equipment_exception.id, title, equipment.site_name , equipment_exception.device_id,driver.personnel_name,driver.job_code, equipment_exception.image, equipment_exception.status, equipment_exception.create_time, equipment_exception.ex_type,equipment_exception.remark
+        select equipment_exception.id, title,
+               equipment.site_name ,
+               equipment_exception.device_id,
+               driver.personnel_name,
+               driver.job_code,
+               equipment_exception.image,
+               equipment_exception.status,
+               equipment_exception.create_time,
+               equipment_exception.ex_type,
+               equipment_exception.remark,
+                equipment_exception.fleet_name,
+                equipment_exception.nbbm,
+                equipment_exception.line_name
         from
         equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
         <where>
@@ -93,6 +108,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createTime != null">create_time,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="exType != null and exType != ''">ex_type,</if>
+            <if test="fleetName != null and fleetName != ''">fleet_name,</if>
+            <if test="nbbm != null and nbbm != ''">nbbm,</if>
+            <if test="lineName != null and lineName != ''">line_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
@@ -103,6 +121,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createTime != null">#{createTime},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="exType != null and exType != ''">#{exType},</if>
+            <if test="fleetName != null and fleetName != ''">#{fleetName},</if>
+            <if test="nbbm != null and nbbm != ''">#{nbbm},</if>
+            <if test="lineName != null and lineName != ''">#{lineName},</if>
          </trim>
     </insert>