新增返参

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -135,13 +135,13 @@
                     </if>
                 </when>
                 <otherwise>
-                    a.ent_id in <foreach collection="ent" separator="," open="(" close=")" item="item">
+                    and a.ent_id in <foreach collection="entIds" separator="," open="(" close=")" item="item">
                             #{item}
                 </foreach>
                 </otherwise>
             </choose>
 
---          状态匹配
+--           状态匹配
             <if test="query.status != null">
                 and a.status =#{query.status}
                 <if test="query.status == 0">

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -566,10 +566,10 @@ public class KwtWaybillOrderV1Service {
             waybillOrder.setProcureFirmName(procure.getFirmName());
             waybillOrder.setSupplyFirmName(supply.getFirmName());
         }
-        waybillOrder.setStartTime(startDate.get().getLoadTime());
-        waybillOrder.setEndTime(endDate.get().getUnloadTime());
-        waybillOrder.setLoadTime(loadDate.get().getOperateTime());
-        waybillOrder.setUnloadTime(unloadDate.get().getOperateTime());
+        waybillOrder.setStartTime(startDate.map(KwtWaybillOrderSubtask::getLoadTime).orElse(null));
+        waybillOrder.setEndTime(endDate.map(KwtWaybillOrderSubtask::getUnloadTime).orElse(null));
+        waybillOrder.setLoadTime(loadDate.map(KwtWaybillOrderTicket::getOperateTime).orElse(null));
+        waybillOrder.setUnloadTime(unloadDate.map(KwtWaybillOrderTicket::getOperateTime).orElse(null));
         waybillOrder.setLoadName(loadName);
         waybillOrder.setLoadAddress(loadAddress);
         waybillOrder.setUnloadName(unloadName);