3254194295 преди 7 месеца
родител
ревизия
fa2bd09139

+ 1 - 1
platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -234,7 +234,7 @@
         </where>
         Order By
         checkjob.status asc,
-        <if test="status==null">
+        <if test="status==null or status==1 or status==2">
             checkjob.start_time asc,
         </if>
         sbinfo.level asc,

+ 0 - 1
platform-rest/src/main/java/com/platform/rest/controller/mobile/IgnoreController.java

@@ -196,7 +196,6 @@ public class IgnoreController {
      * @param checkJobDTO 点检任务DTO
      * @return R
      */
-    @GetMapping("/check/jobs/page")
     public R<AbstractPageResultBean<CheckJobVO>> query(CheckJobDTO checkJobDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R<>(checkJobService.selectPageListMobile(checkJobDTO, pageNum, pageSize));
     }