问题修复

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizCompanyController.java

@@ -8,6 +8,7 @@ import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
 import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
+import com.njzscloud.supervisory.biz.pojo.result.StationResult;
 import com.njzscloud.supervisory.biz.service.BizCompanyService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -95,9 +96,11 @@ public class BizCompanyController {
 
     /**
      * 站点列表
+     * @param lng 经度
+     * @param lat 纬度
      */
     @GetMapping("/station")
-    public R<List<BizCompanyEntity>> station() {
+    public R<List<StationResult>> station(Double lng, Double lat) {
-        return R.success(bizCompanyService.station());
+        return R.success(bizCompanyService.station(lng, lat));
     }
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizCompanyMapper.java

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
+import com.njzscloud.supervisory.biz.pojo.result.StationResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 企业信息
  */
@@ -21,4 +24,7 @@ public interface BizCompanyMapper extends BaseMapper<BizCompanyEntity> {
      * @return 企业实体，包含bizObj
      */
     BizCompanyEntity selectDetailWithBizObj(@Param("id") Long id);
+
+    List<StationResult> station(@Param("lng") Double lng, @Param("lat") Double lat);
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java

@@ -35,6 +35,11 @@ public class BizCompanyEntity {
      */
     private Boolean station;
 
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
     /**
      * 统一社会信用代码
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchCompanyParam.java

@@ -23,6 +23,10 @@ public class SearchCompanyParam {
      * 企业名称
      */
     private String companyName;
+    /**
+     * 站点名称
+     */
+    private String stationName;
     /**
      * 统一社会信用代码
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchCompanyResult.java

@@ -28,7 +28,10 @@ public class SearchCompanyResult {
      * 是否为站点; 0-->否、1-->是
      */
     private Boolean station;
-
+    /**
+     * 站点名称
+     */
+    private String stationName;
     /**
      * 统一社会信用代码
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchTruckResult.java

@@ -38,7 +38,7 @@ public class SearchTruckResult {
     /**
      * 行驶证图片
      */
-    private String truckLicense;
+    private List<String> truckLicense;
 
     /**
      * 车架号
@@ -48,7 +48,7 @@ public class SearchTruckResult {
     /**
      * 合格证图片
      */
-    private String qualification;
+    private List<String> qualification;
 
     /**
      * 最大载重; 单位：千克

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/StationResult.java

@@ -0,0 +1,125 @@
+package com.njzscloud.supervisory.biz.pojo.result;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class StationResult {
+    private Long id;
+    private Double distance;
+
+    /**
+     * 归属用户
+     */
+    private Long userId;
+
+    /**
+     * 是否为站点; 0-->否、1-->是
+     */
+    private Boolean station;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String uscc;
+    /**
+     * 站点名称
+     */
+    private String stationName;
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+
+    /**
+     * 营业执照有效期
+     */
+    private LocalDate licenseStartTime;
+
+    /**
+     * 营业执照有效期
+     */
+    private LocalDate licenseEndTime;
+
+    /**
+     * 法人名称
+     */
+    private String legalRepresentative;
+
+    /**
+     * 省; 代码
+     */
+    private String province;
+
+    /**
+     * 市; 代码
+     */
+    private String city;
+
+    /**
+     * 区县; 代码
+     */
+    private String area;
+
+    /**
+     * 乡镇街道; 代码
+     */
+    private String town;
+
+    /**
+     * 省; 名称
+     */
+    private String provinceName;
+
+    /**
+     * 市; 名称
+     */
+    private String cityName;
+
+    /**
+     * 区县; 名称
+     */
+    private String areaName;
+
+    /**
+     * 乡镇街道; 名称
+     */
+    private String townName;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private Double lng;
+
+    /**
+     * 纬度
+     */
+    private Double lat;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+}

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

@@ -20,6 +20,7 @@ import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
+import com.njzscloud.supervisory.biz.pojo.result.StationResult;
 import com.njzscloud.supervisory.config.AppProperties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -179,18 +180,20 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
             aStatus = auditStatus.getVal();
         }
         String companyName = searchCompanyParam.getCompanyName();
+        String stationName = searchCompanyParam.getStationName();
         String legalRepresentative = searchCompanyParam.getLegalRepresentative();
         Integer station = searchCompanyParam.getStation();
         return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
 //                .eq("a.station", Boolean.FALSE)
-                .eq("a.deleted", 0)
+                        .eq("a.deleted", 0)
-                .eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
+                        .eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
                         .eq(station != null, "a.station", station)
 //                .eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
-                .in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
+                        .in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
-                .like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
+                        .like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
-                .like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)
+                        .like(StrUtil.isNotBlank(stationName), "a.station_name", stationName)
-                .like(StrUtil.isNotBlank(uscc), "a.uscc", uscc)
+                        .like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)
+                        .like(StrUtil.isNotBlank(uscc), "a.uscc", uscc)
         ));
 
     }
