修改自动派车字段变量名，接口字段增加注解

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/controller/BaseController.java

@@ -54,16 +54,7 @@ public class BaseController
     /**
      * 响应请求分页数据
      */
-    protected PageDataResult<?> getDataTable(List<?> list,PageDomain pageDomain)
-    {
-        PageInfo<?> pageInfo = new PageInfo<>(list);
-        return PageDataResult.success(pageDomain.getPageNum(), pageDomain.getPageSize(), pageInfo.getTotal(), pageInfo.getList());
-    }
-
-    /**
-     * 响应请求分页数据
-     */
-    protected PageDataResult<?> getDataTable(PageInfo<?> pageInfo,PageDomain pageDomain)
+    protected <T> PageDataResult<T> getDataTable(PageInfo<T> pageInfo,PageDomain pageDomain)
     {
         return PageDataResult.success(pageDomain.getPageNum(), pageDomain.getPageSize(), pageInfo.getTotal(), pageInfo.getList());
     }

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/vo/KwcContractLogisticsDto.java

@@ -58,7 +58,7 @@ public class KwcContractLogisticsDto implements Serializable {
     /**
      * 派车方式(1手动派车、2自动派车)
      */
-    private Integer dispatching;
+    private Integer dispatchWay;
     /**
      * 开始日期
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractLogisticsScoreController.java

@@ -14,6 +14,7 @@ import com.sckw.core.web.page.TableSupport;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -38,20 +39,26 @@ public class KwcContractLogisticsScoreController extends BaseController
      * 查询物流企业评分列表
      */
     @GetMapping("/queryListByPage")
-    @Operation(summary = "分页查询供应商物流企业评分")
-    public BaseResult<PageDataResult<?>> queryListByPage()
+    @Operation(summary = "分页查询供应商物流企业评分",parameters =  {
+            @Parameter(name = "pageNum", description = "页码"),
+            @Parameter(name = "pageSize", description = "每页数量")
+    })
+    public BaseResult<PageDataResult<LogisticsScoreResVo>> queryListByPage()
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         PageInfo<LogisticsScoreResVo> list = kwcContractLogisticsScoreService.selectLogisticsScoreWithPendingSocreList(LoginUserHolder.getEntId());
-        return BaseResult.success(getDataTable(list,pageDomain));
+        return BaseResult.success(getDataTable(list, pageDomain));
     }
 
     /**
      * 查询物流企业评分明细列表
      */
     @PostMapping("/queryDetailListByPage")
-    @Operation(summary = "分页查指定评分的明细记录")
-    public BaseResult<PageDataResult<?>> queryDetailListByPage(@Validated @RequestBody LogisticsScoreDetailQueryDto detailReqDto)
+    @Operation(summary = "分页查指定评分的明细记录",parameters =  {
+            @Parameter(name = "pageNum", description = "页码"),
+            @Parameter(name = "pageSize", description = "每页数量")
+    })
+    public BaseResult<PageDataResult<LogisticsScoreDetailResVo>> queryDetailListByPage(@Validated @RequestBody LogisticsScoreDetailQueryDto detailReqDto)
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         PageInfo<LogisticsScoreDetailResVo> list = kwcContractLogisticsScoreService.selectKwcContractLogisticsScoreDetailList(detailReqDto,LoginUserHolder.getEntId());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -348,7 +348,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setEntInfoList(entList);
         contractCommonInfoResDto.setStatus(kwcContractLogistics.getStatus());
         contractCommonInfoResDto.setStatusName(Objects.requireNonNull(ContractStatusEnum.getName(kwcContractLogistics.getStatus())).getName());
