路线

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;
+
     /**
      * 起始地
      */

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;
+
     /**
      * 起始地
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/OrderRouteServiceImpl.java

@@ -107,7 +107,8 @@ public class OrderRouteServiceImpl extends ServiceImpl<OrderRouteMapper, OrderRo
                 .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.getOrderId(), "a.order_id", routeEntity.getOrderId());
+                .eq(null != routeEntity.getOrderId(), "a.order_id", routeEntity.getOrderId())
+                .eq(null != routeEntity.getProjectId(), "a.project_id", routeEntity.getProjectId());
         IPage<OrderRouteEntity> page = orderRouteMapper.paging(pageParam.toPage(), ew);
         for (OrderRouteEntity entity : page.getRecords()) {
             List<OrderRouteDetailEntity> detailEntityList = orderRouteDetailService.list(Wrappers.lambdaQuery(OrderRouteDetailEntity.class)

njzscloud-svr/src/main/java/com/njzscloud/supervisory/route/service/impl/RouteServiceImpl.java

@@ -106,7 +106,8 @@ public class RouteServiceImpl extends ServiceImpl<RouteMapper, RouteEntity> 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<RouteEntity> page = routeMapper.paging(pageParam.toPage(), ew);
         for (RouteEntity entity : page.getRecords()) {
             List<RouteDetailEntity> detailEntityList = routeDetailService.list(Wrappers.lambdaQuery(RouteDetailEntity.class)

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;
 

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
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
@@ -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
     </select>
@@ -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
     </select>

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
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
@@ -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
     </select>