Merge remote-tracking branch 'origin/v29.6_ultimate_interaction_20241017' into dev_jdk17

clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectDriverTransportIntentionServiceImpl.java

@@ -146,7 +146,8 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
     @Transactional(rollbackFor = Exception.class)
     public Integer deleteCarrierDriverCollectTransportIntention(List<CarrierDriverCollectTransportIntentionDetailParam> param) {
         if (CollectionUtils.isEmpty(param)) {
-            // todo
+            log.info("deleteCarrierDriverCollectTransportIntention param is null");
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
         Set<Integer> paramsIds = param.stream()
                 .map(CarrierDriverCollectTransportIntentionDetailParam::getId)
@@ -180,8 +181,8 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
         // 1.查询所有已启用的信息
         IPage<CollectDriverTransportIntention> page = collectDriverTransportIntentionDao.listEnableInfo(param);
         if (CollectionUtils.isEmpty(page.getRecords())) {
-            // todo 错误提示
-            return null;
+            log.info("listCarrierDriverCollectTransportIntentionAll page is null");
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
         List<CarrierDriverCollectTransportIntentionVO> listVO = collectDriverTransportIntentionDaoStruct.covertList(page.getRecords());
         // 筛选主键id
@@ -190,8 +191,8 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
         List<CollectDriverTransportIntentionRecord> recordList = collectDriverTransportIntentionRecordDao
                 .listInField(CollectDriverTransportIntentionRecord::getCollectDriverTransportIntentionId, ids);
         if (CollectionUtils.isEmpty(recordList)) {
-            // todo 错误提示
-            return null;
+            log.info("listCarrierDriverCollectTransportIntentionAll recordList is null");
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
 
         List<CarrierDriverCollectTransportIntentionRecordVO> recordVOList

performance-api/src/main/java/com/clx/performance/param/app/collect/AppCarrierDriverCollectTransportIntentionParam.java

@@ -12,7 +12,6 @@ import lombok.Setter;
 @NoArgsConstructor
 public class AppCarrierDriverCollectTransportIntentionParam extends PageParam {
 
-    @NotBlank(message = "类型：1拉运意向 2拒绝拉运原因，类型不能为空")
     @Schema(description="状态：1拉运意向 2拒绝拉运")
     private Integer collectType;
 }

performance-api/src/main/java/com/clx/performance/param/app/collect/CarrierDriverCollectTransportIntentionAddParam.java

@@ -14,11 +14,6 @@ import java.util.List;
 @Setter
 @NoArgsConstructor
 public class CarrierDriverCollectTransportIntentionAddParam {
-    @Schema(description = "id", example = "123")
-    private Integer id;
-
-    @Schema(description="排序编号")
-    private Integer sortNo;
 
     @Schema(description="问题名称")
     @Size(max = 10, message = "问题名称长度不能超过10")
@@ -28,11 +23,9 @@ public class CarrierDriverCollectTransportIntentionAddParam {
     @Schema(description="问题描述")
     private String collectDescribe;
 
-    @NotBlank(message = "选择设置不能为空")
     @Schema(description="状态：1单选 2多选")
     private Integer collectCheckType;
 
-    @NotBlank(message = "类型：1拉运意向 2拒绝拉运原因，类型不能为空")
     @Schema(description="状态：1拉运意向 2拒绝拉运")
     private Integer collectType;
 

performance-api/src/main/java/com/clx/performance/param/app/collect/CarrierDriverCollectTransportIntentionEditParam.java

@@ -28,11 +28,9 @@ public class CarrierDriverCollectTransportIntentionEditParam {
     @Schema(description="问题描述")
     private String collectDescribe;
 
-    @NotBlank(message = "选择设置不能为空")
     @Schema(description="状态：1单选 2多选")
     private Integer collectCheckType;
 
-    @NotBlank(message = "类型：1拉运意向 2拒绝拉运原因，类型不能为空")
     @Schema(description="状态：1拉运意向 2拒绝拉运")
     private Integer collectType;
 

performance-api/src/main/java/com/clx/performance/param/app/collect/CarrierDriverCollectTransportIntentionParam.java

@@ -30,11 +30,9 @@ public class CarrierDriverCollectTransportIntentionParam extends PageParam {
     @Schema(description="问题描述")
     private String collectDescribe;
 
-    @NotBlank(message = "选择设置不能为空")
     @Schema(description="状态：1单选 2多选")
     private Integer collectCheckType;
 
-    @NotBlank(message = "类型：1拉运意向 2拒绝拉运原因，类型不能为空")
     @Schema(description="状态：1拉运意向 2拒绝拉运")
     private Integer collectType;