1、文本管理调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/DictItem.java

@@ -28,7 +28,7 @@ public class DictItem extends StringPropertyUUIDEntity {
     @Size(max = 64)
     @Column(name = "TYPE_ID")
     private String typeId;//所属的字典类型ID，DictType表的ID字段
-    @Size(max = 20)
+    @Size(max = 50)
     @Column(name = "CODE")
     private String code;//字典项的编码，用于唯一标识一个字典项
     @Size(max = 50)

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/operation/BusinessType.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.core.entity.dict.operation;
 
 /**
- * @desc : 库存类型
+ * @desc : 业务类型
  */
 public enum BusinessType {
     COMMON_PROBLEM("常见问题",1){},

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/operation/NoticePromptTextController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.UUID;
 
 /**
  * @Auther: humh
@@ -57,8 +58,4 @@ public class NoticePromptTextController extends MyValidController {
     }
 
 
-
-
-
-
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/operation/prompt/NoticePromptTextAddRequestDTO.java

@@ -27,7 +27,7 @@ public class NoticePromptTextAddRequestDTO extends AbstractStaffBizRequestDTO {
     private String title;
 
     @ApiModelProperty(value = "文本类型")
-    @NotBlank(message = "文本类型不能为空")
+    @NotNull(message = "文本类型不能为空")
     private TextType textType;
 
     @ApiModelProperty(value = "文本内容")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/operation/prompt/NoticePromptTextUpdateRequestDTO.java

@@ -32,7 +32,7 @@ public class NoticePromptTextUpdateRequestDTO extends AbstractStaffBizRequestDTO
     private String title;
 
     @ApiModelProperty(value = "文本类型")
-    @NotBlank(message = "文本类型不能为空")
+    @NotNull(message = "文本类型不能为空")
     private TextType textType;
 
     @ApiModelProperty(value = "文本内容")

zhywpt-dps-dmq/src/main/java/cn/com/taiji/dmq/manager/funds/FundsPushManager.java

@@ -86,7 +86,7 @@ public class FundsPushManager extends AbstractCommManager {
     }
 
     public FundsDetail pushData(FundsDetail detail) throws ManagerException {
-        FundsConfig config = fundsConfigRepo.findByAgencyIdAndEnableFlag(detail.getAgencyId(), ENABLE);
+        FundsConfig config = fundsConfigRepo.findByChannelIdAndEnableFlag(detail.getAgencyId(), ENABLE);
         if (config == null)
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("编号" + detail.getAgencyId() + "的渠道请款配置，未启用！");
         // 根据卡号获取车辆编号，并截取车牌号

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/handler/AliServiceHandler.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.ats.manager.handler;
 
-import cn.com.taiji.ats.config.AliConfig;
 import cn.com.taiji.ats.manager.ali.OrderApplyManager;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.file.FileProtocolSystemError;