-        contractCommonInfoResDto.setDispatchWay(kwcContractLogistics.getDispatching());
+        contractCommonInfoResDto.setDispatchWay(kwcContractLogistics.getDispatchWay());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractLogistics.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {
@@ -438,7 +438,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
             dto.setSigningWay(log.getSigningWay());
             dto.setCharging(log.getCharging());
             dto.setTrading(log.getTrading());
-            dto.setDispatching(log.getDispatching());
+            dto.setDispatchWay(log.getDispatchWay());
             dto.setStartTime(log.getStartTime());
             dto.setEndTime(log.getEndTime());
             dto.setAmount(log.getAmount());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/LogisticsScoreApprovalDto.java

@@ -1,5 +1,6 @@
 package com.sckw.contract.model.dto.req;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -11,14 +12,16 @@ import lombok.Data;
 @Data
 public class LogisticsScoreApprovalDto {
     /**
-     * 评分id
+     * 评分主键id
      */
     @NotNull(message = "评分id不能为空")
+    @Schema(description = "评分主键id")
     private Long scoreId;
 
     /**
      * 审批结果 0-拒绝 1-通过
      */
     @NotNull(message = "审批结果不能为空")
+    @Schema(description = "审批结果 0-拒绝 1-通过")
     private Integer approval;
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/LogisticsScoreDetailAddDto.java

@@ -15,9 +15,10 @@ import java.math.BigDecimal;
 @Data
 public class LogisticsScoreDetailAddDto {
     /**
-     * 评分id
+     * 评分主键id
      */
     @NotNull
+    @Schema(description = "评分主键id")
     private Long scoreId;
     /**
      * 评分行为影响人id
@@ -28,12 +29,14 @@ public class LogisticsScoreDetailAddDto {
      * 评分行为
      */
     @NotBlank
+    @Schema(description = "评分行为")
     private String action;
     /**
      *
      * 评分变动
      */
     @NotNull
+    @Schema(description = "评分变动")
     private BigDecimal scoreChange;
     /**
      * 评分状态 0-待审核 1-审核通过

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/LogisticsScoreDetailQueryDto.java

@@ -19,10 +19,12 @@ LogisticsScoreDetailQueryDto {
      * 评分id
      */
     @NotNull(message = "评分id不能为空")
+    @Schema(description = "评分id")
     private Long scoreId;
     /**
      * 行为
      */
+    @Schema(description = "行为")
     private String action;
 
     /**

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

@@ -55,7 +55,7 @@ public class KwcContractLogistics implements Serializable {
     /**
      * 派车方式(1手动派车、2自动派车)
      */
-    private Integer dispatching;
+    private Integer dispatchWay;
     /**
      * 开始日期
      */

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

@@ -129,11 +129,11 @@ public class LogisticListReq implements Serializable {
         private Integer signingWay;
 
         /**
-         * 派车方式（1手动派车、2自动派车）
+         * 派车方式 1手动派车、2自动派车
          */
         @NotNull(message = "派车方式不能为空")
-        @Schema(description = "签约方式,1-手动派车,2-自动派车",example = "1",defaultValue = "1")
-        private Integer dispatching = 1;
+        @Schema(description = "派车方式 1-手动派车,2-自动派车")
+        private Integer dispatchWay = 1;
 
         /**
          * 生效时间

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

@@ -156,7 +156,7 @@ public class SupplyContractTradeReq implements Serializable {
          * 派车方式
          */
         @NotNull(message = "派车方式不能为空")
-        @Schema(description = "派车方式")
+        @Schema(description = "派车方式 1-手动派车,2-自动派车")
         private Integer dispatchWay;
 
         /**

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

@@ -167,7 +167,7 @@ public class ContractDetailResp implements Serializable {
         /**
          * 派车方式
          */
-        @Schema(description = "派车方式")
+        @Schema(description = "派车方式 1-手动派车,2-自动派车")
         private Integer dispatchWay;
         /**
          * 派车方式描述

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

@@ -1,6 +1,7 @@
 package com.sckw.contract.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,35 +17,45 @@ public class LogisticsScoreDetailResVo {
     /**
      * 评分明细主键id
      */
+    @Schema(description = "评分明细主键id")
     private Long id;
 
     /** 评分主键id */
+    @Schema(description = "评分主键id")
     private Long scoreId;
 
     /** 物流企业名称 */
+    @Schema(description = "物流企业名称")
     private String logisticsEntName;
 
     /** 影响人id */
+    @Schema(description = "影响人id")
     private Long influenceBy;
 
     /** 影响人名字 */
+    @Schema(description = "影响人名字")
     private String influenceByName;
 
     /** 行为 */
+    @Schema(description = "行为")
     private String action;
 
     /** 评分变动 */
+    @Schema(description = "评分变动")
     private String scoreChange;
 
     /** 变动后评分 */
+    @Schema(description = "变动后评分")
     private String score;
 
     /** 审核状态 0-待审核，1-审核通过 */
+    @Schema(description = "审核状态 0-待审核，1-审核通过")
     private Integer status;
 
     /**
      * 更新时间
      */
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "更新时间")
     private Date updateTime;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.contract.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,20 +17,25 @@ public class LogisticsScoreResVo {
     /**
      * 评分主键id
      */
+    @Schema(description = "评分主键id")
     private Long id;
 
     /** 物流企业名称 */
+    @Schema(description = "物流企业名称")
     private String logisticsEntName;
 
     /** 物流企业评分 */
+    @Schema(description = "物流企业评分")
     private String score;
 
     /** 待审物流企业评分 */
+    @Schema(description = "待审物流企业评分")
     private String pendingScore;
 
     /**
      * 更新时间
      */
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "更新时间")
     private Date updateTime;
 }

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

@@ -137,13 +137,13 @@ public class QueryLogisticDetailResp implements Serializable {
         /**
          * 派车方式（1手动派车、2自动派车）
          */
-        @Schema(description = "派车方式")
-        private Integer dispatching;
+        @Schema(description = "派车方式 1-手动派车,2-自动派车")
+        private Integer dispatchWay;
         /**
          * 派车方式描述
          */
         @Schema(description = "派车方式描述")
-        private String dispatchingDesc;
+        private String dispatchWayDesc;
 
         /**
          * 生效时间

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

@@ -80,12 +80,12 @@ public class QueryLogisticListResp implements Serializable {
      * 派车方式
      */
     @Schema(description = "派车方式")
-    private Integer dispatching;
+    private Integer dispatchWay;
     /**
      * 派车方式描述
      */
     @Schema(description = "派车方式描述")
-    private String dispatchingDesc;
+    private String dispatchWayDesc;
     /**
      * 合同运输总量
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractLogisticsRepository.java

@@ -106,7 +106,7 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
         return getOne(Wrappers.<KwcContractLogistics>lambdaQuery()
                 .eq(KwcContractLogistics::getDelFlag, 0)
                 .in(KwcContractLogistics::getId, contractIdList)
-                .eq(KwcContractLogistics::getDispatching, dispatchingType)
+                .eq(KwcContractLogistics::getDispatchWay, dispatchingType)
                 .eq(KwcContractLogistics::getStatus,0)
                 .and(queryWrapper -> queryWrapper.between(KwcContractLogistics::getStartTime, startTime, endTime)
                         //结束日期不为空
@@ -121,7 +121,7 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
     public List<KwcContractLogistics> queryByIdsAndDispatch(List<Long> ids) {
         return list(Wrappers.<KwcContractLogistics>lambdaQuery()
                 .in(KwcContractLogistics::getId, ids)
-                .eq(KwcContractLogistics::getDispatching, 2)
+                .eq(KwcContractLogistics::getDispatchWay, 2)
                 .eq(KwcContractLogistics::getStatus, 0)
                 .eq(KwcContractLogistics::getDelFlag, 0));
     }

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

@@ -1181,8 +1181,8 @@ public class KwcContractLogisticsService {
         queryLogisticListResp.setSignWayDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(),
                 String.valueOf( r.getSigningWay())));
         //设置派车方式和派车方式描述字段
-        queryLogisticListResp.setDispatching(r.getDispatching());
-        queryLogisticListResp.setDispatchingDesc(DispatchingTypeEnum.getLabel(r.getDispatching()));
+        queryLogisticListResp.setDispatchWay(r.getDispatchWay());
+        queryLogisticListResp.setDispatchWayDesc(DispatchingTypeEnum.getLabel(r.getDispatchWay()));
         queryLogisticListResp.setPerformedAmount(Objects.nonNull(r.getPerformedAmount())
                 ? r.getPerformedAmount().toPlainString() : null);
         List<KwcContractLogisticsGoods> goods = finalContractIdAndGoodsMap.get(r.getId());
@@ -1259,7 +1259,7 @@ public class KwcContractLogisticsService {
         saveContractLogistics.setContractNo(baseInfo.getContractCode());
         saveContractLogistics.setName(baseInfo.getContractName());
         saveContractLogistics.setSigningWay(baseInfo.getSigningWay());
-        saveContractLogistics.setDispatching(baseInfo.getDispatching());
+        saveContractLogistics.setDispatchWay(baseInfo.getDispatchWay());
         saveContractLogistics.setStartTime(baseInfo.getStartTime());
         if (Objects.isNull(baseInfo.getEndTime())){
             LocalDate localDate = LocalDate.of(9999, 12, 30);
@@ -1305,14 +1305,14 @@ public class KwcContractLogisticsService {
         saveLogisticListUnit(entIdList, baseInfo, saveContractLogistics.getId(), date,entCacheResDtoMap);
 
         //如果是自动派单合同需要初始化物流企业评分记录和评分记录明细
-        if(DispatchingTypeEnum.AUTO.getValue().equals(baseInfo.getDispatching())){
+        if(DispatchingTypeEnum.AUTO.getValue().equals(baseInfo.getDispatchWay())){
             logisticsScoreService.initLogisticsScore(baseInfo);
         }
         return Boolean.TRUE;
     }
 
     private void checkAutoDispatchingContractEntType(LogisticListReq.TradeBaseInfo baseInfo,Map<Long, EntCacheResDto> entCacheResDtoMap) {
-        if(DispatchingTypeEnum.AUTO.getValue().equals(baseInfo.getDispatching())){
+        if(DispatchingTypeEnum.AUTO.getValue().equals(baseInfo.getDispatchWay())){
             EntCacheResDto entCacheResDto = entCacheResDtoMap.get(baseInfo.getProvideEntId());
             if (entCacheResDto != null && !entCacheResDto.getEntTypes().contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
                 throw new BusinessException("自动派车合同的托运单位必须为供应商");
@@ -1516,8 +1516,8 @@ public class KwcContractLogisticsService {
                 String.valueOf(logistics.getSigningWay())));
 
         //派车方式
-        tradeBaseInfo.setDispatching(logistics.getDispatching());
-        tradeBaseInfo.setDispatchingDesc(DispatchingTypeEnum.getLabel(logistics.getDispatching()));
+        tradeBaseInfo.setDispatchWay(logistics.getDispatchWay());
+        tradeBaseInfo.setDispatchWayDesc(DispatchingTypeEnum.getLabel(logistics.getDispatchWay()));
 
         tradeBaseInfo.setStartTime(logistics.getStartTime());
         tradeBaseInfo.setCommonPrice(logistics.getCommonPrice());

sql/2025/12/01/2025_12_03_tys_alert.sql

@@ -1 +1 @@
-ALTER TABLE `sckw_ng_contract`.`kwc_contract_logistics` ADD COLUMN `dispatching` int NULL DEFAULT 1 COMMENT '派车方式(1手动派车、2自动派车)' AFTER `trading`;
+ALTER TABLE `sckw_ng_contract`.`kwc_contract_logistics` ADD COLUMN `dispatch_way` int NULL DEFAULT 1 COMMENT '派车方式(1手动派车、2自动派车)' AFTER `trading`;