Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/FileDisposeLayoutEnum.java

@@ -25,7 +25,7 @@ public enum FileDisposeLayoutEnum {
     /**
      * oss按照比例缩放
      */
-    OSS_LESSEN(FileEnum.FILE_STORE_TYPE_OSS.getFileType(), "?x-oss-process=image/resize,p_12", "按百分比缩放"),
+    OSS_LESSEN(FileEnum.FILE_STORE_TYPE_OSS.getFileType(), "?x-oss-process=image/resize,p_", "按百分比缩放"),
     /**
      * 七牛云缩略图
      */

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/EntTypeEnum.java

@@ -1,6 +1,7 @@
 package com.sckw.core.model.enums;
 
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.StringUtils;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -51,4 +52,33 @@ public enum EntTypeEnum {
         }
         return String.join(Global.COMMA, entNames);
     }
+
+    /**
+     * @param entTypes 企业属性
+     * @desc 校验企业是否为托运单位（供应商、采购商、4P物流）
+     * @author zk
+     * @date 2023/10/7
+     **/
+    public static Boolean check(String entTypes) {
+        if (StringUtils.isBlank(entTypes)) {
+            return null;
+        }
+        return entTypes.contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))
+                || entTypes.contains(String.valueOf(EntTypeEnum.PURCHASER.getCode()))
+                || entTypes.contains(String.valueOf(EntTypeEnum.LOGISTICS3.getCode()));
+    }
+
+    /**
+     * @param entTypes 企业属性
+     * @desc 校验企业是否为承运单位（4P物流、3P物流）
+     * @author zk
+     * @date 2023/10/7
+     **/
+    public static Boolean carrier(String entTypes) {
+        if (StringUtils.isBlank(entTypes)) {
+            return null;
+        }
+        return entTypes.contains(String.valueOf(EntTypeEnum.LOGISTICS3.getCode()))
+                || entTypes.contains(String.valueOf(EntTypeEnum.LOGISTICS4.getCode()));
+    }
 }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/vo/FileInfoEncryptVO.java

