From a3b57a71be624c98bddbd1f5e3a52c9b9466986e Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 22 八月 2024 10:40:58 +0800 Subject: [PATCH] 流水值调整功能bug修改。历史数据导入多个流水时,最大流水起始值未正确更新bug修复 --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 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..95ee245 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; - /** * 缂栫爜琛ヤ綅鏂瑰紡 @@ -231,6 +237,15 @@ */ private String customCodeSerialClass; + /** + * 鑷畾涔夌殑娴佹按绠楁硶绫� + */ + private String customCodeSerialClassText; + + /*** + * 鑷畾涔夋祦姘寸被鍨� + */ + private String customCodeSerialType; /** * 鏄惁鑷姩鍖归厤鍒嗙被鍊� */ @@ -275,8 +290,18 @@ private String displayFlag; /** - * 娴佹按渚濊禆椤哄簭 + * 娴佹按渚濊禆椤哄簭 TODO:鏈潵鏄敤鏉ヨ绠楁祦姘存帓搴忕殑锛屽悗闈㈠洜涓烘煇浜涘師鍥犳敼鐢╫rderNum浜� */ private Integer serialDependOrder; + /** + * 鍓嶇紑 + */ + private String prefixCode; + + /** + * 鍚庣紑 + */ + private String suffixCode; + } -- Gitblit v1.9.3