fix:工单确认bug

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -63,7 +63,7 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
         }
 
 
-        if (list.size() > 0 && list1.size() <= 1) {
+        if (list.size() > 0 && list1.size() < 1) {
             // todo
             ItdmGongdanMaster master = new ItdmGongdanMaster();
             master.setId(data.getWoId());
@@ -82,17 +82,16 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
         return list.stream()
                 .filter(i -> i.getShijiWorkDate() != null && i.getShijiEndTime() != null)
 
-                .map(i -> getDateFormat(i, i::getShijiEndTime, simpleDate, simpleDate1)).max(Comparator.reverseOrder()).orElse(null);
+                .map(i -> getDateFormat(i, i::getShijiEndTime, simpleDate, simpleDate1)).max(Date::compareTo).orElse(null);
     }
 
 
     private Date getMin(List<ItdmGongdanDetail> list, SimpleDateFormat simpleDate, SimpleDateFormat simpleDate1) {
 
 
-        return list.stream().filter(i -> i.getShijiWorkDate() != null && i.getShijiEndTime() != null)
-
-                .map(i -> getDateFormat(i, i::getShijiStartTime, simpleDate, simpleDate1)).min(Comparator.reverseOrder()).orElse(null);
+        return list.stream().filter(i -> i.getShijiWorkDate() != null && i.getShijiStartTime() != null)
 
+                .map(i -> getDateFormat(i, i::getShijiStartTime, simpleDate, simpleDate1)).min(Date::compareTo).orElse(null);
 
 
     }