3254194295 hai 7 meses
pai
achega
729560327b

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

@@ -234,6 +234,9 @@
         </where>
         Order By
         checkjob.status asc,
+        <if test="status==null">
+            checkjob.start_time asc,
+        </if>
         sbinfo.level asc,
         sbinfo.no asc,
         standard.period_type asc,

+ 1 - 0
platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -125,6 +125,7 @@ public class CheckJobController {
         return new R<>(checkJobService.selectPageList(checkJobDTO, pageNum, pageSize));
     }
 
+
     /**
      * 获取月日历任务列表,均是当月
      * 1:获取某个设备所有当月任务,我设备里面调用,根据角色来判断:维修员或者现场人员返回自己的任务,管理员返回全部的