From a9b4e8e7761359060b73edb86e36fd169b618b56 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 02 十一月 2023 23:52:36 +0800
Subject: [PATCH] 基础码段增加前缀后缀;主数据历史数据导入,模板下载设置编号列为文本类型

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 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 536c326..bd70e71 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,10 +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.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;
 
 /**
  * 鍩虹鐮佹鐨勪俊鎭�
@@ -14,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 {
 
 	/**
 	 * 搴忓垪鍖�
@@ -27,16 +34,19 @@
 	/**
 	 * 鐮佹淇℃伅
 	 */
+	@NotBlank(message = "鐮佹淇℃伅涓嶈兘涓虹┖")
 	private String id;
 
 	/**
 	 * 鐮佹鍚嶇О
 	 */
+	@NotBlank(message = "鐮佹鍚嶇О涓嶈兘涓虹┖")
 	private String name;
 
 	/**
 	 * 鐮佹绫诲瀷
 	 */
+	@NotBlank(message = "鐮佹绫诲瀷涓嶈兘涓虹┖")
 	private String secType;
 
 	/**
@@ -49,6 +59,7 @@
 	/**
 	 * 鎵�灞炵紪鐮佽鍒�
 	 */
+	@NotBlank(message = "鎵�灞炵紪鐮佽鍒欎笉鑳戒负绌�")
 	private String pkCodeRule;
 
 	/**
@@ -80,6 +91,7 @@
 	/**
 	 * 鐮佹闀垮害绫诲瀷
 	 */
+	//@VciUseEnum(value = MdmEnumIdConstant.CODE_SEC_LENGTH,showTextField = "secLengthTypeText")
 	private String codeSecLengthType;
 
 	/**
@@ -96,6 +108,7 @@
 	/**
 	 * 灞傜骇绫诲瀷
 	 */
+	//@VciUseEnum(value = MdmEnumIdConstant.CODE_SEC_TYPE,showTextField = "secTypeText")
 	private String codeLevelType;
 
 	/**
@@ -117,6 +130,7 @@
 	/**
 	 * 瀛楃鎴彇绫诲瀷
 	 */
+	//@VciUseEnum(value = MdmEnumIdConstant.CODE_CUT_TYPE,showTextField = "valueCutTypeText")
 	private String valueCutType;
 
 	/**
@@ -129,6 +143,7 @@
 	/**
 	 * 鍙栧�肩被鍨�
 	 */
+	//@VciUseEnum(value = MdmEnumIdConstant.CODE_GET_VALUE_TYPE,showTextField = "codeGetValueTypeText")
 	private String codeGetValueType;
 
 	/**
@@ -175,7 +190,6 @@
 	 */
 	private String filterSql ;
 
-
 	/**
 	 * 娴佹按鍙疯捣濮嬪��
 	 */
@@ -185,7 +199,6 @@
 	 * 娴佹按鐨勬闀�
 	 */
 	private Integer serialStep;
-
 
 	/**
 	 * 缂栫爜琛ヤ綅鏂瑰紡
@@ -272,4 +285,14 @@
 	 */
 	private Integer serialDependOrder;
 
+	/**
+	 * 鍓嶇紑
+	 */
+	private String prefixCode;
+
+	/**
+	 * 鍚庣紑
+	 */
+	private String suffixCode;
+
 }

--
Gitblit v1.9.3