Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -240,7 +240,7 @@ public class UniversalServiceImpl implements UniversalService {
      * 关闭过期运输订单
      * @return
      */
-    //@Scheduled(cron = "0 0,5 8 * * ?")
+    @Scheduled(cron = "0 0,5 8 * * ?")
     public void closePassedOrder() {
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
@@ -260,7 +260,7 @@ public class UniversalServiceImpl implements UniversalService {
                     }else {
                         result+=universalMapper.updateStatusSeven(orderId);
                     }
-                    BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
+                   /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
                     /*if (capacityIdS !=null){
                         //删除单拼
                         universalMapper.delectQueueS(capacityIdS);

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -898,7 +898,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCount" DESC
+            order by "materialCount" DESC nulls last
         </if>
     </select>