@@ -215,7 +218,7 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
         }
     }
 
-    public List<BizCompanyEntity> station() {
+    public List<StationResult> station(Double lng, Double lat) {
-        return this.list(Wrappers.<BizCompanyEntity>lambdaQuery().eq(BizCompanyEntity::getStation, Boolean.TRUE));
+        return baseMapper.station(lng, lat);
     }
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/constant/Constant.java

@@ -15,4 +15,8 @@ public interface Constant {
      * 监管角色
      */
     String ROLE_JG = "ROLE_JG";
+    /**
+     * 准运证编号规则
+     */
+    String CERTIFICATE_SN_CODE = "Certificate-SN";
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java

@@ -46,6 +46,10 @@ public class OrderInfoEntity {
      */
     private String sn;
 
+    /**
+     * 准运证编号
+     */
+    private String certificateSn;
     /**
      * 装货地址 Id
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java

@@ -42,7 +42,10 @@ public class OrderPagingResult {
      * 订单 Id
      */
     private Long id;
-
+    /**
+     * 准运证编号
+     */
+    private String certificateSn;
     /**
      * 订单编号
      */
@@ -404,7 +407,7 @@ public class OrderPagingResult {
     /**
      * 行驶证
      */
-    private String truckLicense;
+    private List<String> truckLicense;
     private String truckPicture;
 
     /**
@@ -415,7 +418,7 @@ public class OrderPagingResult {
     /**
      * 车辆资质
      */
-    private String qualification;
+    private List<String> qualification;
 
     /**
      * 载重; 单位：吨
@@ -485,6 +488,10 @@ public class OrderPagingResult {
      * 站点名称
      */
     private String stationName;
+    /**
+     * 站点公司名称
+     */
+    private String stationCompanyName;
     private String stationAddress;
     private String stationUscc;
     private String stationContacts;

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java

@@ -2,6 +2,7 @@ package com.njzscloud.supervisory.order.pojo.result;
 
 import com.njzscloud.supervisory.biz.constant.AuditStatus;
 import com.njzscloud.supervisory.biz.constant.BizObj;
+import com.njzscloud.supervisory.biz.constant.TruckCategory;
 import com.njzscloud.supervisory.goods.contant.MoneyStrategy;
 import com.njzscloud.supervisory.order.contant.*;
 import lombok.Getter;
@@ -421,6 +422,7 @@ public class TrainBillResult {
      * 空重; 单位：吨
      */
     private Integer historyTareWeight;
+    private TruckCategory truckCategory;
 
     // endregion
 
@@ -477,6 +479,7 @@ public class TrainBillResult {
      * 站点名称
      */
     private String stationName;
+    private String stationCompanyName;
     private String stationAddress;
     private String stationUscc;
     private String stationContacts;

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -28,6 +28,7 @@ import com.njzscloud.supervisory.constant.Constant;
 import com.njzscloud.supervisory.order.contant.CheckStatus;
 import com.njzscloud.supervisory.order.contant.OrderCategory;
 import com.njzscloud.supervisory.order.contant.OrderStatus;
+import com.njzscloud.supervisory.order.contant.OrderViewType;
 import com.njzscloud.supervisory.order.mapper.OrderInfoMapper;
 import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
 import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
@@ -46,6 +47,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.njzscloud.supervisory.constant.Constant.CERTIFICATE_SN_CODE;
 import static com.njzscloud.supervisory.constant.Constant.ROLE_JG;
 
 /**
@@ -156,7 +158,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .like(StrUtil.isNotBlank(phone), "h.phone", phone)
                 .ge(startTime != null, "a.create_time", startTime)
                 .le(endTime != null, "a.create_time", endTime);
-        switch (orderPagingSearchParam.getType()) {
+        OrderViewType type = orderPagingSearchParam.getType();
+        Assert.notNull(type, () -> Exceptions.clierr("订单类型不能为空"));
+        switch (type) {
             case DaiPaiDan:
                 dispatchEW(orderPagingSearchParam, ew);
                 break;
@@ -474,13 +478,18 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             auditStatus = newAuditStatus;
         }
 
-        detail.setAuditStatus(newAuditStatus);
+        // detail.setAuditStatus(newAuditStatus);
-        detail.setAuditMemo(auditOrderParam.getAuditMemo());
+        // detail.setAuditMemo(auditOrderParam.getAuditMemo());
+        String certificateSn = null;
+        if (auditStatus == AuditStatus.TongGuo) {
+            certificateSn = SnUtil.next(CERTIFICATE_SN_CODE);
+        }
         this.updateById(new OrderInfoEntity()
                 .setId(detail.getId())
                 .setAuditStatus(auditStatus)
                 .setQuAuditUserId(quAuditUserId)
                 .setShiAuditUserId(shiAuditUserId)
+                .setCertificateSn(certificateSn)
                 .setAuditTime(LocalDateTime.now())
                 .setAuditMemo(auditOrderParam.getAuditMemo())
         );

njzscloud-svr/src/main/resources/mapper/biz/BizCompanyMapper.xml

@@ -16,4 +16,47 @@
         left join sys_user b on b.id = a.user_id
         where a.id = #{id} and a.deleted = 0
     </select>
+    <select id="station" resultType="com.njzscloud.supervisory.biz.pojo.result.StationResult">
+        SELECT id,
+        user_id,
+        station,
+        uscc,
+        company_name,
+        station_name,
+        business_license,
+        license_start_time,
+        license_end_time,
+        legal_representative,
+        province,
+        city,
+        area,
+        town,
+        province_name,
+        city_name,
+        area_name,
+        town_name,
+        address,
+        lng,
+        lat,
+        contacts,
+        phone,
+        audit_status,
+        audit_memo,
+        creator_id,
+        modifier_id,
+        create_time,
+        modify_time,
+        deleted,
+        <if test="lng != null and lat != null">
+            (6371 *
+            ACOS(COS(RADIANS(lat)) * COS(RADIANS(#{lat})) *
+            COS(RADIANS(#{lng}) - RADIANS(lng)) +
+            SIN(RADIANS(lat)) * SIN(RADIANS(#{lat}))))
+            AS distance
+        </if>
+        <if test="lng == null or lat == null">
+            NULL distance
+        </if>
+        FROM biz_company
+    </select>
 </mapper>

njzscloud-svr/src/main/resources/mapper/biz/BizTruckMapper.xml

@@ -5,6 +5,8 @@
     <resultMap id="SearchTruckResultMap" autoMapping="true" type="com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult">
         <result property="truckLicenseDate" column="truck_license_date" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
         <result property="qualificationDate" column="qualification_date" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="truckLicense" column="truck_license" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="qualification" column="qualification" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
     </resultMap>
     <select id="paging" resultMap="SearchTruckResultMap">
         SELECT

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -7,6 +7,7 @@
         SELECT a.id,
                a.sn,
                a.station_id,
+               a.certificate_sn,
                a.lane,
                a.project_id,
                a.trans_company_id,
@@ -118,7 +119,8 @@
                j.uscc,
                k.nickname checker_name,
                l.project_name,
-               m.company_name station_name,
+               m.station_name,
+               m.company_name station_company_name,
                m.address  station_address,
                m.uscc     station_uscc,
                m.contacts station_contacts,
@@ -146,6 +148,8 @@
         <result property="cargoPhoto" column="cargo_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
         <result property="checkPhoto" column="check_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
         <result property="sitePhotos" column="site_photos" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="truckLicense" column="truck_license" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="qualification" column="qualification" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
         <result property="auditStatus" column="audit_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
         <result property="orderCategory" column="order_category" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
         <result property="orderStatus" column="order_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>

z-doc/db-model/njzscloud.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "data:image/png;base64,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",
   "version": "4.9.4",
   "createdTime": "2023-4-13 11:53:52",
-  "updatedTime": "2025-9-21 16:36:57",
+  "updatedTime": "2025-9-22 14:22:41",
   "dbConns": [],
   "profile": {
     "default": {
@@ -10008,6 +10008,23 @@
           "extProps": {},
           "id": "C491D9AB-15DC-4EC1-BBEE-FB45175E3A56"
         },
+        {
+          "defKey": "certificate_sn",
+          "defName": "准运证编号",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 255,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
+          "extProps": {},
+          "id": "06E06101-D952-4F5C-9C6A-4593CA7633F8"
+        },
         {
           "defKey": "auto_order",
           "defName": "自动标识",
@@ -14007,6 +14024,23 @@
           "extProps": {},
           "id": "DA9D346A-9816-4563-90C9-8540D250ADF2"
         },
+        {
+          "defKey": "station_name",
+          "defName": "站点名称",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 255,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
+          "extProps": {},
+          "id": "369EA079-3D5F-446B-97AD-DE59A2873D1F"
+        },
         {
           "defKey": "uscc",
           "defName": "统一社会信用代码",