定时任务上报接口优化

hx-service/storage/src/main/java/com/fjhx/task/mapper/SchedulrTaskMapper.xml

@@ -7,7 +7,7 @@
     </select>
 
     <select id="selectUserIdAndJobNo" resultType="java.util.Map">
-        select ID, JobNo
+        select ID id, JobNo jobNo
         from u_user
         where ID = #{userId}
     </select>

hx-service/storage/src/main/java/com/fjhx/task/service/impl/ScheduleTaskServiceImpl.java

@@ -72,7 +72,10 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
 
             Map<String, String> userIdAndJobNo = scheduleTaskMapper.selectUserIdAndJobNo(userId);
 
-            if (userIdAndJobNo.get("ID").equals(userIdAndJobNo.get("JobNo"))) {
+            String id = userIdAndJobNo.get("id");
+            String jobNo = userIdAndJobNo.get("jobNo");
+
+            if (ObjectUtil.isEmpty(id) || ObjectUtil.isEmpty(jobNo) || id.equals(jobNo)) {
                 scheduleTaskMapper.updatePublished(UPDATE_PUBLISHED_SQL + stringStringMap.get("id"));
                 continue;
             }
@@ -86,7 +89,7 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
                 map.put("begNum", value.getString("BegNum"));
                 map.put("endNum", value.getString("EndNum"));
                 map.put("count", value.getString("Qty"));
-                map.put("userId", userIdAndJobNo.get("JobNo"));
+                map.put("userId", jobNo);
                 map.put("createDate", value.getString("CreateDate"));
 
                 ResponseEntity<String> stockAcceptActionResult = restTemplate.postForEntity(STOCK_ACCEPT_ACTION + token, map, String.class);