校验修改

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/ContractCommonInfoResDto.java

@@ -42,6 +42,16 @@ public class ContractCommonInfoResDto implements Serializable {
      */
     private String signingWayName;
 
+    /**
+     * 合同状态
+     */
+    private Integer status;
+
+    /**
+     * 合同状态名称
+     */
+    private String statusName;
+
     /**
      * 企业id
      */

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

@@ -11,6 +11,7 @@ import com.sckw.contract.model.entity.KwcContractLogistics;
 import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
 import com.sckw.contract.model.entity.KwcContractTrade;
 import com.sckw.contract.service.KwcContractLogisticsUnitService;
+import com.sckw.core.model.enums.ContractStatusEnum;
 import com.sckw.core.model.enums.SigningWayEnum;
 import com.sckw.core.utils.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -59,6 +60,8 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setSigningWay(kwcContractLogistics.getSigningWay());
         contractCommonInfoResDto.setSigningWayName(SigningWayEnum.getName(kwcContractLogistics.getSigningWay()).getName());
         contractCommonInfoResDto.setEntInfoList(entList);
+        contractCommonInfoResDto.setStatus(kwcContractLogistics.getStatus());
+        contractCommonInfoResDto.setStatusName(ContractStatusEnum.getName(kwcContractLogistics.getStatus()).getName());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractLogistics.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {
@@ -81,6 +84,8 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setSigningWay(kwcContractTrade.getSigningWay());
         contractCommonInfoResDto.setSigningWayName(SigningWayEnum.getName(kwcContractTrade.getSigningWay()).getName());
         contractCommonInfoResDto.setEntInfoList(entList);
+        contractCommonInfoResDto.setStatus(kwcContractTrade.getStatus());
+        contractCommonInfoResDto.setStatusName(ContractStatusEnum.getName(kwcContractTrade.getStatus()).getName());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractTrade.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {

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

@@ -2,6 +2,7 @@ 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;
@@ -53,12 +54,14 @@ public class LogisticsBaseInfoReqVo implements Serializable {
      * 合同编号
      */
     @NotBlank(message = "合同编号不能为空")
+    @Size(max = 20, message = "合同编号超长")
     private String contractCode;
 
     /**
      * 合同名称
      */
     @NotBlank(message = "合同名称不能为空")
+    @Size(max = 20, message = "合同名称超长")
     private String contractName;
 
     /**
@@ -77,4 +80,5 @@ public class LogisticsBaseInfoReqVo implements Serializable {
      */
     @NotNull(message = "生效时间不能为空")
     private Date startTime;
+
 }

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

@@ -1,5 +1,7 @@
 package com.sckw.manage.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -24,6 +26,8 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 区域名
      */
+    @NotBlank(message = "区域名不能为空")
+    @Size(max = 50, message = "区域名超长")
     private String cityName;
 
     /**
@@ -64,6 +68,7 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.sckw.manage.model.vo.req;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -19,11 +20,13 @@ public class BindManagerReqVo implements Serializable {
     /**
      * 用户id
      */
+    @NotNull(message = "用户id不能为空")
     private Long userId;
 
     /**
      * 主键id
      */
+    @NotNull(message = "id不能为空")
     private Long id;
 
 }

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

@@ -1,5 +1,6 @@
 package com.sckw.manage.model.vo.req;
 
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -29,6 +30,7 @@ public class CooperateApproveReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

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

@@ -1,6 +1,7 @@
 package com.sckw.manage.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -28,5 +29,6 @@ public class IdsReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 }

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

@@ -2,6 +2,7 @@ package com.sckw.manage.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;
@@ -33,6 +34,7 @@ public class InitiateReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**