guzijian / bsth-alcohol-sign · Commits

Commit f23b8ae60ccab3b56080c093897171a804804486

Authored by guzijian
1 parent b994af10

fix: 更新注册列表逻辑形式

Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
  View file @f23b8ae
... ... @@ -165,10 +165,11 @@ public class DriverJob implements InitializingBean {
165 165 */
166 166 public void getSchedulingInfo() {
167 167 long timestamp = System.currentTimeMillis();
168   - log.info("获取排班任务触发时间:{}",timestamp);
  168 + String formatDate = ConstDateUtil.formatDate(timestamp);
  169 + log.info("获取排班任务触发时间:{}",formatDate);
169 170 // 获取排班请求
170 171 String getSchedulingInfoUrl = null;
171   - String formatDate = ConstDateUtil.formatDate(timestamp);
  172 +
172 173 log.info("开始获取{}的排班数据",formatDate);
173 174 try {
174 175 getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
... ...
ruoyi-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
  View file @f23b8ae
... ... @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
54 54 </select>
55 55 <select id="querySignListByJobCode" resultType="com.ruoyi.pojo.domain.EquipmentDriverExpand">
56 56 select driver_face_device_id.* from driver_face_device_id,equipment
57   - where driver_face_device_id.device_id = equipment.device_id and equipment.status = 1
  57 + where driver_face_device_id.device_id = equipment.device_id
58 58 <if test="drivers != null and drivers.size() > 0">
59 59 and job_code in
60 60 <foreach collection="drivers" item="item" open="(" separator="," close=")">
... ...