@@ -0,0 +1,20 @@
+package com.sckw.core.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lfdc
+ * @description 文件上传返回vo
+ * @date 2023-07-04 09:07:08
+ */
+@Data
+public class FileInfoEncryptVO implements Serializable {
+
+    /**
+     * 文件加密key
+     */
+    private String fileMd5;
+
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/RegularUtils.java

@@ -53,8 +53,8 @@ public class RegularUtils {
     /**
      * 身份证
      */
-    public static final String IDCARD = "(^\\d{18}$)|(^\\d{15}$)";
-    /**
+    public static final String IDCARD = "[0-9A-Za-z]{15}|[0-9A-Za-z]{18}";
+    /**[0-9A-Za-z]{18}
      * 车牌号
      */
 //    public static final String TRUCK_NUMBER = "^[京津沪冀晋辽吉黑苏浙皖闽赣鲁豫鄂湘粤桂琼川黔云渝藏陕陇青宁新闽粤晋琼使领A_Z]{1}[A_Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$";
@@ -144,6 +144,6 @@ public class RegularUtils {
 
 
     public static void main(String[] args) {
-        System.out.println(matchs("\\d{1,8}([\\.]\\d{0,2})?", new BigDecimal("99999999.00").toString()));
+        System.out.println(matchs(IDCARD, "22883719241229935X"));
     }
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportDubboService.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportService.java

@@ -8,6 +8,7 @@ import com.sckw.transport.api.model.dto.RWaybillOrderDto;
 import com.sckw.transport.api.model.param.ContractSignLogisticsParam;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
+import com.sckw.transport.api.model.vo.RTruckMonitorVo;
 import com.sckw.transport.api.model.vo.RWaybillOrderVo;
 import java.util.List;
 import java.util.Map;
@@ -20,7 +21,7 @@ import java.util.Map;
  * @company sckw
  * @date 2023-07-17 10:06:27
  */
-public interface TransportDubboService {
+public interface TransportService {
 
     /**
      * 根据id 获取主表详情
@@ -115,4 +116,12 @@ public interface TransportDubboService {
      * @date 2023/9/6
      **/
     List<RWaybillOrderVo> findWaybillOrder(RWaybillOrderDto params);
+
+    /**
+     * @param checkEntId 托运企业ID
+     * @desc 查询托运方关联任务中的车辆
+     * @author zk
+     * @date 2023/10/8
+     **/
+    List<RTruckMonitorVo> truckInTask(Long checkEntId);
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportStatisticsService.java

@@ -10,13 +10,21 @@ package com.sckw.transport.api.dubbo;
  */
 public interface TransportStatisticsService {
     /**
-     * 统计承运接单
+     * 统计承运订单
      *
      * @param topEntId
      * @return
      */
     Integer statisticsLogistics(Long topEntId);
 
+    /**
+     * 统计托运订单
+     *
+     * @param topEntId
+     * @return
+     */
+    Integer statisticsLogisticsByConsign(Long topEntId);
+
     /**
      * 统计调度派车
      *

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/vo/RTruckMonitorVo.java

@@ -0,0 +1,51 @@
+package com.sckw.transport.api.model.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * desc 车辆监控
+ * author zk
+ * date 2023/9/5 0005
+ */
+@Data
+public class RTruckMonitorVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412406L;
+
+    /**
+     *企业id
+     */
+    private Long entId;
+
+    /**
+     *企业名称
+     */
+    private String firmName;
+
+    /**
+     *车牌号
+     */
+    private String truckNo;
+
+    /**
+     *业务状态（0空闲、1任务中）
+     */
+    private Integer businessStatus;
+
+    /**
+     *运行状态(0行驶、1停止、2离线)
+     */
+    private Integer runStatus;
+
+    public RTruckMonitorVo() {
+    }
+
+    public RTruckMonitorVo(Long entId, String truckNo, Integer businessStatus) {
+        this.entId = entId;
+        this.truckNo = truckNo;
+        this.businessStatus = businessStatus;
+    }
+}

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -27,7 +27,7 @@ import com.sckw.order.api.model.ContractSignCompletedParam;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.param.ContractSignLogisticsParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -58,7 +58,7 @@ public class CommonBusinessService {
     private TradeOrderInfoService tradeOrderInfoService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     @Autowired
     private KwcContractTradeMapper kwcContractTradeMapper;

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -1,15 +1,18 @@
 package com.sckw.file.controller;
 
+import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
 import com.sckw.file.dubbo.FileDubboApiServiceImpl;
+import com.sckw.file.model.param.FileImageParam;
 import com.sckw.file.service.FileService;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
@@ -155,7 +158,7 @@ public class FileApiController {
      * @param file
      * @return
      */
-    @RequestMapping(value = "/uploadFileEncrypt", method = RequestMethod.POST)
+    @RequestMapping(value = "/uploadFileEncrypt", method = RequestMethod.POST,produces = "application/json")
     public HttpResult uploadFileEncrypt(@NotNull @RequestParam("file") MultipartFile file) {
         try {
             return fileService.uploadFileEncrypt(file);
@@ -181,6 +184,16 @@ public class FileApiController {
         }
     }
 
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RequestMapping(name = "通过key获取地址",value = "/getImage",method = RequestMethod.POST)
+    public HttpResult getImage(@RequestBody @Valid FileImageParam fileImageParam){
+        try {
+            return fileService.getImage(fileImageParam);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * dubbo接收文件信息保存至数据库
      *

sckw-modules/sckw-file/src/main/java/com/sckw/file/model/param/FileImageParam.java

@@ -0,0 +1,41 @@
+package com.sckw.file.model.param;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 文件查询图片数据
+ * @date 2023-10-08 09:10:00
+ */
+@Data
+public class FileImageParam {
+
+    /**
+     * 文件key
+     */
+    @NotBlank(message = "文件key不能为空")
+    private String fileKey;
+
+    /**
+     * 指定目标缩放图的宽度
+     */
+    private String fileWidth;
+
+    /**
+     * 指定目标缩放图的高度
+     */
+    private String fileHeight;
+
+    /**
+     * 是否缩放展示
+     */
+    @NotNull(message = "是否缩放展示不能为空")
+    private boolean isLessen;
+
+    /**
+     * 缩放比例
+     */
+    private String lessenRatio;
+}

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -2,11 +2,13 @@ package com.sckw.file.service;
 
 
 import com.aliyun.oss.model.OSSObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.FileDisposeLayoutEnum;
 import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.model.file.FileInfo;
+import com.sckw.core.model.vo.FileInfoEncryptVO;
 import com.sckw.core.model.vo.FileInfoVO;
 import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.IdWorker;
@@ -21,6 +23,7 @@ import com.sckw.file.dao.KwsFileEncryptDao;
 import com.sckw.file.dao.KwsFileInfoDao;
 import com.sckw.file.model.kwfFileEncrypt;
 import com.sckw.file.model.kwfFileInfo;
+import com.sckw.file.model.param.FileImageParam;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -57,6 +60,8 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class FileService {
 
+    final static String IMG_FORMAT = "png_jpg_bmp_gif_tif_jpeg_PNG_JPG_BMP_GIF_TIF_JPEG_HEIC_heic";
+
     @Autowired
     KwsFileInfoDao fileInfoDao;
 
@@ -254,7 +259,7 @@ public class FileService {
         return null;
     }
 
-    public HttpResult uploadFileInfo(MultipartFile file){
+    public HttpResult uploadFileInfo(MultipartFile file) {
         boolean flag = checkFileFormat(file);
         if (!flag) {
             throw new RuntimeException("上传文件格式错误!");
@@ -349,10 +354,10 @@ public class FileService {
         insertFile(returnFileInfo, isImage);
         /**存储到加密属性文件信息*/
         String fileMd5 = returnFileInfo.getFileMd5();
-        String filePath = returnFileInfo.getFilePath();
-        FileInfoVO vo = new FileInfoVO();
+//        String filePath = returnFileInfo.getFilePath();
+        FileInfoEncryptVO vo = new FileInfoEncryptVO();
         vo.setFileMd5(fileMd5);
-        vo.setFilePath(filePath);
+//        vo.setFilePath(filePath);
 //        insertFileEncrypt(fileMd5, filePath, FileEnum.FILE_STORE_TYPE_OSS, isImage);
         return HttpResult.ok(vo);
     }
@@ -403,11 +408,51 @@ public class FileService {
         insertFile(returnFileInfo, isImage);
         /**存储到加密属性文件信息*/
         String fileMd5 = returnFileInfo.getFileMd5();
-        String filePath = returnFileInfo.getFilePath();
+//        String filePath = returnFileInfo.getFilePath();
 //        insertFileEncrypt(fileMd5, filePath, FileEnum.FILE_STORE_TYPE_OSS, isImage);
-        FileInfoVO vo = new FileInfoVO();
+        FileInfoEncryptVO vo = new FileInfoEncryptVO();
         vo.setFileMd5(fileMd5);
-        vo.setFilePath(filePath);
+//        vo.setFilePath(filePath);
         return HttpResult.ok(Status.SUCCESS.getCode(), "", vo);
     }
+
+    public HttpResult getImage(FileImageParam fileImageParam) {
+        String lessenRatio = fileImageParam.getLessenRatio();
+        String fileHeight = fileImageParam.getFileHeight();
+        String fileWidth = fileImageParam.getFileWidth();
+        boolean flag = true;
+        if (fileImageParam.isLessen()) {
+            if (org.apache.commons.lang3.StringUtils.isBlank(lessenRatio)) {
+                lessenRatio = String.valueOf(NumberConstant.TWELVE);
+            }
+        } else {
+            flag = false;
+            if (org.apache.commons.lang3.StringUtils.isBlank(fileHeight)) {
+                fileHeight = String.valueOf(NumberConstant.TWO_HUNDRED);
+
+            }
+            if (org.apache.commons.lang3.StringUtils.isBlank(fileWidth)) {
+                fileWidth = String.valueOf(NumberConstant.TWO_HUNDRED);
+            }
+        }
+        String returnImageAddress = FileUtils.getOSSAddressPrefix();
+        LambdaQueryWrapper<kwfFileInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(com.sckw.file.model.kwfFileInfo::getMd5, fileImageParam.getFileKey())
+                .orderByDesc(kwfFileInfo::getCreateTime);
+        kwfFileInfo kwfFileInfo = fileInfoDao.selectList(
+                wrapper).get(0);
+        if (IMG_FORMAT.indexOf(kwfFileInfo.getFileSuffix()) == -1) {
+            returnImageAddress = returnImageAddress + kwfFileInfo.getFilePath();
+        } else {
+            if (flag) {
+                returnImageAddress = returnImageAddress + kwfFileInfo.getFilePath()
+                        + FileDisposeLayoutEnum.OSS_LESSEN.getParameter() + lessenRatio;
+            } else {
+                returnImageAddress = returnImageAddress + kwfFileInfo.getFilePath()
+                        + FileDisposeLayoutEnum.OSS_ABBREVIATE_LEFT.getParameter() + fileHeight
+                        + FileDisposeLayoutEnum.OSS_ABBREVIATE_RIGHT.getParameter() + fileWidth;
+            }
+        }
+        return HttpResult.ok("",returnImageAddress);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckMonitorVo.java

@@ -2,13 +2,18 @@ package com.sckw.fleet.model.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * desc 车辆监控
  * author zk
  * date 2023/9/5 0005
  */
 @Data
-public class KwfTruckMonitorVo {
+public class KwfTruckMonitorVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412416L;
 
     /**
      *企业id
@@ -35,4 +40,12 @@ public class KwfTruckMonitorVo {
      */
     private Integer runStatus;
 
+    public KwfTruckMonitorVo() {
+    }
+
+    public KwfTruckMonitorVo(Long entId, String truckNo, Integer businessStatus) {
+        this.entId = entId;
+        this.truckNo = truckNo;
+        this.businessStatus = businessStatus;
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -357,7 +357,7 @@ public class KwfDriverService {
         /**车队班组绑定**/
         driverFleetEdit(driver.getId(), params.getFleetId());
 
-        return HttpResult.ok("司机信息新增成功！", driver);
+        return HttpResult.ok(result.getMsg(), driver);
     }
 
     /**
@@ -412,7 +412,7 @@ public class KwfDriverService {
         /**车队班组绑定**/
         driverFleetEdit(driver.getId(), params.getFleetId());
 
-        return HttpResult.ok("司机信息修改成功！");
+        return HttpResult.ok(result.getMsg());
     }
 
     /**
@@ -463,14 +463,13 @@ public class KwfDriverService {
                 params.setSalt(PasswordUtils.getSaltSubPwd(password));
                 params.setPassword(password);
                 params.setEntId(LoginUserHolder.getEntId());
-                params.setEntId(params.getEntId() == null ? 1 : params.getEntId());// 暂时处理---------------zk
                 params.setBusinessStatus(Global.NO);
                 params.setStatus(Global.NO);
                 int count = driverDao.insert(params);
 
                 /**司机信息与企业关联信息**/
                 driverEntEdit(params);
-                return count > 0 ? HttpResult.ok(params) : HttpResult.error("司机信息新增失败！");
+                return count > 0 ? HttpResult.ok("司机信息新增成功！", params) : HttpResult.error("司机信息新增失败！");
             } else {
                 KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
                 BeanUtils.copyPropertiesValue(params, driver);
@@ -481,7 +480,7 @@ public class KwfDriverService {
                 driverEnt.setEntId(LoginUserHolder.getEntId());
                 driverEnt.setId(driver.getId());
                 driverEntEdit(driverEnt);
-                return count > 0 ? HttpResult.ok(driver) : HttpResult.error("司机信息新增失败！");
+                return count > 0 ? HttpResult.ok("司机信息修改成功！", driver) : HttpResult.error("司机信息修改失败！");
             }
         } else {
             /**唯一性交易**/
@@ -494,7 +493,7 @@ public class KwfDriverService {
 
             /**更新**/
             int count = driverDao.updateById(params);
-            return count > 0 ? HttpResult.ok(params) : HttpResult.error("司机信息修改失败！");
+            return count > 0 ? HttpResult.ok("司机信息修改成功！", params) : HttpResult.error("司机信息修改失败！");
         }
     }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -10,6 +10,7 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.utils.*;
@@ -28,8 +29,9 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.RWaybillOrderDto;
+import com.sckw.transport.api.model.vo.RTruckMonitorVo;
 import com.sckw.transport.api.model.vo.RWaybillOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -68,8 +70,8 @@ public class KwfTruckService {
     KwfFleetTruckMapper fleetTruckDao;
     @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
     private RemoteSystemService remoteSystemService;
-    @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
-    private TransportDubboService transportDubboService;
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    private TransportService transportDubboService;
 
     /**
      * @param key 主键id
@@ -338,7 +340,7 @@ public class KwfTruckService {
         /**车队班组绑定**/
         truckFleetEdit(truck.getId(), params.getFleetId());
 
-        return HttpResult.ok("车辆信息新增成功！", truck);
+        return HttpResult.ok(result.getMsg(), truck);
     }
 
     /**
@@ -450,7 +452,7 @@ public class KwfTruckService {
                 truckEnt.setEntId(LoginUserHolder.getEntId());
                 truckEnt.setId(truck.getId());
                 truckEntEdit(truckEnt);
-                return count > 0 ? HttpResult.ok(truck) : HttpResult.error("车辆信息新增失败！");
+                return count > 0 ? HttpResult.ok("车辆信息修改成功！", truck) : HttpResult.error("车辆信息修改失败！");
             }
         } else {
             /**唯一性交易**/
@@ -463,7 +465,7 @@ public class KwfTruckService {
 
             /**更新**/
             int count = truckDao.updateById(params);
-            return count > 0 ? HttpResult.ok(params) : HttpResult.error("车辆信息修改失败！");
+            return count > 0 ? HttpResult.ok("车辆信息修改成功！", params) : HttpResult.error("车辆信息修改失败！");
         }
     }
 
@@ -733,15 +735,34 @@ public class KwfTruckService {
      * @date 2023/9/6
      **/
     public List<KwfTruckMonitorVo> findTruckMonitor(Map params) {
-        List<KwfTruckMonitorVo> trucks = new ArrayList<>();
+        //企业PC/APP
         if (LoginUserHolder.getSystemType() == SystemTypeEnum.COMPANY.getCode()) {
-            params.put("entId", LoginUserHolder.getEntId());
-            trucks = truckDao.findTruckByEnt(params);
+            List<KwfTruckMonitorVo> trucks = new ArrayList<>();
+            //企业属性
+            String entTypes = LoginEntHolder.get().getEntTypes();
+            //承运方
+            Boolean bool = EntTypeEnum.carrier(entTypes);
+            if (bool != null && bool) {
+                params.put("entId", LoginUserHolder.getEntId());
+                List<KwfTruckMonitorVo> carrierTrucks = truckDao.findTruckByEnt(params);
+                trucks.addAll(carrierTrucks);
+            }
+
+            //托运方
+            bool = EntTypeEnum.check(entTypes);
+            if (bool != null && bool) {
+                List<RTruckMonitorVo> checkTrucks = transportDubboService.truckInTask(LoginUserHolder.getEntId());
+                checkTrucks.forEach(order -> trucks.add(new KwfTruckMonitorVo(order.getEntId(), order.getTruckNo(), Global.NUMERICAL_ONE)));
+            }
+
+            return trucks;
         }
+
+        //运营端
         if (LoginUserHolder.getSystemType() == SystemTypeEnum.MANAGE.getCode()) {
-            trucks = truckDao.findTruckByAll(params);
+            return truckDao.findTruckByAll(params);
         }
-        return trucks;
+        return new ArrayList<>();
     }
 
     /**

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -348,7 +348,7 @@
 
     <select id="findTruckByEnt" resultType="com.sckw.fleet.model.vo.KwfTruckMonitorVo" >
         SELECT
-            kt.truck_no, kt.business_status businessStatus, kte.ent_id entId
+            kt.truck_no truckNo, kt.business_status businessStatus, kte.ent_id entId
         from kwf_truck kt
         left join kwf_truck_ent kte on kte.truck_id = kt.id
         where kt.del_flag = 0 and kte.del_flag = 0

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -1,12 +1,8 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CooperateStatusEnum;
@@ -25,29 +21,26 @@ import com.sckw.manage.dao.KwmCooperateMapper;
 import com.sckw.manage.dao.KwmCooperateTypeMapper;
 import com.sckw.manage.model.dto.req.CooperateManageQueryReqDto;
 import com.sckw.manage.model.dto.res.CooperateManageQueryResDto;
-import com.sckw.manage.model.entity.KwmAddress;
 import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.entity.KwmCooperateType;
-import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.report.CooperateManageExport;
 import com.sckw.manage.model.report.QueryAllCooperateInfoExcel;
 import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.model.vo.res.*;
+import com.sckw.order.api.dubbo.TradeOrderInfoService;
+import com.sckw.payment.api.dubbo.PaymentDubboService;
 import com.sckw.payment.api.model.constant.OrderEnum;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
-import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.FindEntUserResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
-import com.sckw.payment.api.dubbo.PaymentDubboService;
-import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.transport.api.dubbo.TransportService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -84,7 +77,7 @@ public class KwmCooperateManageService {
     private TradeOrderInfoService tradeOrderInfoService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private PaymentDubboService paymentDubboService;

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -49,7 +49,7 @@ import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.KwsRoleResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -91,7 +91,7 @@ public class KwoTradeOrderService {
     private PaymentDubboService paymentDubboService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     private final KwoTradeOrderMapper kwoTradeOrderMapper;
     private final StreamBridge streamBridge;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -32,7 +32,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.AccountCheckingBindDTO;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -72,7 +72,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     private void changeDict(List<? extends ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -41,7 +41,7 @@ import com.sckw.redis.constant.RedisConstant;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.annotation.Resource;
@@ -90,7 +90,7 @@ public class KwpSettlementWalletService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
     private final KwpSettlementLogisticsTrackMapper kwpSettlementLogisticsTrackMapper;
     @Resource
     private KwpLedgerTradeService kwpLedgerTradeService;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/LedgerLogisticsService.java

@@ -23,7 +23,7 @@ import com.sckw.payment.service.KwpLedgerLogisticsOrderService;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +48,7 @@ public class LedgerLogisticsService extends AbsLedger {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     private void changeDict(List<? extends ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/SettlementWalletService.java

@@ -12,7 +12,7 @@ import com.sckw.payment.model.vo.req.SettlementWalletReq;
 import com.sckw.payment.model.vo.res.SettlementWalletVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -42,7 +42,7 @@ public class SettlementWalletService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
     private final KwpSettlementLogisticsTrackMapper kwpSettlementLogisticsTrackMapper;
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -357,7 +357,7 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
 
     List<Long> statisticsLogistics(@Param("topEntId") Long topEntId);
 
-    Integer statisticsLogisticsByTopEntIdAndOrderStatus(@Param("topEntId") Long topEntId, @Param("orderList") List<Integer> orderList);
+    Integer statisticsLogisticsByTopEntIdAndOrderStatus(@Param("topEntId") Long topEntId, @Param("orderList") List<Integer> orderList,@Param("unitType") String unitType);
 
     /**
      * @param statusList 单据状态集合

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportDubboServiceImpl.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -28,7 +28,7 @@ import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.AccountCheckingBindDTO;
 import com.sckw.transport.api.model.dto.AddressResDTO;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
@@ -36,17 +36,20 @@ import com.sckw.transport.api.model.dto.RWaybillOrderDto;
 import com.sckw.transport.api.model.param.ContractSignLogisticsParam;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
+import com.sckw.transport.api.model.vo.RTruckMonitorVo;
 import com.sckw.transport.api.model.vo.RWaybillOrderVo;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.service.CommonService;
 import jakarta.annotation.Resource;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.function.StreamBridge;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -59,9 +62,9 @@ import java.util.stream.Collectors;
  * @date 2023-07-11 14:07:28
  */
 @Slf4j
-//@Service
+@Service
 @DubboService(group = "design", version = "1.0.0", timeout = 50000)
-public class TransportDubboServiceImpl implements TransportDubboService {
+public class TransportServiceImpl implements TransportService {
 
     @Autowired
     public CommonService commonService;
@@ -624,4 +627,59 @@ public class TransportDubboServiceImpl implements TransportDubboService {
 
         return waybillOrderVos;
     }
+
+    /**
+     * @param checkEntId 托运企业ID
+     * @desc 查询托运方关联任务中的车辆
+     * @author zk
+     * @date 2023/10/8
+     **/
+    @Override
+    public List<RTruckMonitorVo> truckInTask(Long checkEntId) {
+        //查询物流订单
+        List<Long> orderIds = new ArrayList<>();
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("status", LogisticsOrderEnum.IN_TRANSIT.getCode());
+            put("checkEntId", checkEntId);
+        }};
+        List<KwtLogisticsOrder> orders = logisticsOrderMapper.findLogisticsOrder(params);
+        if (!CollectionUtils.isEmpty(orders)) {
+            List<Long> idList = new ArrayList<>();
+            orders.forEach(order -> idList.add(order.getId()));
+            orderIds.addAll(idList);
+            findLogisticsOrderChild(orderIds, StringUtil.join(idList, Global.COMMA));
+        }
+
+        //查询运单
+        List<RTruckMonitorVo> trucks = new ArrayList<>();
+        params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("busStatus", Global.NUMERICAL_THREE);
+            put("lOrderIds", orderIds);
+        }};
+        List<KwtWaybillOrder> waybillOrders = waybillOrderDao.findWaybillOrder(params);
+        waybillOrders.forEach(order -> trucks.add(new RTruckMonitorVo(order.getEntId(), order.getTruckNo(), Global.NUMERICAL_ONE)));
+        return trucks;
+    }
+
+    /**
+     * @param orderIds 物流订单ID集合
+     * @param ids 当前物流订单ID
+     * @desc 查询下级分包 物流订单
+     * @author zk
+     * @date 2023/10/8
+     **/
+    public void findLogisticsOrderChild(List<Long> orderIds, String ids) {
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("status", LogisticsOrderEnum.IN_TRANSIT.getCode());
+            put("pid", ids);
+        }};
+        //查询物流订单
+        List<KwtLogisticsOrder> orders = logisticsOrderMapper.findLogisticsOrder(params);
+        if (!CollectionUtils.isEmpty(orders)) {
+            List<Long> idList = new ArrayList<>();
+            orders.forEach(order -> idList.add(order.getId()));
+            orderIds.addAll(idList);
+            findLogisticsOrderChild(orderIds, StringUtil.join(idList, Global.COMMA));
+        }
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportStatisticsServiceImpl.java

@@ -9,6 +9,7 @@ import com.sckw.transport.dao.KwtWaybillOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -20,6 +21,7 @@ import java.util.List;
  * @date 2023-09-08 11:09:34
  */
 @Slf4j
+@Service
 @DubboService(group = "design", version = "1.0.0")
 public class TransportStatisticsServiceImpl implements TransportStatisticsService {
 
@@ -97,7 +99,26 @@ public class TransportStatisticsServiceImpl implements TransportStatisticsServic
         orderList.add(LogisticsOrderEnum.HAVE_FINISHED.getCode());
         orderList.add(LogisticsOrderEnum.HAVE_RECONCILED.getCode());
         orderList.add(LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getCode());
-        Integer count = logisticsOrderMapper.statisticsLogisticsByTopEntIdAndOrderStatus(topEntId, orderList);
+        Integer count = logisticsOrderMapper.statisticsLogisticsByTopEntIdAndOrderStatus(topEntId, orderList,"2");
+        return count;
+    }
+
+    /**
+     * 统计托运订单数量
+     *
+     * @param topEntId 集团企业id
+     * @return
+     */
+    @Override
+    public Integer statisticsLogisticsByConsign(Long topEntId) {
+        //统计维度
+        List<Integer> orderList = new ArrayList<>();
+        orderList.add(LogisticsOrderEnum.WAIT_DELIVERY.getCode());
+        orderList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
+        orderList.add(LogisticsOrderEnum.HAVE_FINISHED.getCode());
+        orderList.add(LogisticsOrderEnum.HAVE_RECONCILED.getCode());
+        orderList.add(LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getCode());
+        Integer count = logisticsOrderMapper.statisticsLogisticsByTopEntIdAndOrderStatus(topEntId, orderList,"1");
         return count;
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddOrderDTO.java

@@ -113,7 +113,7 @@ public class AddOrderDTO {
      */
     @NotNull(message = "运价方式不能为空")
     @Min(value = 0, message = "必须大于等于{value}")
-    @Max(value = 6, message = "必须小于等于{value}")
+    @Max(value = 10, message = "必须小于等于{value}")
     private Long priceType;
 
     /**
@@ -222,7 +222,7 @@ public class AddOrderDTO {
      */
     @NotNull(message = "签约方式不能为空")
     @Min(value = 0, message = "签约方式必须大于等于{value}")
-    @Max(value = 4, message = "签约方式必须小于等于{value}")
+    @Max(value = 10, message = "签约方式必须小于等于{value}")
     private String signingWay;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OperateSendCarDto.java

@@ -62,8 +62,8 @@ public class OperateSendCarDto {
      * 操作时间
      */
     @JsonProperty("operateTime")
-    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @NotNull(message = "时间不能为空")
     private Date operateTime;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OperateWaybillDto.java

@@ -28,8 +28,8 @@ public class OperateWaybillDto {
      * 操作时间
      */
     @JsonProperty("operateTime")
-    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @NotNull(message = "时间不能为空")
     private Date operateTime;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderTicketDto.java

@@ -65,8 +65,8 @@ public class WaybillOrderTicketDto {
      * 操作时间
      */
     @JsonProperty("operateTime")
-    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @NotNull(message = "时间不能为空")
     private Date operateTime;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderTicketV1Dto.java

@@ -46,8 +46,8 @@ public class WaybillOrderTicketV1Dto {
      * 操作时间
      */
     @JsonProperty("loadOperateTime")
-    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @NotNull(message = "装货时间不能为空")
     private Date loadOperateTime;
 
@@ -70,8 +70,8 @@ public class WaybillOrderTicketV1Dto {
      * 操作时间
      */
     @JsonProperty("unloadOperateTime")
-    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @NotNull(message = "卸货时间不能为空")
     private Date unloadOperateTime;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/execlVo/ConsignOrderExcelVo.java

@@ -54,7 +54,7 @@ public class ConsignOrderExcelVo implements Serializable {
      * 任务总量
      */
     @ExcelProperty(value = "任务总量")
-    private BigDecimal carryingCapacity;
+    private String carryingCapacity;
 
     /**
      * 待分配量(amount-subcontract_amount-entrust_amount)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/execlVo/ManagementLogisticsOrderExcelVo.java

@@ -42,12 +42,6 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "托运订单号")
     private String lOrderNo;
 
-    /**
-     * 订单来源
-     */
-    @ExcelProperty(value = "订单来源")
-    private String orderSourceLabel;
-
     /**
      * 托运单位
      */
@@ -126,6 +120,12 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "地址明细")
     private String unloadAddress;
 
+    /**
+     * 订单来源
+     */
+    @ExcelProperty(value = "订单来源")
+    private String orderSourceLabel;
+
     /**
      * 发货单位
      */

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

@@ -2006,6 +2006,7 @@ public class ConsignOrderService {
         for (ConsignOrderVO vo : list) {
             ConsignOrderExcelVo consignOrderExcelVo = new ConsignOrderExcelVo();
             BeanUtils.copyProperties(vo, consignOrderExcelVo);
+            consignOrderExcelVo.setCarryingCapacity(vo.getCarryingCapacity().toString());
             consignOrderExcelVo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
             consignOrderExcelVo.setPriceLabel(vo.getPrice() == null ? null : vo.getPrice().toString() + priceType.get(vo.getPriceType()));
             consignOrderExcelVo.setLossUnitLabel(vo.getLoss() == null ? null : vo.getLoss().toString() + taxRate.get(vo.getLossUnit()));

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

@@ -40,6 +40,7 @@ import com.sckw.transport.model.vo.WaybillCountVo;
 import com.sckw.transport.model.vo.WaybillOrderDriverVo;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -2543,7 +2544,6 @@ public class KwtWaybillOrderService {
 
     /**
      * 承运订单-托运订单-订单详情数据统计
-     *
      * @param orderId
      * @param type
      * @return
@@ -2562,7 +2562,6 @@ public class KwtWaybillOrderService {
 
     /**
      * 承运数据统计
-     *
      * @param orderId
      * @return
      */
@@ -2605,7 +2604,6 @@ public class KwtWaybillOrderService {
 
     /**
      * 托运数据统计
-     *
      * @param orderId
      * @return
      */
@@ -2649,7 +2647,6 @@ public class KwtWaybillOrderService {
 
     /**
      * 查询已排量、待运量数据
-     *
      * @param orderId 物流订单id
      * @return
      */

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

@@ -93,7 +93,7 @@ public class WaybillManagementService {
         Criteria criteria = new Criteria();
         //criteria.and("wOrderId").is(id);
         criteria.and("_id").is(id);
-        criteria.and("entId").is(LoginUserHolder.getEntId());
+//        criteria.and("entId").is(LoginUserHolder.getAuthUserIdList());
         criteria.and("delFlag").is(NumberConstant.ZERO);
         Query queryFormat = new Query(criteria);
         SckwWaybillOrder info = mongoTemplate.findOne(queryFormat, SckwWaybillOrder.class);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -787,6 +787,12 @@
         <if test="id != null and id != ''">
             and id = #{id, jdbcType=BIGINT}
         </if>
+        <if test="pid != null and pid != ''">
+            and pid in (#{pid, jdbcType=VARCHAR})
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{status, jdbcType=INTEGER}
+        </if>
         <if test="upperlOrderId != null and upperlOrderId != ''">
             and FIND_IN_SET(#{upperlOrderId, jdbcType=BIGINT}, pids)
         </if>
@@ -802,8 +808,11 @@
                 or FIND_IN_SET(id, #{currentlOrderId, jdbcType=VARCHAR})
             )
         </if>
-
+        <if test="checkEntId != null and checkEntId != ''">
+            and id in (select l_order_id from kwt_logistics_order_unit where unit_type = 1 and top_ent_id = #{checkEntId, jdbcType=BIGINT})
+        </if>
     </select>
+
     <select id="selectOrderCountByTorderId" resultType="com.sckw.transport.model.dto.LogisticsOrderDTO">
         SELECT a.id          as lOrderId,
                a.l_order_no  as lOrderNo,
@@ -1888,6 +1897,7 @@
         <if test="topEntId != null and topEntId != ''">
             AND ( b.ent_id = #{topEntId} OR b.top_ent_id = #{topEntId} )
         </if>
+        AND b.unit_type=#{unitType}
         And a.status in
         <foreach collection="orderList" open="(" close=")" separator="," item="item">
             #{item}
@@ -2603,4 +2613,5 @@
             and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
         </if>
     </select>
+
 </mapper>

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -644,7 +644,7 @@
         kwo.id worderId, kwo.w_order_no worderNo, kwo.l_order_id lOrderId, kwo.type, kwo.ent_id carrierEntId, kwo.start_time startTime,
         kwo.end_time endTime, kwo.entrust_amount entrustAmount, kwo.load_amount loadAmount, kwo.unload_amount unloadAmount,
         kwo.deficit_amount deficitAmount, kwo.deficit_price deficitPrice, kwo.truck_id truckId, kwo.truck_no truckNo, kwo.status,
-        kwo.create_time createTime, kwo.driver_id driverId, kwo.driver_name driverName, kwo.driver_phone driverPhone
+        kwo.create_time createTime, kwo.driver_id driverId, kwo.driver_name driverName, kwo.driver_phone driverPhone, kwo.ent_id entId
         FROM kwt_waybill_order kwo
         where kwo.del_flag = 0
         <if test="tOrderId != null and tOrderId != ''">
@@ -671,6 +671,14 @@
         <if test="busStatus != null and busStatus == 4">
             and kwo.status in (7, 8, 9, 10, 12, 13)
         </if>
+        <choose>
+            <when test="lOrderIds != null and lOrderIds != '' and lOrderIds.size() > 0">
+                and kwo.l_order_id in
+                <foreach collection="lOrderIds" item="lOrderId" open="(" close=")" separator=",">
+                    #{lOrderId,jdbcType=BIGINT}
+                </foreach>
+            </when>
+        </choose>
     </select>
 
     <select id="selectInvalidWaybillOrderCarListGroupByTruckNo" resultType="com.sckw.transport.model.dto.OrderCarDTO">