From 1c390713c67ee3802bad7fa048e5f66a99aa4b0d Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 19 Nov 2025 17:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/route/pojo/OrderRouteEntity.java | 3 +++ .../supervisory/route/pojo/RouteEntity.java | 3 +++ .../route/service/impl/OrderRouteServiceImpl.java | 3 ++- .../route/service/impl/RouteServiceImpl.java | 3 ++- .../wxPay/service/WechatTemplateMessageService.java | 1 - .../main/resources/mapper/route/OrderRouteMapper.xml | 12 +++++++++--- .../src/main/resources/mapper/route/RouteMapper.xml | 8 ++++++-- 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/OrderRouteEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/OrderRouteEntity.java index c33f70c..6f6855a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/OrderRouteEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/OrderRouteEntity.java @@ -48,6 +48,9 @@ public class OrderRouteEntity { */ private String name; + @TableField(exist = false) + private String projectName; + /** * 起始地 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/RouteEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/RouteEntity.java index 40bb027..c8ebac4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/RouteEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/pojo/RouteEntity.java @@ -43,6 +43,9 @@ public class RouteEntity { */ private String name; + @TableField(exist = false) + private String projectName; + /** * 起始地 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/OrderRouteServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/OrderRouteServiceImpl.java index c58be2a..4e41b9f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/OrderRouteServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/OrderRouteServiceImpl.java @@ -107,7 +107,8 @@ public class OrderRouteServiceImpl extends ServiceImpl page = orderRouteMapper.paging(pageParam.toPage(), ew); for (OrderRouteEntity entity : page.getRecords()) { List detailEntityList = orderRouteDetailService.list(Wrappers.lambdaQuery(OrderRouteDetailEntity.class) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/RouteServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/RouteServiceImpl.java index ca2e4b8..a4e746d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/RouteServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/RouteServiceImpl.java @@ -106,7 +106,8 @@ public class RouteServiceImpl extends ServiceImpl impl .eq("a.deleted", 0) .like(StrUtil.isNotBlank(routeEntity.getName()), "a.name", routeEntity.getName()) .eq(null != routeEntity.getCompanyId(), "a.company_id", routeEntity.getCompanyId()) - .eq(null != routeEntity.getStationId(), "a.station_id", routeEntity.getStationId()); + .eq(null != routeEntity.getStationId(), "a.station_id", routeEntity.getStationId()) + .eq(null != routeEntity.getProjectId(), "a.project_id", routeEntity.getProjectId()); IPage page = routeMapper.paging(pageParam.toPage(), ew); for (RouteEntity entity : page.getRecords()) { List detailEntityList = routeDetailService.list(Wrappers.lambdaQuery(RouteDetailEntity.class) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/WechatTemplateMessageService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/WechatTemplateMessageService.java index 2fcbdb6..8061b76 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/WechatTemplateMessageService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/WechatTemplateMessageService.java @@ -1,6 +1,5 @@ package com.njzscloud.supervisory.wxPay.service; -import com.njzscloud.supervisory.wxPay.dto.TemplateData; import com.njzscloud.supervisory.wxPay.param.TemplateMessageParam; import org.springframework.scheduling.annotation.Async; diff --git a/njzscloud-svr/src/main/resources/mapper/route/OrderRouteMapper.xml b/njzscloud-svr/src/main/resources/mapper/route/OrderRouteMapper.xml index 6d2b805..5cde20e 100644 --- a/njzscloud-svr/src/main/resources/mapper/route/OrderRouteMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/route/OrderRouteMapper.xml @@ -16,10 +16,12 @@ a.modify_time, a.deleted, b.company_name start_address, - c.station_name end_address + c.station_name end_address, + d.project_name FROM order_route a LEFT JOIN biz_company b ON b.id = a.company_id LEFT JOIN biz_company c ON c.id = a.station_id + LEFT JOIN biz_project d ON d.id = a.project_id ${ew.customSqlSegment} @@ -39,10 +41,12 @@ a.modify_time, a.deleted, b.company_name start_address, - c.station_name end_address + c.station_name end_address, + d.project_name FROM order_route a LEFT JOIN biz_company b ON b.id = a.company_id LEFT JOIN biz_company c ON c.id = a.station_id + LEFT JOIN biz_project d ON d.id = a.project_id WHERE a.id = #{id} AND a.deleted = 0 @@ -60,10 +64,12 @@ a.modify_time, a.deleted, b.company_name start_address, - c.station_name end_address + c.station_name end_address, + d.project_name FROM order_route a LEFT JOIN biz_company b ON b.id = a.company_id LEFT JOIN biz_company c ON c.id = a.station_id + LEFT JOIN biz_project d ON d.id = a.project_id WHERE a.order_id = #{orderId} AND a.deleted = 0 diff --git a/njzscloud-svr/src/main/resources/mapper/route/RouteMapper.xml b/njzscloud-svr/src/main/resources/mapper/route/RouteMapper.xml index 0b69c60..919f09e 100644 --- a/njzscloud-svr/src/main/resources/mapper/route/RouteMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/route/RouteMapper.xml @@ -15,10 +15,12 @@ a.modify_time, a.deleted, b.company_name start_address, - c.station_name end_address + c.station_name end_address, + d.project_name FROM biz_route a LEFT JOIN biz_company b ON b.id = a.company_id LEFT JOIN biz_company c ON c.id = a.station_id + LEFT JOIN biz_project d ON d.id = a.project_id ${ew.customSqlSegment} @@ -37,10 +39,12 @@ a.modify_time, a.deleted, b.company_name start_address, - c.station_name end_address + c.station_name end_address, + d.project_name FROM biz_route a LEFT JOIN biz_company b ON b.id = a.company_id LEFT JOIN biz_company c ON c.id = a.station_id + LEFT JOIN biz_project d ON d.id = a.project_id WHERE a.id = #{id} AND a.deleted = 0