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

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

@@ -54,8 +54,8 @@ public enum DictEnum {
     SETTLEMENT_CYCLE_0("settlement_cycle", "0", "周结"),
     SETTLEMENT_CYCLE_1("settlement_cycle", "1", "月结"),
     SETTLEMENT_CYCLE_2("settlement_cycle", "2", "季结"),
-    SIGNING_TYPE_0("signing_type", "0", "线上签约"),
-    SIGNING_TYPE_1("signing_type", "1", "线下签约"),
+    SIGNING_TYPE_1("signing_type", "1", "线上签约"),
+    SIGNING_TYPE_2("signing_type", "2", "线下签约"),
     TORDER_ADDRESS_TYPE_1("tOrder_address_type", "1", "装货地址"),
     TORDER_ADDRESS_TYPE_2("tOrder_address_type", "2", "卸货地址"),
     TORDER_UNIT_TYPE_1("tOrder_unit_type", "1", "采购单位"),

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

@@ -7,7 +7,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
- * @desc: TODO
+ * @desc: 订单号生成工具类
  * @author: yzc
  * @date: 2023-07-12 19:10
  */

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteSystemService.java

@@ -58,7 +58,7 @@ public interface RemoteSystemService {
     List<SysDictGroupResDto> queryDictGroupByType(String type);
 
     /**
-     * @param type 字典类型
+     * @param type 字典类型 value key
      * @return SysDictResDto
      * @desc: 根据字典类型和key查最底层的数据
      * @author: czh

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/SysDictResDto.java

@@ -31,4 +31,9 @@ public class SysDictResDto implements Serializable {
      */
     private String label;
 
+    /**
+     * 类型
+     */
+    private String type;
+
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractTrade.java

@@ -1,5 +1,7 @@
 package com.sckw.contract.model.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
@@ -53,6 +55,7 @@ public class KwcContractTrade implements Serializable {
     /**
      * 结束日期
      */
+    @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private Date endTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractTradeUnit.java

@@ -49,11 +49,6 @@ public class KwcContractTradeUnit implements Serializable {
      */
     private String phone;
 
-    /**
-     * 签约电话
-     */
-    private String signHone;
-
     /**
      * 备注
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/CompleteReqVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -27,6 +29,8 @@ public class CompleteReqVo implements Serializable {
     /**
      * 备注
      */
+    @NotBlank(message = "备注不能为空")
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/TradeGoodsInfoResVo.java

@@ -22,6 +22,11 @@ public class TradeGoodsInfoResVo implements Serializable {
      */
     private BigDecimal amount;
 
+    /**
+     * 商品
+     */
+    private Long goodsId;
+
     /**
      * 商品
      */

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

@@ -152,7 +152,9 @@ public class KwcContractLogisticsService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
 
-        addCheckedContract(reqVo);
+        //补充合同直接
+        submit(reqVo);
+//        addCheckedContract(reqVo);
     }
 
     /**
@@ -193,12 +195,12 @@ public class KwcContractLogisticsService {
             }
 
             logisticsBaseInfoResVo.setChargingName(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(), String.valueOf(kwcContractLogistics.getCharging())));
-            logisticsBaseInfoResVo.setCharging(String.valueOf(kwcContractLogistics.getCharging()));
+            logisticsBaseInfoResVo.setCharging(StringUtils.objectStr(kwcContractLogistics.getCharging()));
             logisticsBaseInfoResVo.setContractCode(kwcContractLogistics.getContractNo());
             logisticsBaseInfoResVo.setContractName(kwcContractLogistics.getName());
             logisticsBaseInfoResVo.setEndTime(Objects.isNull(kwcContractLogistics.getEndTime()) ? Global.EMPTY_STRING : DateUtils.format(kwcContractLogistics.getEndTime()));
             logisticsBaseInfoResVo.setSigningWayName(DictEnum.getLabel(DictTypeEnum.SIGNING_WAY.getType(), String.valueOf(kwcContractLogistics.getSigningWay())));
-            logisticsBaseInfoResVo.setSigningWay(String.valueOf(kwcContractLogistics.getSigningWay()));
+            logisticsBaseInfoResVo.setSigningWay(StringUtils.objectStr(kwcContractLogistics.getSigningWay()));
             logisticsBaseInfoResVo.setStartTime(kwcContractLogistics.getStartTime());
             logisticsBaseInfoResVo.setAmount(kwcContractLogistics.getAmount());
             logisticsBaseInfoResVo.setPerformedAmount(kwcContractLogistics.getPerformedAmount());

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

@@ -1,4 +1,5 @@
 package com.sckw.contract.service;
+
 import java.util.Date;
 
 import com.sckw.contract.dao.KwcContractLogisticsTrackMapper;
@@ -13,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
-* @author PC
-* @description 针对表【kwc_contract_logistics_track(物流合同（承运合同/托运合同）-物流订单)】的数据库操作Service实现
-* @createDate 2023-07-13 13:36:19
-*/
+ * @author PC
+ * @description 针对表【kwc_contract_logistics_track(物流合同（承运合同/托运合同）-物流订单)】的数据库操作Service实现
+ * @createDate 2023-07-13 13:36:19
+ */
 @Service
 public class KwcContractLogisticsTrackService {
 

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

@@ -207,7 +207,8 @@ public class KwcContractTradeService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
 
-        addTradeContract(reqVo);
+        submit(reqVo);
+//        addTradeContract(reqVo);
     }
 
 
@@ -243,10 +244,10 @@ public class KwcContractTradeService {
         tradeBaseInfoResVo.setContractName(kwcContractTrade.getName());
         tradeBaseInfoResVo.setEndTime(Objects.isNull(kwcContractTrade.getEndTime()) ? Global.EMPTY_STRING : DateUtils.format(kwcContractTrade.getEndTime()));
         tradeBaseInfoResVo.setSigningWayName(DictEnum.getLabel(DictTypeEnum.SIGNING_WAY.getType(), String.valueOf(kwcContractTrade.getSigningWay())));
-        tradeBaseInfoResVo.setSigningWay(String.valueOf(kwcContractTrade.getSigningWay()));
+        tradeBaseInfoResVo.setSigningWay(StringUtils.objectStr(kwcContractTrade.getSigningWay()));
         tradeBaseInfoResVo.setStartTime(kwcContractTrade.getStartTime());
         tradeBaseInfoResVo.setTradingName(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), String.valueOf(kwcContractTrade.getTrading())));
-        tradeBaseInfoResVo.setTrading(String.valueOf(kwcContractTrade.getTrading()));
+        tradeBaseInfoResVo.setTrading(StringUtils.objectStr(kwcContractTrade.getTrading()));
 
         ContractTradeDetailResVo contractTradeDetailResVo = new ContractTradeDetailResVo();
         List<KwcContractTradeUnit> kwcContractTradeUnits = kwcContractTradeUnitService.queryByContractId(id);
@@ -286,7 +287,7 @@ public class KwcContractTradeService {
                 tradeGoodsInfoResVo.setAmount(kwcContractTradeGoods.getAmount());
                 tradeGoodsInfoResVo.setPrice(kwcContractTradeGoods.getPrice());
                 tradeGoodsInfoResVo.setUnit(kwcContractTradeGoods.getUnit());
-
+                tradeGoodsInfoResVo.setGoodsId(kwcContractTradeGoods.getGoodsId());
                 KwpGoods kwpGoods = goodsMap.get(kwcContractTradeGoods.getGoodsId());
                 if (Objects.nonNull(kwpGoods)) {
                     tradeGoodsInfoResVo.setGoodsName(kwpGoods.getName());
@@ -334,30 +335,35 @@ public class KwcContractTradeService {
      * @author: czh
      * @date 2023/7/16
      */
+    @Transactional(rollbackFor = {})
     public void submit(ContractTradeReqVo reqVo) {
         Long id = reqVo.getId();
         if (Objects.isNull(id)) {
             //创建合同
-            KwcContractTrade kwcContractLogistics = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
-            id = new IdWorker(1L).nextId();
-            kwcContractLogistics.setId(id);
-            kwcContractLogistics.setStatus(ContractStatusEnum.SUBMIT.getCode());
-            kwcContractLogistics.setSigningUrl(reqVo.getContractFile());
-            if (kwcContractTradeMapper.insert(kwcContractLogistics) <= 0) {
-                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
-            }
-
-            //存审批记录
-            kwcContractTradeTrackService.saveContractTradeTrack(id);
+            id = addTradeContract(reqVo);
+            changeToSubmit(id);
             return;
         }
+        update(reqVo);
+        changeToSubmit(id);
+    }
+
 
-        id = addTradeContract(reqVo);
-        //存审批记录
+    /**
+     * @param id 合同id
+     * @desc: 更新合同为发起
+     * @author: czh
+     * @date: 2023/7/20
+     */
+    private void changeToSubmit(Long id) {
+        KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(id);
+        kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
+        if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
         kwcContractTradeTrackService.saveContractTradeTrack(id);
     }
 
-
     /**
      * @desc: 修改草稿
      * @param: reqVo 入参

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -80,6 +80,7 @@
           </if>
           <if test="keywords != null and keywords != ''">
               and (b.firm_name like concat('%', #{keywords}, '%') or
+                   e.firm_name like concat('%', #{keywords}, '%') or
                    b.contacts like concat('%', #{keywords}, '%') or
                    b.phone like concat('%', #{keywords}, '%') or
                    b.sign_phone like concat('%', #{keywords}, '%'))

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -78,6 +78,7 @@
         </if>
         <if test="keywords != null and keywords != ''">
             and (b.firm_name like concat('%', #{keywords}, '%') or
+                 e.firm_name like concat('%', #{keywords}, '%') or
                  b.contacts like concat('%', #{keywords}, '%') or
                  b.phone like concat('%', #{keywords}, '%') or
                  b.sign_phone like concat('%', #{keywords}, '%'))

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeUnitMapper.xml

@@ -12,7 +12,7 @@
             <result property="firm_name" column="firm_name" jdbcType="VARCHAR"/>
             <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
             <result property="phone" column="phone" jdbcType="VARCHAR"/>
-            <result property="sign_hone" column="sign_hone" jdbcType="VARCHAR"/>
+            <result property="sign_phone" column="sign_phone" jdbcType="VARCHAR"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
             <result property="status" column="status" jdbcType="INTEGER"/>
             <result property="create_by" column="create_by" jdbcType="BIGINT"/>
@@ -25,7 +25,7 @@
     <sql id="Base_Column_List">
         id,ent_id,contract_id,
         unit_type,firm_name,contacts,
-        phone,sign_hone,remark,
+        phone,sign_phone,remark,
         status,create_by,create_time,
         update_by,update_time,del_flag
     </sql>

sckw-modules/sckw-file/src/main/resources/bootstrap.yml

@@ -5,6 +5,7 @@ spring:
   application:
     name: sckw-file
   profiles:
+#    active: ${DEPLOY_MODE:dev}
     active: @profiles.active@
   main:
     allow-bean-definition-overriding: true

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/AddressAddReqVo.java

@@ -1,6 +1,8 @@
 package com.sckw.manage.model.vo.req;
 
+import com.sckw.core.utils.RegularUtils;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 
@@ -33,6 +35,7 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 联系人
      */
+    @Pattern(regexp = RegularUtils.NAME, message = "联系人格式不正确")
     private String contacts;
 
     /**
@@ -63,6 +66,7 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 联系人电话
      */
+    @Pattern(regexp = RegularUtils.PHONE_REG, message = "手机号格式不正确")
     private String phone;
 
     /**

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

@@ -79,7 +79,8 @@ public class KwmAddressService {
                 eq(KwmAddress::getDelFlag, Global.NO).
                 and(StringUtils.isNotBlank(reqVo.getKeywords()),
                         wq -> wq.like(KwmAddress::getDetailAddress, reqVo.getKeywords()).or().
-                                like(KwmAddress::getCityName, reqVo.getKeywords()));
+                                like(KwmAddress::getCityName, reqVo.getKeywords())).
+                orderByDesc(KwmAddress::getUpdateTime);
 
         if (Objects.nonNull(reqVo.getStartTime())) {
             wrapper.ge(KwmAddress::getCreateTime, reqVo.getStartTime());

sckw-modules/sckw-message/src/main/resources/bootstrap-test.yml

@@ -3,21 +3,20 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.10.10.224:8848
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-service-platform
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
       config:
         # 配置中心地址
-        server-addr: 10.10.10.224:8848
-        # 配置文件格式
-        file-extension: yaml
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-service-platform
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
-        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        # 配置文件格式
+        file-extension: yaml
         extension-configs:
           - dataId: sckw-common.yml
             group: sckw-service-platform

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwoTradeOrderContractMapper.java

@@ -5,7 +5,7 @@ import com.sckw.order.model.KwoTradeOrderContract;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * @desc: TODO
+ * @desc: 订单合同mapper
  * @author: yzc
  * @date: 2023-07-13 9:49
  */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/TransportDemandExport.java

@@ -9,7 +9,7 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * @desc: TODO
+ * @desc: 运需导出对象
  * @author: yzc
  * @date: 2023-07-26 10:14
  */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UpdateOrderParam.java

@@ -29,7 +29,7 @@ public class UpdateOrderParam {
      * 操作类型0保存、1提交
      */
     @NotNull(message = "操作类型不能为空")
-    @Range(min = 1, max = 2, message = "非法订单类型")
+    @Range(min = 0, max = 1, message = "非法操作类型")
     private Integer operateType;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/TransportDemandListRes.java

@@ -12,7 +12,7 @@ import java.time.LocalDate;
 import java.util.Date;
 
 /**
- * @desc: TODO
+ * @desc: 运需列表响应对象
  * @author: yzc
  * @date: 2023-07-26 13:35
  */

sckw-modules/sckw-order/src/main/resources/bootstrap-test.yml

@@ -3,21 +3,20 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.10.10.224:8848
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-service-platform
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
       config:
         # 配置中心地址
-        server-addr: 10.10.10.224:8848
-        # 配置文件格式
-        file-extension: yaml
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-service-platform
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
-        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        # 配置文件格式
+        file-extension: yaml
         extension-configs:
           - dataId: sckw-common.yml
             group: sckw-service-platform

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsDropListReq.java

@@ -3,6 +3,7 @@ package com.sckw.product.model.vo.req;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.validator.constraints.Range;
 
 /**
  * @desc: 商品下拉列表请求参数
@@ -13,8 +14,21 @@ import lombok.ToString;
 @Setter
 @ToString
 public class GoodsDropListReq {
+
+    /**
+     * 订单类型（1采购订单2销售订单）
+     */
+    @Range(min = 1, max = 2, message = "非法订单类型")
+    private Integer orderType;
+
     /**
      * 商品名称
      */
     private String name;
+
+    /**
+     * 供应单位
+     */
+    private Long supplyEntId;
+
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -725,6 +725,12 @@ public class KwpGoodsService {
      */
     public List<GoodsDropList> dropList(GoodsDropListReq params) {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
+        if (Objects.equals(params.getOrderType(), 2)) {
+            if (Objects.isNull(params.getSupplyEntId())) {
+                throw new BusinessException("供应单位不能为空！");
+            }
+            wrapper.eq(KwpGoods::getSupplyEntId, params.getSupplyEntId());
+        }
         wrapper.like(StringUtils.isNotBlank(params.getName()), KwpGoods::getName, params.getName())
                 .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode())
                 .eq(KwpGoods::getDelFlag, Global.NO).orderByDesc(KwpGoods::getAddedTime);

sckw-modules/sckw-product/src/main/resources/bootstrap-test.yml

@@ -3,21 +3,20 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.10.10.224:8848
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-service-platform
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
       config:
         # 配置中心地址
-        server-addr: 10.10.10.224:8848
-        # 配置文件格式
-        file-extension: yaml
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-service-platform
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
-        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        # 配置文件格式
+        file-extension: yaml
         extension-configs:
           - dataId: sckw-common.yml
             group: sckw-service-platform

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -164,8 +164,8 @@ public class KwTransportController {
      * @param query
      * @return
      */
-    @RequestMapping(value = "/getWaybillOrders", method = RequestMethod.POST)
-    public HttpResult getWayBillOrders(@Validated @RequestBody WaybillOrderQuery query){
+    @RequestMapping(value = "/getWaybillOrders", method = RequestMethod.GET)
+    public HttpResult getWayBillOrders(WaybillOrderQuery query){
         HttpResult httpResult = new HttpResult();
         try {
             httpResult = transportService.getWaybillOrders(query);
@@ -184,8 +184,8 @@ public class KwTransportController {
      * @author jc
      * @date 2023/07/21
      */
-    @RequestMapping(value = "/getWayBillStatistics", method = RequestMethod.POST)
-    public HttpResult wayBillStatistics(@Validated @RequestBody WaybillOrderQuery query) {
+    @RequestMapping(value = "/getWayBillStatistics", method = RequestMethod.GET)
+    public HttpResult wayBillStatistics(WaybillOrderQuery query) {
         try {
             return transportService.getWayBillStatistics(query);
         } catch (Exception e) {
@@ -231,5 +231,4 @@ public class KwTransportController {
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
-
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -249,6 +249,7 @@ public class KwOrderService {
         } else {
             query = getQuery(params, false);
         }
+        query.with(Sort.by(Sort.Order.desc("createTime")));
         List<SckwTradeOrder> orders = mongoTemplate.find(query, SckwTradeOrder.class);
         if (CollectionUtils.isEmpty(orders)) {
             return Collections.emptyList();

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -238,6 +238,12 @@ public class KwTransportService {
         List<TableTops> results = outputTypeCount.getMappedResults();
         // 填充默认值
         List<TableTops> list = new ArrayList<>();
+        TableTops topTotal = new TableTops();
+        topTotal.setName("全部");
+        topTotal.setValue(null);
+        topTotal.setTotal(0);
+        list.add(topTotal);
+
         TableTops topExpired = new TableTops();
         topExpired.setName("已作废");
         topExpired.setValue(String.valueOf(NumberConstant.ONE_ZERO_ZERO));
@@ -246,7 +252,6 @@ public class KwTransportService {
         expiredStatuses.add(CarWaybillEnum.REJECT_ORDER.getCode().longValue());
         expiredStatuses.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode().longValue());
         expiredStatuses.add(CarWaybillEnum.REVOKED.getCode().longValue());
-
         for (CarWaybillEnum status : CarWaybillEnum.values()) {
             boolean expiredFlag = expiredStatuses.contains(status.getCode().longValue());
             TableTops top = new TableTops();
@@ -271,6 +276,8 @@ public class KwTransportService {
             }
         }
         list.add(topExpired);
+        // 总计
+        topTotal.setTotal(list.parallelStream().mapToInt(item -> item.getTotal()).sum());
         // 查询结果
         return HttpResult.ok(list);
     }

sckw-modules/sckw-report/src/main/resources/bootstrap-test.yml

@@ -2,14 +2,14 @@ spring:
   cloud:
     nacos:
       discovery:
-      # 服务注册地址
+        # 服务注册地址
         server-addr: @nacos.server@
         # 命名空间
         namespace: @nacos.namespace@
         # 共享配置
         group: sckw-service-platform
       config:
-      # 配置中心地址
+        # 配置中心地址
         server-addr: @nacos.server@
         # 命名空间
         namespace: @nacos.namespace@
@@ -17,12 +17,6 @@ spring:
         group: sckw-service-platform
         # 配置文件格式
         file-extension: yaml
-        shared-configs:
-          - data-id: sckw-common.yml
-            group: sckw-common
-            refresh: true
-
-        #可以读多个配置文件 需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml
             group: sckw-service-platform

sckw-modules/sckw-report/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-report
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -119,7 +119,7 @@ public class KwsEnterpriseController {
      **/
     @Deprecated
     @PostMapping("/update")
-    public HttpResult update(@RequestBody KwsEnterpriseReqVo reqVo) throws SystemException {
+    public HttpResult update(@RequestBody UpdateEntInfoReqVo reqVo) throws SystemException {
         kwsEntService.update(reqVo);
         return HttpResult.ok(HttpStatus.MSG_005);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -163,8 +163,8 @@ public class KwsUserController {
     }
 
     @PostMapping("testEdit")
-    public HttpResult testEdit() {
-        return HttpResult.ok(kwsUserService.test());
+    public HttpResult testEdit(@RequestParam String type, @RequestParam String value) {
+        return HttpResult.ok(kwsUserService.test(type, value));
     }
 
     @PostMapping("testApprove")

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -75,7 +75,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     public Map<String, SysDictResDto> queryDictMapByType(String type) {
         List<SysDictResDto> sysDictResDtos = queryDictByType(type);
         if (CollectionUtils.isEmpty(sysDictResDtos)) {
-            return new HashMap<>();
+            return new HashMap<>(1);
         }
 
         return sysDictResDtos.stream().collect(Collectors.toMap(SysDictResDto::getValue, v->v));
@@ -162,9 +162,35 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         return list;
     }
 
+
+    /**
+     * @param type 字典类型 value key
+     * @return SysDictResDto
+     * @desc: 根据字典类型和key查最底层的数据
+     * @author: czh
+     * @date: 2023/7/7
+     */
     @Override
     public List<SysDictResDto> queryDictBottom(String type, String value) {
-        return null;
+        SysDictGroupResDto sysDictGroupResDto = queryDictGroupByTypeAndValue(type, value);
+        if (Objects.isNull(sysDictGroupResDto)) {
+            return Collections.emptyList();
+        }
+
+        return BeanUtils.copyToList(checkNextLevelDict(sysDictGroupResDto.getChild()), SysDictResDto.class);
+    }
+
+    private List<SysDictGroupResDto> checkNextLevelDict(List<SysDictGroupResDto> list) {
+        List<SysDictGroupResDto> sysDictGroupResDtos = list.stream().filter(item -> CollectionUtils.isNotEmpty(item.getChild())).toList();
+        if (CollectionUtils.isEmpty(sysDictGroupResDtos)) {
+            return list;
+        }
+
+        List<SysDictGroupResDto> child = new ArrayList<>();
+        for (SysDictGroupResDto sysDictGroupResDto : sysDictGroupResDtos) {
+            child.addAll(sysDictGroupResDto.getChild());
+        }
+        return checkNextLevelDict(child);
     }
 
     /**
@@ -433,10 +459,6 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return null;
         }
 
-        if (Objects.isNull(kwsEnterpriseResDto.getManager())) {
-            return null;
-        }
-
         return queryUserCacheById(kwsEnterpriseResDto.getManager());
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsEnterprise.java

@@ -121,4 +121,15 @@ public class KwsEnterprise extends BaseModel {
      * 专属客户经理（用户ID）
      */
     private Long manager;
+
+    /**
+     * 官网
+     */
+    private String website;
+
+    /**
+     * 主营业务
+     */
+    private String business;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UpdateEntInfoReqVo.java

@@ -0,0 +1,55 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 更新企业信息
+ * @date 2023/7/27
+ */
+@Data
+public class UpdateEntInfoReqVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -8027260827607157244L;
+
+    /**
+     * 法人姓名
+     */
+    private String legalName;
+
+    /**
+     * 法人联系电话
+     */
+    private String legalPhone;
+
+    /**
+     * 区域code
+     */
+    private Integer cityCode;
+
+    /**
+     * 区域名
+     */
+    private String cityName;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 官网
+     */
+    private String website;
+
+    /**
+     * 主营业务
+     */
+    private String business;
+
+
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/EntDetailResVo.java

@@ -131,4 +131,14 @@ public class EntDetailResVo implements Serializable {
      * 企业属性
      */
     private String entTypes;
+
+    /**
+     * 官网
+     */
+    private String website;
+
+    /**
+     * 主营业务
+     */
+    private String business;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -122,83 +122,14 @@ public class KwsEnterpriseService {
      * @date: 2023/6/19
      */
     @Transactional(rollbackFor = Exception.class)
-    public void update(KwsEnterpriseReqVo reqVo) throws SystemException {
+    public void update(UpdateEntInfoReqVo reqVo) throws SystemException {
         /*1、更新企业信息表*/
-        long entId = reqVo.getId();
-        KwsEnterprise kwsEnterprise = checkKwsEnterpriseById(entId);
+        KwsEnterprise kwsEnterprise = checkKwsEnterpriseById(LoginUserHolder.getEntId());
         BeanUtils.copyProperties(reqVo, kwsEnterprise);
         if (kwsEnterpriseDao.update(kwsEnterprise) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
 
-//        /*2、更新企业类型*/
-//        List<KwsEntType> kwsEntTypes = kwsEntTypeDao.findListByEntId(entId);
-//        List<String> typeReqList = new ArrayList<>();
-//        String entTypes = reqVo.getEntTypes();
-//        if (StringUtils.isNotBlank(entTypes)) {
-//            typeReqList = Arrays.stream(entTypes.split(",")).toList();
-//        }
-//
-//        //若入参传来的type在表里面本来就有则不管,没有就新增
-//        typeReqList.forEach(item -> {
-//            if (CollectionUtils.isEmpty(kwsEntTypes) || kwsEntTypes.stream().anyMatch(x -> x.getType() == Integer.parseInt(item))) {
-//                return;
-//            }
-//
-//            KwsEntType kwsEntType = new KwsEntType();
-//            kwsEntType.setEntId(entId);
-//            kwsEntType.setType(Integer.parseInt(item));
-//            if (kwsEntTypeDao.insert(kwsEntType) <= 0) {
-//                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
-//            }
-//        });
-//
-//        //若表里的type没有在入参传来的type里则做逻辑删除，有就不管
-//        if (CollectionUtils.isNotEmpty(kwsEntTypes)) {
-//            List<String> finalTypeReqList = typeReqList;
-//            kwsEntTypes.forEach(item -> {
-//                if (finalTypeReqList.contains(String.valueOf(item.getType()))) {
-//                    item.setDelFlag(Global.YES);
-//                    if (kwsEntTypeDao.update(item) <= 0) {
-//                        throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
-//                    }
-//                }
-//            });
-//        }
-//
-//        /*更新证书信息*/
-//        //1、没有传则全部删除
-//        List<BusinessLicense> certificates = reqVo.getCertificates();
-//        if (CollectionUtils.isEmpty(certificates)) {
-//            List<KwsEntCertificate> kwsEntCertificates = kwsEntCertificateDao.selectByEntId(entId);
-//            if (!CollectionUtils.isEmpty(kwsEntCertificates)) {
-//                kwsEntCertificates.forEach(item -> {
-//                    item.setDelFlag(Global.YES);
-//                    if (kwsEntCertificateDao.update(item) <= 0) {
-//                        throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
-//                    }
-//                });
-//            }
-//            return;
-//        }
-//
-//        certificates.forEach(item -> {
-//            long id = item.getId();
-//            if (Objects.isNull(id)) {
-//                KwsEntCertificate kwsEntCertificate = new KwsEntCertificate();
-//                kwsEntCertificate.setEntId(entId);
-//                BeanUtils.copyProperties(item, kwsEntCertificate);
-//                if (kwsEntCertificateDao.insert(kwsEntCertificate) <= 0) {
-//                    throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
-//                }
-//                return;
-//            }
-//
-//            KwsEntCertificate kwsEntCertificate = checkEntCertificate(id);
-//            BeanUtils.copyProperties(item, kwsEntCertificate);
-//            //不做更新条数校验
-//            kwsEntCertificateDao.update(kwsEntCertificate);
-//        });
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -11,6 +11,7 @@ import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
 import com.sckw.system.api.model.dto.res.RegisterResDto;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.dao.*;
 import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
@@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.*;
 
@@ -584,9 +586,8 @@ public class KwsUserService {
         updatePwd(reqVo.getNewPassword(), kwsUser);
     }
 
-    public String test() {
-        remoteSystemService.queryEntTreeByIds(Collections.singletonList(Long.parseLong("156382319450525696")));
-        return "";
+    public List<SysDictResDto> test(String type, String value) {
+        return remoteSystemService.queryDictBottom(type, value);
     }
 
 }

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -32,13 +32,15 @@
     <result column="update_by" jdbcType="BIGINT" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="website" jdbcType="VARCHAR" property="website" />
+    <result column="business" jdbcType="VARCHAR" property="business" />
   </resultMap>
 
   <sql id="Base_Column_List">
     id, firm_name, code, contacts, phone, legal_name, legal_phone, head, integral,
     balance, experience, member_level, reg_time, reg_source, org_code, city_code, detail_address, 
     lat, lng, approval, approval_time, manager, remark, status, create_by, create_time, 
-    update_by, update_time, del_flag,city_name
+    update_by, update_time, del_flag,city_name, website, business
   </sql>
 
   <select id="selectByKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -528,6 +530,12 @@
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=INTEGER},
       </if>
+      <if test="website != null">
+        website = #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="business != null">
+        business = #{business,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>

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

@@ -216,6 +216,21 @@ public class AcceptCarriageOrderController {
         }
     }
 
+    /**
+     * 承运订单-完结订单-页面数据查询
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "/acceptCarriageOrderFinishDetail", method = RequestMethod.GET)
+    public HttpResult acceptCarriageOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
+        log.info("承运订单-完结订单-页面数据查询 传递参数信息:{}", orderId);
+        try {
+            return acceptCarriageOrderService.acceptCarriageOrderFinishDetail(orderId);
+        } catch (Exception e) {
+            log.error("承运订单-完结订单-页面数据查询 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
 
     /**
      * 承运订单-完结订单

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

@@ -5,6 +5,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.dto.OrderDTO;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.service.ConsignOrderService;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -70,6 +71,22 @@ public class ConsignOrderController {
         }
     }
 
+    /**
+     * 托运订单-完结订单-页面数据查询
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "/consignOrderFinishDetail", method = RequestMethod.GET)
+    public HttpResult consignOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
+        log.info("托运订单-完结订单-页面数据查询 传递参数信息:{}", orderId);
+        try {
+            return consignOrderService.consignOrderFinishDetail(orderId);
+        } catch (Exception e) {
+            log.error("托运订单-完结订单-页面数据查询 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
     /**
      * 托运订单-完结订单
      *

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

@@ -24,6 +24,7 @@ import java.util.List;
  * @date 2023-06-28 11:06:06
  */
 @Slf4j
+@Validated
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/kwtLogisticsConsignment")
@@ -118,7 +119,7 @@ public class LogisticsConsignmentController {
      */
     @Validated
     @RequestMapping(value = "/selectPurchaseOrderFinish", method = RequestMethod.GET)
-    public HttpResult selectPurchaseOrderFinish(@RequestParam("orderId") @NotNull(message = "数据id不能为空") String orderId) {
+    public HttpResult selectPurchaseOrderFinish(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
         log.info("采购订单-托运订单列表-订单完结-数据查询 传递参数信息:{}", orderId);
         try {
             return logisticsConsignmentService.selectOrderFinishVo(orderId, "1");

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

@@ -8,6 +8,7 @@ import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -48,4 +49,14 @@ public class WaybillManagementController {
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
+
+    @RequestMapping(name = "运单看板TOP", value = "/waybillIndexStatistics", method = RequestMethod.GET)
+    public HttpResult waybillIndexStatistics(WaybillOrderDTO waybillOrderDTO) {
+        try {
+            return waybillManagementService.waybillIndexStatistics(waybillOrderDTO);
+        } catch (Exception e) {
+            log.error("运单看板TOP:订单id {},error {} ", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
 }

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

@@ -58,9 +58,18 @@ public class WaybillOrderDTO extends PageRequest implements Serializable {
     /**
      * 关键字搜索
      */
-    @NotBlank(message = "关键字不能为空")
     private String keywords;
 
+    /**
+     * 装载城市
+     */
+    private String loadCityName;
+
+    /**
+     * 卸载城市
+     */
+    private String unloadCityName;
+
     /**
      * 运单状态
      */

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

@@ -15,6 +15,10 @@ public class OrderFinishVO {
      * 总运单次数
      */
     private Integer number;
+    /**
+     * 运输
+     */
+    private BigDecimal amount;
     /**
      * 总卸货量
      */

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

@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.NumberConstant;
@@ -14,8 +12,6 @@ import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
-import com.sckw.core.model.page.PageHelperUtil;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -33,14 +29,14 @@ import com.sckw.product.api.model.KwpGoods;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
-import com.sckw.system.api.model.dto.res.*;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.model.dto.OrderTakingDTO;
 import com.sckw.transport.model.dto.StopOrderTakingDTO;
 import com.sckw.transport.model.dto.SubcontractConsignmentDTO;
-import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
 import com.sckw.transport.model.param.DriverParam;
 import com.sckw.transport.model.vo.*;
 import jakarta.annotation.Resource;
@@ -119,26 +115,6 @@ public class AcceptCarriageOrderService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    public HttpResult list(AcceptCarriageOrderQuery query) {
-        List<AcceptCarriageOrderVO> list = new ArrayList<>();
-        AcceptCarriageOrderVO acceptCarriageOrderVo = new AcceptCarriageOrderVO();
-        List<CarWaybillVO> carWaybillVOList = new ArrayList<>();
-        CarWaybillVO carWaybillVo = new CarWaybillVO();
-        carWaybillVOList.add(carWaybillVo);
-        List<ConsignmentVO> consignmentVOS = new ArrayList<>();
-        ConsignmentVO consignmentVo = new ConsignmentVO();
-        consignmentVOS.add(consignmentVo);
-        acceptCarriageOrderVo.setCarWaybillList(carWaybillVOList);
-        acceptCarriageOrderVo.setConsignmentList(consignmentVOS);
-        list.add(acceptCarriageOrderVo);
-        PageHelper.startPage(query.getPage(), query.getPageSize());
-        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        return HttpResult.ok(pageResult);
-    }
-
-    public HttpResult count(AcceptCarriageOrderQuery query) {
-        return null;
-    }
 
     /**
      * 承运订单-分包托运
@@ -190,7 +166,7 @@ public class AcceptCarriageOrderService {
          * 判断是否已存在分包【当前分包只允许加上主单一共三级】*/
         Long count = logisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>()
                 .in(KwtLogisticsOrder::getPids, bo.getLOrderId()));
-        if (count >= NumberConstant.TWO) {
+        if (count > NumberConstant.TWO) {
             throw new RuntimeException("分包次数已达上限!");
         }
         String pids = logisticsOrder.getPids();
@@ -1098,4 +1074,14 @@ public class AcceptCarriageOrderService {
         orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : String.valueOf(logisticsOrder.getLoadAmount()));
         return HttpResult.ok(orderDetailVO);
     }
+
+    /**
+     * 承运订单-完结订单-数据查询展示
+     * @param orderId   物流订单id
+     * @return
+     */
+    public HttpResult acceptCarriageOrderFinishDetail(String orderId) {
+        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        return HttpResult.ok(orderFinishVO);
+    }
 }

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

@@ -24,6 +24,7 @@ import com.sckw.transport.model.dto.OrderDTO;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.model.vo.CarDataVO;
 import com.sckw.transport.model.vo.CarWaybillVO;
+import com.sckw.transport.model.vo.OrderFinishVO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -415,7 +416,7 @@ public class ConsignOrderService {
 
 
     /**
-     * 承运订单-分包托运-完结订单-修改本身数据
+     * 托运订单-完结订单-修改本身数据
      *
      * @param logisticsOrder 本身物流订单数据
      * @param orderFinishDTO 页面传递数据
@@ -456,7 +457,7 @@ public class ConsignOrderService {
     }
 
     /**
-     * 承运订单-分包托运-完结订单-修改分包订单
+     * 托运订单-完结订单-存在分包托运-修改分包订单
      *
      * @param orderFinishDTO
      * @param orderId        分包物流订单id
@@ -495,4 +496,14 @@ public class ConsignOrderService {
             streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
         }
     }
+
+    /**
+     * 托运订单-完结订单-数据查询展示
+     * @param orderId   物流订单id
+     * @return
+     */
+    public HttpResult consignOrderFinishDetail(String orderId) {
+        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        return HttpResult.ok(orderFinishVO);
+    }
 }

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

@@ -407,6 +407,7 @@ public class LogisticsConsignmentService {
     private void insertLogisticsOrder(LogisticsConsignmentParam bo, String lOrderNo, KwtLogisticsOrder order, OrderDetailRes tradeOrder, Long orderId, Integer orderStatus) {
         order.setId(orderId);
         order.setEntId(LoginUserHolder.getEntId());
+        order.setType(String.valueOf(NumberConstant.ONE));
         order.setTOrderId(Long.parseLong(bo.getTOrderId()));
         order.setTOrderNo(bo.getTOrderNo());
         order.setLOrderNo(lOrderNo);

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

@@ -13,6 +13,7 @@ import com.sckw.excel.utils.DateUtil;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.mongo.model.SckwWaybillOrder;
+import com.sckw.mongo.model.TableTops;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.KwtWaybillOrderAddressMapper;
@@ -32,9 +33,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.regex.Pattern;
@@ -164,19 +168,14 @@ public class WaybillManagementService {
 
     /**
      * 运单看板列表
+     * @param query
      * @return
+     * @throws Exception
      */
-    public HttpResult waybillIndex(WaybillOrderDTO query) {
+    public HttpResult waybillIndex(WaybillOrderDTO query) throws Exception {
         // mongo查询列数据，不足的数据单独关联表查询
         // 状态查询 status [2-8]
-        List<Integer> statuses = new ArrayList<>();
-        statuses.add(CarWaybillEnum.PENDING_VEHICLE.getCode());
-        statuses.add(CarWaybillEnum.EXIT_COMPLETED.getCode());
-        statuses.add(CarWaybillEnum.WAIT_LOADING.getCode());
-        statuses.add(CarWaybillEnum.COMPLETION_LOADING.getCode());
-        statuses.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
-        statuses.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
-        statuses.add(CarWaybillEnum.APPROVAL_PASS.getCode());
+        List<Integer> statuses = initWaybillIndexStatus();
         // 初始化各状态
         List<WaybillStatusVO> statusVOS = new ArrayList<>();
         statuses.forEach(e -> {
@@ -195,51 +194,7 @@ public class WaybillManagementService {
             statusVOS.add(waybillStatusVO);
         });
 
-        Criteria criteria = new Criteria();
-        criteria.and("entId").is(LoginUserHolder.getEntId());
-        criteria.and("delFlag").is(NumberConstant.ZERO);
-
-        List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
-        if (CollectionUtils.isNotEmpty(wOrderIds)) {
-            Criteria.where("wOrderId").in(wOrderIds);
-        }
-
-        if (StringUtils.isNotBlank(query.getStatus())) {
-            criteria.and("status").is(query.getStatus());
-        } else {
-            criteria.and("status").in(statuses);
-        }
-        // 装载时间
-        if (StringUtils.isNotBlank(query.getStartLoadTime()) && StringUtils.isNotEmpty(query.getEndLoadTime())) {
-            criteria.andOperator(Criteria.where("loadTime").gte(query.getStartLoadTime()), Criteria.where("loadTime")
-                    .lte(query.getEndLoadTime()));
-        }
-        if (StringUtils.isNotBlank(query.getStartLoadTime()) && StringUtils.isNotEmpty(query.getEndLoadTime())) {
-            criteria.andOperator(Criteria.where("loadTime").gte(query.getStartLoadTime()), Criteria.where("loadTime")
-                    .lte(query.getEndLoadTime()));
-        }
-        // 派车时间
-        if (StringUtils.isNotBlank(query.getStartSendCarTime()) && StringUtils.isNotEmpty(query.getEndSendCarTime())) {
-            criteria.andOperator(Criteria.where("sendCarTime").gte(query.getStartSendCarTime()), Criteria.where("sendCarTime")
-                    .lte(query.getEndSendCarTime()));
-        }
-        // 卸货时间
-        if (StringUtils.isNotBlank(query.getStartUnloadTime()) && StringUtils.isNotEmpty(query.getEndUnloadTime())) {
-            criteria.andOperator(Criteria.where("unloadTime").gte(query.getStartUnloadTime()), Criteria.where("unloadTime")
-                    .lte(query.getEndUnloadTime()));
-        }
-        // 多条件模糊查询
-        List<Criteria> orCriteria = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getKeywords())) {
-            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-            orCriteria.add(Criteria.where("wOrderNo").regex(pattern));
-            orCriteria.add(Criteria.where("truckNo").regex(pattern));
-            orCriteria.add(Criteria.where("driverName").regex(pattern));
-            orCriteria.add(Criteria.where("firmName").regex(pattern));
-            orCriteria.add(Criteria.where("loadAddress").regex(pattern));
-            orCriteria.add(Criteria.where("unloadAddress").regex(pattern));
-            criteria.orOperator(orCriteria);
-        }
+        Criteria criteria = buildWaybillIndexQuery(query, statuses);
         Query queryFormat = new Query(criteria);
         long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);
         queryFormat.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
@@ -300,4 +255,130 @@ public class WaybillManagementService {
         PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, orders);
         return HttpResult.ok(build);
     }
+
+    /**
+     *
+     * @return
+     */
+    public  List<Integer> initWaybillIndexStatus() {
+        List<Integer> statuses = new ArrayList<>();
+        statuses.add(CarWaybillEnum.PENDING_VEHICLE.getCode());
+        statuses.add(CarWaybillEnum.EXIT_COMPLETED.getCode());
+        statuses.add(CarWaybillEnum.WAIT_LOADING.getCode());
+        statuses.add(CarWaybillEnum.COMPLETION_LOADING.getCode());
+        statuses.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
+        statuses.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
+        statuses.add(CarWaybillEnum.APPROVAL_PASS.getCode());
+        return statuses;
+    }
+
+    /**
+     * 运单看板 查询条件构造
+     * @param query
+     * @param statuses
+     * @return
+     */
+    public Criteria buildWaybillIndexQuery(WaybillOrderDTO query,List<Integer> statuses) {
+        Criteria criteria = new Criteria();
+        criteria.and("entId").is(LoginUserHolder.getEntId());
+        criteria.and("delFlag").is(NumberConstant.ZERO);
+
+        List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
+        if (CollectionUtils.isNotEmpty(wOrderIds)) {
+            Criteria.where("wOrderId").in(wOrderIds);
+        }
+
+        if (StringUtils.isNotBlank(query.getStatus())) {
+            criteria.and("status").is(query.getStatus());
+        } else {
+            criteria.and("status").in(statuses);
+        }
+
+        // 装货城市
+        if (StringUtils.isNotBlank(query.getLoadCityName()) && StringUtils.isNotEmpty(query.getLoadCityName())) {
+            criteria.and("loadCityName").is(query.getLoadCityName());
+        }
+        // 卸货城市
+        if (StringUtils.isNotBlank(query.getUnloadCityName()) && StringUtils.isNotEmpty(query.getUnloadCityName())) {
+            criteria.and("unloadCityName").is(query.getUnloadCityName());
+        }
+        // 装载时间
+        if (StringUtils.isNotBlank(query.getStartLoadTime()) && StringUtils.isNotEmpty(query.getEndLoadTime())) {
+            criteria.andOperator(Criteria.where("loadTime").gte(query.getStartLoadTime()), Criteria.where("loadTime")
+                    .lte(query.getEndLoadTime()));
+        }
+        if (StringUtils.isNotBlank(query.getStartLoadTime()) && StringUtils.isNotEmpty(query.getEndLoadTime())) {
+            criteria.andOperator(Criteria.where("loadTime").gte(query.getStartLoadTime()), Criteria.where("loadTime")
+                    .lte(query.getEndLoadTime()));
+        }
+        // 派车时间
+        if (StringUtils.isNotBlank(query.getStartSendCarTime()) && StringUtils.isNotEmpty(query.getEndSendCarTime())) {
+            criteria.andOperator(Criteria.where("sendCarTime").gte(query.getStartSendCarTime()), Criteria.where("sendCarTime")
+                    .lte(query.getEndSendCarTime()));
+        }
+        // 卸货时间
+        if (StringUtils.isNotBlank(query.getStartUnloadTime()) && StringUtils.isNotEmpty(query.getEndUnloadTime())) {
+            criteria.andOperator(Criteria.where("unloadTime").gte(query.getStartUnloadTime()), Criteria.where("unloadTime")
+                    .lte(query.getEndUnloadTime()));
+        }
+        // 多条件模糊查询
+        List<Criteria> orCriteria = new ArrayList<>();
+        if (StringUtils.isNotBlank(query.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            orCriteria.add(Criteria.where("wOrderNo").regex(pattern));
+            orCriteria.add(Criteria.where("truckNo").regex(pattern));
+            orCriteria.add(Criteria.where("driverName").regex(pattern));
+            orCriteria.add(Criteria.where("firmName").regex(pattern));
+            orCriteria.add(Criteria.where("loadAddress").regex(pattern));
+            orCriteria.add(Criteria.where("unloadAddress").regex(pattern));
+            criteria.orOperator(orCriteria);
+        }
+        return criteria;
+    }
+
+    /**
+     *  运单看板TOP
+     * @param query
+     * @return
+     */
+    public HttpResult waybillIndexStatistics(WaybillOrderDTO query){
+        List<Integer> statuses = initWaybillIndexStatus();
+        Criteria criteria = buildWaybillIndexQuery(query, statuses);
+        Aggregation aggregation = Aggregation.newAggregation(
+                Aggregation.match(criteria),
+                Aggregation.group("status").count().as("total"),
+                Aggregation.project("total").and("value").previousOperation()
+        );
+        AggregationResults<TableTops> outputTypeCount = mongoTemplate.aggregate(aggregation, SckwWaybillOrder.class, TableTops.class);
+        List<TableTops> results = outputTypeCount.getMappedResults();
+
+        Map<String, TableTops> listMap = new HashMap<>();
+        TableTops topTotal = new TableTops();
+        topTotal.setName("全部");
+        topTotal.setValue("");
+        topTotal.setTotal(0);
+        listMap.put("", topTotal);
+        statuses.forEach(e -> {
+            TableTops top = new TableTops();
+            top.setValue(String.valueOf(e));
+            top.setTotal(0);
+            switch (e){
+                case 2 -> top.setName("司机接单");
+                case 3 -> top.setName("出车");
+                case 4 -> top.setName("到装货地");
+                case 5 -> top.setName("装货");
+                case 6 -> top.setName("到卸货地");
+                case 7 -> top.setName("卸货");
+                case 8 -> top.setName("核单");
+            }
+            listMap.put(String.valueOf(e), top);
+        });
+        if(CollectionUtils.isNotEmpty(results)) {
+            for(TableTops result: results) {
+                listMap.get(result.getValue()).setTotal(result.getTotal());
+            }
+        }
+        listMap.get("").setTotal(listMap.values().parallelStream().mapToInt(e -> e.getTotal()).sum());
+        return HttpResult.ok(listMap.values());
+    }
 }

sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_jc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

sckw-modules/sckw-transport/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-transport
   profiles:
-    active: @profiles.active@
+    active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

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

@@ -315,7 +315,7 @@
             AND b.driver_phone like concat('%',#{driverParam.driverPhone},'%')
         </if>
         <if test="driverParam.truckNo != null and driverParam.truckNo != ''">
-<!--            AND b.truck_no = #{driverParam.truckNo}-->
+            <!--            AND b.truck_no = #{driverParam.truckNo}-->
             AND b.truck_no like concat('%',#{driverParam.truckNo},'%')
         </if>
         GROUP BY b.truck_no
@@ -361,7 +361,7 @@
     </select>
 
     <select id="selectOrderFinishData" resultType="com.sckw.transport.model.vo.OrderFinishVO">
-        SELECT COUNT(a.id) AS number,
+        SELECT b.amount as amount,COUNT(a.id) AS number,
         SUM(IFNULL(a.load_amount, 0)) as loadAmount,
         SUM(IFNULL(a.unload_amount, 0)) AS unloadAmount
         FROM kwt_waybill_order a
@@ -375,7 +375,8 @@
         </where>
     </select>
 
-    <select id="findLogisticsOrder" resultType="com.sckw.transport.model.KwtLogisticsOrder" parameterType="java.util.Map" >
+    <select id="findLogisticsOrder" resultType="com.sckw.transport.model.KwtLogisticsOrder"
+            parameterType="java.util.Map">
         select
         id, ent_id entId, t_order_id tOrderId, t_order_no tOrderNo, l_order_no lOrderNo, pid, pids,
         settlement_cycle settlementCycle, price, price_type priceType, billing_mode billingMode,
@@ -397,6 +398,5 @@
             and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
             and id != #{lOrderId, jdbcType=BIGINT}
         </if>
-
     </select>
 </mapper>