提交合同查询接口

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/LogisticListReq.java

@@ -56,7 +56,6 @@ public class LogisticListReq implements Serializable {
      * 标的信息
      */
     @Schema(description = "标的信息")
-    @NotNull(message = "标的信息不能为空")
     private List<TradeGoodsInfo> goodsInfo;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1240,6 +1240,9 @@ public class KwcContractLogisticsService {
         kwcContractLogisticsGoodsRepository.deleteByContractId(contactId);
         LogisticListReq.TradeBaseInfo baseInfo = req.getBaseInfo();
         List<LogisticListReq.TradeGoodsInfo> goodsInfos = req.getGoodsInfo();
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(goodsInfos)){
+            return;
+        }
         List<KwcContractLogisticsGoods> goods = goodsInfos.stream()
                 .map(x -> getKwcContractLogisticsGoods(x, contactId,baseInfo))
                 .collect(Collectors.toList());

sckw-modules/sckw-product/src/main/java/com/sckw/product/repository/KwpGoodsRepository.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author :chenXiaoFei
@@ -20,7 +21,7 @@ public class KwpGoodsRepository extends ServiceImpl<KwpGoodsMapper, KwpGoods> {
     public List<KwpGoods> queryByEntIdAndGoodsName(Long entId, String goodsName) {
         return list(Wrappers.<KwpGoods>lambdaQuery()
                 .eq(KwpGoods::getDelFlag,0)
-                .eq(KwpGoods::getEntId,entId)
+                .eq(Objects.nonNull(entId),KwpGoods::getEntId,entId)
                 .like(StringUtils.isNotBlank(goodsName),KwpGoods::getName,goodsName));
 
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderResp.java

@@ -121,6 +121,11 @@ public class WaybillOrderResp implements Serializable {
      */
     @Schema(description = "卸货时间")
     private String unloadingTime;
+    /**
+     * 完成时间
+     */
+    @Schema(description = "完成时间")
+    private String completeTime;
     /**
      * 状态
      */

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

@@ -3245,6 +3245,10 @@ public class KwtWaybillOrderV1Service {
         //todo  cxf
         waybillOrderResp.setOffsiteTime(DateUtils.format(unloadTrack.getOperateTime(),DateUtils.DATE_TIME_PATTERN));
         waybillOrderResp.setUnloadingTime(DateUtils.format(unloadTrack.getOperateTime(),DateUtils.DATE_TIME_PATTERN));
+        if (Objects.equals(record.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
+            waybillOrderResp.setCompleteTime(DateUtils.format(record.getUpdateTime(),DateUtils.DATE_TIME_PATTERN));
+        }
+
         waybillOrderResp.setStatus(String.valueOf(record.getStatus()));
         waybillOrderResp.setStatusDesc(CarWaybillV1Enum.geDesc(record.getStatus()));
         return waybillOrderResp;