20210427tall查询任务排序

cloudutil/src/main/resources/application-util-test.yml

@@ -20,7 +20,7 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+      defaultZone: http://admin:admin@192.168.31.13:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
     prefer-ip-address: true

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -157,6 +157,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
         }
         ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
         proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1);
+        proTaskDetailExample.setOrderByClause("begin_time");
         List<ProTaskDetail> firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
         if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
             int sequence = 1;

tall/src/main/resources/application-test.yml

@@ -31,6 +31,6 @@ swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 192.168.0.99
+    ip-address: 192.168.31.13
 gatewayUrl: http://192.168.0.99/gateway/
 smsCode: 0

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -109,6 +109,7 @@
         AND
           (c.place_location = 0 or c.id is null)
         group by s.task_detail_id
+        ORDER BY s.begin_time
     </select>