From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
index 6e62873..bd66981 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.com.vci.starter.annotation.Transient;
-import com.vci.ubcs.com.vci.starter.web.annotation.VciUseEnum;
-import com.vci.ubcs.com.vci.starter.web.constant.EnumIdConstant;
-import com.vci.ubcs.com.vci.starter.web.constant.MdmEnumIdConstant;
+
+import com.vci.ubcs.starter.annotation.Transient;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.Alias;
+
+import javax.validation.constraints.NotBlank;
+import java.sql.Clob;
/**
* 鍩虹鐮佹鐨勪俊鎭�
@@ -17,10 +21,10 @@
* @date 2022-1-18
*/
@Data
-@TableName("PL_CODE_BASICSEC")
+@TableName(CodeTableNameConstant.PL_CODE_BASICSEC)
@ApiModel(value = "CodeBasicSec瀵硅薄", description = "鐮佹鍩虹淇℃伅")
@EqualsAndHashCode(callSuper = true)
-public class CodeBasicSec extends BaseModel{
+public class CodeBasicSec extends BaseModel {
/**
* 搴忓垪鍖�
@@ -30,16 +34,19 @@
/**
* 鐮佹淇℃伅
*/
+ @NotBlank(message = "鐮佹淇℃伅涓嶈兘涓虹┖")
private String id;
/**
* 鐮佹鍚嶇О
*/
+ @NotBlank(message = "鐮佹鍚嶇О涓嶈兘涓虹┖")
private String name;
/**
* 鐮佹绫诲瀷
*/
+ @NotBlank(message = "鐮佹绫诲瀷涓嶈兘涓虹┖")
private String secType;
/**
@@ -52,6 +59,7 @@
/**
* 鎵�灞炵紪鐮佽鍒�
*/
+ @NotBlank(message = "鎵�灞炵紪鐮佽鍒欎笉鑳戒负绌�")
private String pkCodeRule;
/**
@@ -182,7 +190,6 @@
*/
private String filterSql ;
-
/**
* 娴佹按鍙疯捣濮嬪��
*/
@@ -192,7 +199,6 @@
* 娴佹按鐨勬闀�
*/
private Integer serialStep;
-
/**
* 缂栫爜琛ヤ綅鏂瑰紡
--
Gitblit v1.9.3