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

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/translate/enums/Source.java

@@ -24,7 +24,7 @@ public enum Source {
     /**
      * 枚举值
      */
-    ENUMS("com.sckw.core.model.enums");
+    ENUMS("com.sckw.excel.translate.context.Enums");
 
     private String clazz;
 
@@ -47,9 +47,9 @@ public enum Source {
         if (clazzName.equals(ENUMS.getClazz())) {
             return ENUMS;
         }
-        if (clazzName.equals(TEST.getClazz())) {
-            return TEST;
-        }
+//        if (clazzName.equals(TEST.getClazz())) {
+//            return TEST;
+//        }
         return null;
     }
 }

sckw-common/sckw-common-log/src/main/java/com/sckw/log/aspect/LogInfoAspect.java

@@ -37,7 +37,7 @@ public class LogInfoAspect {
 
     public static final String TIME_PATTERN = "yyyy-MM-dd HH:mm:ss:SSS";
 
-    @Pointcut("execution(* com.sckw.*.controller.*.*(..))")
+    @Pointcut("execution(* com.sckw.*.controller..*.*(..))")
     public void cutController() {
     }
 
@@ -47,7 +47,7 @@ public class LogInfoAspect {
 
     }
 
-    @Pointcut("execution(* com.sckw.*.dubbo.*.*(..))")
+    @Pointcut("execution(* com.sckw.*.dubbo..*.*(..))")
     public void cutDubbo() {
     }
 
@@ -97,7 +97,7 @@ public class LogInfoAspect {
         return result;
     }
 
-    @Pointcut("execution(* com.sckw.*.service.*.*(..))")
+    @Pointcut("execution(* com.sckw.*.service..*.*(..))")
     public void cutService() {
     }
 

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwWaybillOrder.java

@@ -137,7 +137,7 @@ public class SckwWaybillOrder{
     private Date unloadTime;
 
     /**
-     * 循环/趟次
+     * 1循环/2趟次
      */
     private Integer type;
 

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

@@ -644,7 +644,7 @@ public class KwcContractLogisticsService {
         List<KwcContractLogistics> kwcContractLogistics = kwcContractLogisticsMapper.selectBatchIds(contractIdList);
         Date date = new Date();
         kwcContractLogistics.forEach(item -> {
-            if (item.getStatus() != ContractStatusEnum.SAVE.getCode()) {
+            if (!item.getStatus().equals(ContractStatusEnum.SAVE.getCode())) {
                 throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_022);
             }
             item.setDelFlag(Global.YES);

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

@@ -717,10 +717,10 @@ public class KwcContractTradeService {
         List<KwcContractTrade> kwcContractTradeList = kwcContractTradeMapper.selectBatchIds(contractIdList);
         Date date = new Date();
         kwcContractTradeList.forEach(item -> {
-            if (item.getStatus() != ContractStatusEnum.SAVE.getCode()) {
+            if (!item.getStatus().equals(ContractStatusEnum.SAVE.getCode())) {
                 throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_022);
             }
-            item.setStatus(ContractStatusEnum.COMPLETE.getCode());
+            item.setDelFlag(Global.YES);
             item.setUpdateBy(LoginUserHolder.getUserId());
             item.setUpdateTime(date);
             if (kwcContractTradeMapper.updateById(item) <= 0) {
@@ -759,8 +759,8 @@ public class KwcContractTradeService {
         }
 
         List<QueryListResVo> list = getQueryListResVos(queryListResDtos);
-        List<LogisticsListExport> dataList = BeanUtils.copyToList(list, LogisticsListExport.class);
-        ExcelUtil.downData(response, LogisticsListExport.class, dataList);
+        List<TradeListExport> dataList = BeanUtils.copyToList(list, TradeListExport.class);
+        ExcelUtil.downData(response, TradeListExport.class, dataList);
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -10,10 +10,10 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.ResponseUtil;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.fleet.model.dto.*;
-import com.sckw.fleet.model.vo.*;
+import com.sckw.fleet.model.vo.KwfDriverDetailVo;
+import com.sckw.fleet.model.vo.KwfDriverVo;
 import com.sckw.fleet.service.KwfDriverService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -23,7 +23,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -124,7 +123,7 @@ public class KwfDriverController {
 
     /**
      * @param params 查询参数
-     * @desc 导出
+     * @desc 司机导出
      * @author zk
      * @date 2023/07/11
      **/

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -8,21 +8,19 @@ 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.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.ResponseUtil;
-import com.sckw.excel.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.fleet.model.dto.GpsByTruckNoDto;
 import com.sckw.fleet.model.dto.KwfTransportLicenseDto;
 import com.sckw.fleet.model.dto.KwfTruckDto;
 import com.sckw.fleet.model.dto.KwfTruckLicenseDto;
-import com.sckw.fleet.model.vo.*;
+import com.sckw.fleet.model.vo.KwfTruckDetailVo;
+import com.sckw.fleet.model.vo.KwfTruckVo;
 import com.sckw.fleet.service.KwfTruckService;
 import com.sckw.system.api.RemoteSystemService;
 import jakarta.servlet.http.HttpServletResponse;
@@ -32,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -135,7 +134,7 @@ public class KwfTruckController {
 
     /**
      * @param params 查询参数
-     * @desc 导出
+     * @desc 车辆档案-导出
      * @author zk
      * @date 2023/07/11
      **/

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverMapper.java

@@ -1,8 +1,6 @@
 package com.sckw.fleet.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckw.fleet.model.KwfDriver;
 import com.sckw.fleet.model.vo.KwfDriverVo;
 import com.sckw.fleet.model.vo.KwfTableTopCount;

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -16,6 +16,7 @@ import com.sckw.fleet.model.KwfTruck;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -45,13 +46,15 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
     public Map<Long, RDriverVo> findDriver(List<Long> driverIds) {
         /**获取数据**/
         Map<Long, RDriverVo> driverMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        List<Map<String, Object>> drivers = driverDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("ids", driverIds);}});
+        List<Map<String, Object>> drivers = driverDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+            put("ids", driverIds);
+        }});
         if (CollectionUtils.isEmpty(drivers)) {
             return driverMap;
         }
 
         /**数据处理**/
-        for (Map<String, Object> driver:drivers) {
+        for (Map<String, Object> driver : drivers) {
             RDriverVo driverVo = new RDriverVo();
             driverVo.setId(NumberUtils.parseEmptyLong(driver.get("id")));
             driverVo.setName(StringUtils.objectStr(driver.get("name")));
@@ -88,7 +91,9 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
      **/
     @Override
     public RDriverDetailVo findDriverDetai(String phone) {
-        List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("phone", phone);}});
+        List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+            put("phone", phone);
+        }});
         if (CollectionUtils.isEmpty(drivers)) {
             return null;
         }
@@ -128,7 +133,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
         }
 
         /**数据处理**/
-        for (Map<String, Object> truck:trucks) {
+        for (Map<String, Object> truck : trucks) {
             RTruckVo truckVo = new RTruckVo();
             truckVo.setId(NumberUtils.parseEmptyLong(truck.get("id")));
             truckVo.setTruckNo(StringUtils.objectStr(truck.get("truckNo")));
@@ -138,6 +143,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
             truckVo.setTotalTake(NumberUtils.parseEmptyInteger(truck.get("totalTake")));
             truckVo.setTotalWeight(new BigDecimal(NumberUtils.parseDouble(truck.get("totalWeight"))));
             truckVo.setBusinessStatus(NumberUtils.parseEmptyInteger(truck.get("businessStatus")));
+            truckVo.setTruckType(truck.get("truckType") == null ? null : truck.get("truckType").toString());
             truckMap.put(truckVo.getTruckNo(), truckVo);
         }
         return truckMap;
@@ -171,7 +177,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
     }
 
     /**
-     * @param entIds 企业id集
+     * @param entIds            企业id集
      * @param capacityAmountMin 最小合计载重
      * @param capacityAmountMax 最大合计载重
      * @desc 企业运力统计

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

@@ -33,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.InputStream;
-import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

@@ -66,9 +66,9 @@ public class KwfTruckService {
     KwfTruckImportMapper kwfTruckImportDao;
     @Autowired
     KwfFleetTruckMapper fleetTruckDao;
-    @DubboReference(version = "1.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
     private RemoteSystemService remoteSystemService;
-    @DubboReference(version = "1.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
     private TransportDubboService transportDubboService;
 
     /**

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

@@ -218,7 +218,8 @@
             spec, actual_weight actualWeight, gross_weight grossWeight, tare_weight tareWeight,
             color, eev, trailer_no trailerNo, total_complete totalComplete, total_take totalTake,
             total_weight totalWeight, business_status businessStatus, tr.remark, tr.status, tr.auth_status authStatus,
-            tr.create_by createBy, tr.create_time createTime, tr.update_by updateBy, tr.update_time updateTime
+            tr.create_by createBy, tr.create_time createTime, tr.update_by updateBy, tr.update_time updateTime,
+            tr.type as truckType
         from kwf_truck tr
         left join kwf_truck_ent tre on tre.truck_id = tr.id
         where tr.del_flag = 0 and tre.del_flag = 0

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.model.page.PageHelperUtil;
@@ -60,9 +61,14 @@ public class KwtWaybillOrderController {
      **/
     @PostMapping("/findSumByDriver")
     public HttpResult findSumByDriver(@RequestBody Map<String, Object> params){
-        params.put("driverId", LoginUserHolder.getUserId());
-        Map<String, Object> count = waybillOrderService.findStatisticsSumByDriver(params);
-        return HttpResult.ok(count);
+        try {
+            params.put("driverId", LoginUserHolder.getUserId());
+            Map<String, Object> count = waybillOrderService.findStatisticsSumByDriver(params);
+            return HttpResult.ok(count);
+        } catch (Exception e) {
+            log.error("findSumByDriver error query:{},errorMessage:{}", JSONObject.toJSONString(params),e.getMessage(),e);
+            return HttpResult.error(e.getMessage());
+        }
     }
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementLogisticsOrderController.java

@@ -89,7 +89,7 @@ public class ManagementLogisticsOrderController {
         List<ManagementLogisticsOrderExcelVo> list = managementLogisticsOrderService.exportLogisticsOrder(query);
         if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
 //            Translator.translate(list);
-            ExcelUtil.download(response, ManagementLogisticsOrderExcelVo.class, list);
+            ExcelUtil.downData(response, ManagementLogisticsOrderExcelVo.class, list);
             return null;
         }
         return HttpResult.ok("没有可导出的数据");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementWaybillOrderController.java

@@ -6,12 +6,10 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.config.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.ManagementWaybillOrderQuery;
-import com.sckw.transport.model.vo.execlVo.ManagementLogisticsOrderExcelVo;
 import com.sckw.transport.model.vo.execlVo.ManagementWaybillOrderExcelVO;
 import com.sckw.transport.service.ManagementWaybillOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -10,6 +10,7 @@ import com.sckw.transport.model.vo.WaybillOrderDriverVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -99,7 +100,7 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @author zk
      * @date 2023/8/1
      **/
-    Map<String, Object> findStatisticsSumByDriver(Map<String, Object> params);
+    Map<String, BigDecimal> findStatisticsSumByDriver(Map<String, Object> params);
 
     /**
      * @param params {driverId 司机ID, month月份}
@@ -107,7 +108,7 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @author zk
      * @date 2023/8/1
      **/
-    Double deficitLossAmountByDriver(Map<String, Object> params);
+    BigDecimal deficitLossAmountByDriver(Map<String, Object> params);
 
     /**
      * @param params {driverId 司机ID}

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

@@ -16,7 +16,7 @@ import java.time.LocalDate;
  * @date 2023-09-11 09:06:30
  */
 @Data
-@ExcelContext(fileName = "托运订单列表", sheetName = "托运订单列表")
+@ExcelContext(fileName = "物流订单列表", sheetName = "物流订单列表")
 //@Translates({
 //        @Translate(field = "status")
 //})

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

@@ -1427,6 +1427,7 @@ public class AcceptCarriageOrderService {
         statusList.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
         statusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
         statusList.add(CarWaybillEnum.APPROVAL_IN.getCode());
+        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         int count = waybillOrderMapper.selectDataByLorderId(id, statusList);
         if (count > NumberConstant.ZERO) {
             throw new RuntimeException("检测您现在有运单正在执行中,该订单目前不可完结,请先将运单执行完毕");

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

@@ -985,6 +985,7 @@ public class ConsignOrderService {
         statusList.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
         statusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
         statusList.add(CarWaybillEnum.APPROVAL_IN.getCode());
+        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
 //        statusList.add(CarWaybillEnum.APPROVAL_PASS.getCode());
         int count = kwtWaybillOrderMapper.selectDataByLorderId(id, statusList);
         if (count > NumberConstant.ZERO) {

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

@@ -113,8 +113,9 @@ public class KwtWaybillOrderService {
      **/
     public Map<String, Object> findStatisticsSumByDriver(Map params) {
         Map<String, Object> data = waybillOrderDao.findStatisticsSumByDriver(params);
-        Double deficitLossAmount = waybillOrderDao.deficitLossAmountByDriver(params);
-        data.put("deficitLossAmount", deficitLossAmount <= 0 ? Global.AMOUNT : deficitLossAmount);
+        BigDecimal deficitLossAmount = waybillOrderDao.deficitLossAmountByDriver(params);
+        deficitLossAmount = deficitLossAmount.setScale(2, RoundingMode.HALF_UP);
+        data.put("deficitLossAmount", deficitLossAmount.compareTo(new BigDecimal("0.00")) <= 0 ? Global.AMOUNT : deficitLossAmount);
         return data;
     }
 
@@ -144,7 +145,7 @@ public class KwtWaybillOrderService {
             //出车-出车时间
             if (busStatus == Global.NUMERICAL_TWO) {
                 for (WaybillOrderDriverVo waybillOrder : waybillOrders) {
-                    KwtWaybillOrderTrack track = waybillOrderTrackDao.findWaybillOrderTrack (waybillOrder.getWOrderId(), waybillOrder.getStatus());
+                    KwtWaybillOrderTrack track = waybillOrderTrackDao.findWaybillOrderTrack(waybillOrder.getWOrderId(), waybillOrder.getStatus());
                     waybillOrder.setOperateTime(track != null ? track.getOperateTime() : null);
                 }
             }
@@ -550,17 +551,17 @@ public class KwtWaybillOrderService {
         String lockKey = String.format(RedisConstant.WAYBILL_NO_GENERATE_KEY, DateUtils.formatDateToYYMMDD(date)) + lOrderNo;
         String key = OrderGenerateSeqNoUtils.getKeyNotDate(RedisOrderGenerateEnum.WAYBILL_ORDER, OrderRuleEnum.WAYBILL_ORDER, lOrderNo);
         try {
-        if (Boolean.FALSE.equals(RedissonUtils.exists(key))) {
-            if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 5L, 10L))) {
-                throw new BusinessException("业务繁忙，请稍后再试！");
-            }
-            String maxOrderNo = waybillOrderDao.getMaxOrderNo(lOrderNo);
-            if (StringUtils.isNotBlank(maxOrderNo)) {
-                Long maxNum = Long.valueOf(StringUtils.subStrFromIndexToEnd(maxOrderNo, 3));
-                RedissonUtils.setAtomicLong(key, maxNum, DateUtils.getSecondsDay());
+            if (Boolean.FALSE.equals(RedissonUtils.exists(key))) {
+                if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 5L, 10L))) {
+                    throw new BusinessException("业务繁忙，请稍后再试！");
+                }
+                String maxOrderNo = waybillOrderDao.getMaxOrderNo(lOrderNo);
+                if (StringUtils.isNotBlank(maxOrderNo)) {
+                    Long maxNum = Long.valueOf(StringUtils.subStrFromIndexToEnd(maxOrderNo, 3));
+                    RedissonUtils.setAtomicLong(key, maxNum, DateUtils.getSecondsDay());
+                }
             }
-        }
-        return OrderGenerateSeqNoUtils.getWaybillSeqNo(RedisOrderGenerateEnum.WAYBILL_ORDER, OrderRuleEnum.WAYBILL_ORDER, lOrderNo);
+            return OrderGenerateSeqNoUtils.getWaybillSeqNo(RedisOrderGenerateEnum.WAYBILL_ORDER, OrderRuleEnum.WAYBILL_ORDER, lOrderNo);
         } finally {
             RedissonUtils.unlock(lockKey);
         }
@@ -1087,11 +1088,11 @@ public class KwtWaybillOrderService {
 
         /**1-5循环派车失效kwt_logistics_order_circulate**/
         //趟次派车信息
-        List<KwtWaybillOrder> waybillOrders = waybillOrderDao.findWaybillOrder(new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+        List<KwtWaybillOrder> waybillOrders = waybillOrderDao.findWaybillOrder(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("lOrderId", lorderId);
             put("status", CarWaybillEnum.PENDING_ORDER.getCode());
         }});
-        for (KwtWaybillOrder waybillOrder:waybillOrders) {
+        for (KwtWaybillOrder waybillOrder : waybillOrders) {
             waybillOrder.setStatus(CarWaybillEnum.REVOKED.getCode());
             waybillOrderDao.updateById(waybillOrder);
 
@@ -1335,8 +1336,13 @@ public class KwtWaybillOrderService {
             editSckwLogisticsOrder(lOrder, logisticsOrder);
 
             /**6发送消息**/
-            List<UserInfo> users = new ArrayList<>(){{add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));}};
-            Map<String, Object> msgParams = new HashMap<>(){{put("orderNo", waybillOrder.getWOrderNo());put("driverName", waybillOrder.getDriverName());}};
+            List<UserInfo> users = new ArrayList<>() {{
+                add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));
+            }};
+            Map<String, Object> msgParams = new HashMap<>() {{
+                put("orderNo", waybillOrder.getWOrderNo());
+                put("driverName", waybillOrder.getDriverName());
+            }};
             SckwMessage msg = new SckwMessage();
             msg.setRequestId(UUIDUtils.get32UUID());
             msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_TRIP);
@@ -1373,8 +1379,13 @@ public class KwtWaybillOrderService {
 
             /**4发送消息**/
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(circulate.getLOrderId());
-            List<UserInfo> users = new ArrayList<>(){{add(new UserInfo(circulate.getCreateBy(), circulate.getEntId()));}};
-            Map<String, Object> msgParams = new HashMap<>(){{put("orderNo", logisticsOrder.getLOrderNo());put("driverName", waybillOrder.getDriverName());}};
+            List<UserInfo> users = new ArrayList<>() {{
+                add(new UserInfo(circulate.getCreateBy(), circulate.getEntId()));
+            }};
+            Map<String, Object> msgParams = new HashMap<>() {{
+                put("orderNo", logisticsOrder.getLOrderNo());
+                put("driverName", waybillOrder.getDriverName());
+            }};
             SckwMessage msg = new SckwMessage();
             msg.setRequestId(UUIDUtils.get32UUID());
             msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_CIRCULATE);
@@ -1405,7 +1416,7 @@ public class KwtWaybillOrderService {
             return HttpResult.error("车辆运单当前状态已不能出车！");
         }
         //车辆任务中校验
-        Map<String, Object> queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+        Map<String, Object> queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("truckNo", waybillOrder.getTruckNo());
             put("busStatus", 3);
         }};
