From 1fea77bab2c3ee1a3426260d41973a3148c43aea Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Fri, 6 Mar 2026 13:44:50 +0800 Subject: [PATCH] 1 --- .../com/njzscloud/supervisory/hsoa/service/HsoaService.java | 3 ++- .../njzscloud/supervisory/order/service/OrderInfoService.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java index 2215efb..8bd86f2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java @@ -47,6 +47,7 @@ public class HsoaService extends ServiceImpl implements public HsoaResult pushProvincialSave(OrderPagingResult detail) { log.info("上传数据:{}", Jackson.toJsonStr(detail)); + List route = detail.getRoute(); PushProvincialSaveParam param = new PushProvincialSaveParam() .setHandleInfo(new PushProvincialSaveParam.HandleInfo() .setApproveDate(detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) @@ -144,7 +145,7 @@ public class HsoaService extends ServiceImpl implements .setLicenseValidityPeriodDateRange(detail.getShiAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getShiAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) .setLicenseValidityPeriodStartDate(detail.getShiAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) .setLicenseValidityPeriodEndDate(detail.getShiAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - // .setRoute("") + .setRoute(CollUtil.isEmpty(route) ? "" : String.join("-", route)) .setSuperviseUnitName(detail.getAreaName()) .setTransportDateRange(detail.getTransTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) .setTransportStartDate(detail.getTransTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index f22efeb..844ac24 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -1387,6 +1387,8 @@ public class OrderInfoService extends ServiceImpl routes = baseMapper.getRoute(orderId); + detail.setRoute(routes); CompletableFuture.runAsync(() -> { HsoaResult result = hsoaService.pushProvincialSave(detail); HsoaRecode hsoaRecode = new HsoaRecode() @@ -2324,6 +2326,8 @@ public class OrderInfoService extends ServiceImpllambdaQuery().eq(OrderInfoEntity::getSn, orderSn)); Long orderId = orderInfo.getId(); OrderPagingResult detail = this.detail(orderId); + List routes = baseMapper.getRoute(orderId); + detail.setRoute(routes); HsoaResult hsoaResult = hsoaService.pushProvincialSave(detail); list.add(MapUtil.builder() .put("result", hsoaResult)