@@ -1484,8 +1495,13 @@ public class KwtWaybillOrderService {
         editSckwLogisticsOrder(lOrder, logisticsOrder);
 
         /**7发送消息**/
-        List<UserInfo> users = new ArrayList<>(){{add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));}};
-        Map<String, Object> msgParams = new HashMap<>(){{put("orderNo", waybillOrder.getWOrderNo());put("driverName", waybillOrder.getDriverName());}};
+        List<UserInfo> users = new ArrayList<>() {{
+            add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));
+        }};
+        Map<String, Object> msgParams = new HashMap<>() {{
+            put("orderNo", waybillOrder.getWOrderNo());
+            put("driverName", waybillOrder.getDriverName());
+        }};
         SckwMessage msg = new SckwMessage();
         msg.setRequestId(UUIDUtils.get32UUID());
         msg.setMessageEnum(MessageEnum.WAYBIL_CONFIRM_DEPARTURE);
@@ -1803,7 +1819,7 @@ public class KwtWaybillOrderService {
             put("logisticsStatus", LogisticsOrderEnum.IN_TRANSIT.getCode());
         }});
         //物流订单统计(运输完成后的物流订单)
-        LogisticsCountVo LogisticsCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap(){{
+        LogisticsCountVo LogisticsCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap() {{
             put("upperlOrderId", logisticsOrder.getId());
             put("finishedStatus", Global.NUMERICAL_ONE);
         }});
@@ -1815,7 +1831,7 @@ public class KwtWaybillOrderService {
         /**1-3更新贸易订单总量**/
         if (logisticsLevel(logisticsOrder) == Global.NUMERICAL_ONE) {
             //物流订单统计(运输完成后的物流订单)
-            LogisticsCountVo tradeCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap<>(){{
+            LogisticsCountVo tradeCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap<>() {{
                 put("tOrderId", logisticsOrder.getTOrderId());
                 put("level", Global.NUMERICAL_ONE);
             }});
@@ -1823,7 +1839,7 @@ public class KwtWaybillOrderService {
             WaybillCountVo tradeCount1 = waybillOrderDao.findWaybillOrderCount(new HashMap<>() {{
                 put("tOrderId", logisticsOrder.getTOrderId());
             }});
-            UpdateActualAmountParam tradeOrder = new  UpdateActualAmountParam();
+            UpdateActualAmountParam tradeOrder = new UpdateActualAmountParam();
             tradeOrder.setTOrderId(logisticsOrder.getTOrderId());
             tradeOrder.setActualLoadAmount(tradeCount.getLoadAmount());
             tradeOrder.setActualUnloadAmount(tradeCount.getUnloadAmount());
@@ -1881,7 +1897,7 @@ public class KwtWaybillOrderService {
             put("logisticsStatus", LogisticsOrderEnum.IN_TRANSIT.getCode());
         }});
         //物流订单统计(运输完成后的物流订单)
-        LogisticsCountVo LogisticsCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap(){{
+        LogisticsCountVo LogisticsCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap() {{
             put("upperlOrderId", logisticsOrder.getId());
             put("finishedStatus", Global.NUMERICAL_ONE);
         }});
@@ -2544,8 +2560,8 @@ public class KwtWaybillOrderService {
     private Map<String, Integer> statisticsCarriageByOrderId(String orderId) {
         Map<String, Integer> map = new HashMap<>();
         /**
-         * 【进行】：对应【待接单】、【待出车】、【已出车】、【到达装货地点】、【已装货】、【到达卸货地点】
-         * 【完成】：对应【已卸货】、【已核单】
+         * 【进行】：对应【待接单】、【待出车】、【已出车】、【到达装货地点】、【已装货】、【已卸货】、【到达卸货地点】【审核不通过:12】【单证更新审核中】
+         * 【完成】：对应【已核单】
          * 【退回】：对应【拒绝接单】、【拒绝出车】、【单趟撤回】
          * */
         List<Integer> orderStatusList = new ArrayList<>();
@@ -2555,13 +2571,13 @@ public class KwtWaybillOrderService {
         orderStatusList.add(CarWaybillEnum.WAIT_LOADING.getCode());
         orderStatusList.add(CarWaybillEnum.COMPLETION_LOADING.getCode());
         orderStatusList.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
+        orderStatusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
         orderStatusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         orderStatusList.add(CarWaybillEnum.APPROVAL_IN.getCode());
         Integer proceed = logisticsOrderDao.selectCountByLorderId(orderId, orderStatusList);
         map.put("proceed", proceed);
-
         orderStatusList.clear();
-        orderStatusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
+
         orderStatusList.add(CarWaybillEnum.APPROVAL_PASS.getCode());
         Integer finish = logisticsOrderDao.selectCountByLorderId(orderId, orderStatusList);
         map.put("finish", finish);
@@ -2570,7 +2586,7 @@ public class KwtWaybillOrderService {
         orderStatusList.add(CarWaybillEnum.REJECT_ORDER.getCode());
         orderStatusList.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
         orderStatusList.add(CarWaybillEnum.REVOKED.getCode());
-        orderStatusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
+//        orderStatusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         Integer cancel = logisticsOrderDao.selectCountByLorderId(orderId, orderStatusList);
         map.put("cancel", cancel);
 
@@ -2601,11 +2617,12 @@ public class KwtWaybillOrderService {
         orderStatusList.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
         orderStatusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         orderStatusList.add(CarWaybillEnum.APPROVAL_IN.getCode());
+        orderStatusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
+        orderStatusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         Integer proceed = logisticsOrderDao.selectCountByLorderId(orderId, orderStatusList);
         map.put("proceed", proceed);
 
         orderStatusList.clear();
-        orderStatusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
         orderStatusList.add(CarWaybillEnum.APPROVAL_PASS.getCode());
         Integer finish = logisticsOrderDao.selectCountByLorderId(orderId, orderStatusList);
         map.put("finish", finish);
@@ -2614,7 +2631,6 @@ public class KwtWaybillOrderService {
         orderStatusList.add(CarWaybillEnum.REJECT_ORDER.getCode());
         orderStatusList.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
         orderStatusList.add(CarWaybillEnum.REVOKED.getCode());
-        orderStatusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         Integer cancel = logisticsOrderDao.selectCountByLorderId(orderId, orderStatusList);
         map.put("cancel", cancel);
 
@@ -2658,7 +2674,7 @@ public class KwtWaybillOrderService {
     }
 
     /**
-     * @param type 字典类型
+     * @param type  字典类型
      * @param value 字典值
      * @desc 获取数据字典值
      * @author zk
@@ -2668,7 +2684,7 @@ public class KwtWaybillOrderService {
         if (StringUtils.isBlank(type) || StringUtils.isBlank(value)) {
             return null;
         }
-        List<String> dictKey = new ArrayList<>(){{
+        List<String> dictKey = new ArrayList<>() {{
             add(type + Global.POUND + value);
         }};
         Map<String, SysDictResDto> dicts = remoteSystemService.queryDictMapByTypeValues(String.join(Global.COMMA, dictKey));

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

@@ -1758,6 +1758,7 @@ public class LogisticsConsignmentService {
         statusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
 //        statusList.add(CarWaybillEnum.APPROVAL_PASS.getCode());
         statusList.add(CarWaybillEnum.APPROVAL_IN.getCode());
+        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
         int count = waybillOrderMapper.selectDataByLorderId(id, statusList);
         if (count > NumberConstant.ZERO) {
             flag = true;

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

@@ -914,6 +914,8 @@ public class WaybillManagementService {
             return HttpResult.ok();
         }
         criteria.and("lOrderId").in(lOrderIds);
+//        criteria.and("wOrderId").exists(true);
+        Criteria.where("wOrderId").ne("").ne(null);
         // 多条件模糊查询
         List<Criteria> orCriteria = new ArrayList<>();
         if (StringUtils.isNotBlank(query.getKeyword())) {

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

@@ -309,12 +309,14 @@
         </if>
     </select>
 
-    <select id="deficitLossAmountByDriver" resultType="java.lang.Double" parameterType="java.util.Map">
+    <select id="deficitLossAmountByDriver" parameterType="java.util.Map">
         SELECT
-            FORMAT(IFNULL(sum(deficitLossAmount), 0.0), 2) deficitLossAmount
+<!--            FORMAT(IFNULL(sum(deficitLossAmount), 0.0), 2) deficitLossAmount-->
+        IFNULL(sum(deficitLossAmount), 0.0) deficitLossAmount
         from (
             SELECT
-            ( deficitAmount - FORMAT((loadAmount * loss / lossUnit),2) ) deficitLossAmount
+<!--            ( deficitAmount - FORMAT((loadAmount * loss / lossUnit),2) ) deficitLossAmount-->
+            ( deficitAmount - (loadAmount * loss / lossUnit) ) deficitLossAmount
             from (
                 SELECT
                 IFNULL(wo.deficit_amount, 0.0) deficitAmount,