From 325b7373001115b26d3bf337b24427ba03de6a41 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 08 九月 2023 15:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java | 426 +---------------------------------------------------
1 files changed, 11 insertions(+), 415 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
index 43e837a..8fa4fb1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
@@ -1,16 +1,18 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
import java.util.List;
/**
* 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
*
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @date 2023-04-24
*/
-public class CodeBasicSecVO extends BaseModelVO {
+@Data
+public class CodeBasicSecVO extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -21,7 +23,6 @@
* 鐮佹绫诲瀷
*/
private String secType;
-
/**
* 鐮佹绫诲瀷鏄剧ず鏂囨湰
@@ -148,7 +149,6 @@
*/
private String filterSql ;
-
/**
* 娴佹按鍙疯捣濮嬪��
*/
@@ -158,7 +158,6 @@
* 娴佹按鐨勬闀�
*/
private Integer serialStep;
-
/**
* 缂栫爜琛ヤ綅鏂瑰紡
@@ -210,7 +209,6 @@
*/
private String parentClassifySecText;
-
/**
* 鏄惁鍙互涓虹┖
*/
@@ -237,415 +235,13 @@
private Integer serialDependOrder;
/**
+ * 鐮佸�肩敵璇疯〃鍗曚腑鏄剧ず闅愯棌绛夌姸鎬侊細 1(鍙緭)銆�2(鍙)銆�3(闅愯棌)
+ */
+ private Integer codeValueApplyStatus;
+
+ /**
* 鍥哄畾鐮佺殑鐮佸�煎唴瀹�
*/
private List<CodeFixedValueVO> fixedValueVOList;
- public String getReferCodeClassifyOidName() {
- return referCodeClassifyOidName;
- }
-
- public void setReferCodeClassifyOidName(String referCodeClassifyOidName) {
- this.referCodeClassifyOidName = referCodeClassifyOidName;
- }
-
- public String getReferAttributeId() {
- return referAttributeId;
- }
-
- public void setReferAttributeId(String referAttributeId) {
- this.referAttributeId = referAttributeId;
- }
-
- //鍒嗙被鐨勫唴瀹逛笉鑳界洿鎺ユ斁锛屽洜涓哄彲鑳藉緢澶�
-
- public String getPkCodeRule() {
- return pkCodeRule;
- }
-
- public void setPkCodeRule(String pkCodeRule) {
- this.pkCodeRule = pkCodeRule;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getCodeSecLengthTypeText() {
- return codeSecLengthTypeText;
- }
-
- public void setCodeSecLengthTypeText(String codeSecLengthTypeText) {
- this.codeSecLengthTypeText = codeSecLengthTypeText;
- }
-
- public String getMatchClassifyValueFlag() {
- return matchClassifyValueFlag;
- }
-
- public void setMatchClassifyValueFlag(String matchClassifyValueFlag) {
- this.matchClassifyValueFlag = matchClassifyValueFlag;
- }
-
- public String getParentClassifySecOid() {
- return parentClassifySecOid;
- }
-
- public void setParentClassifySecOid(String parentClassifySecOid) {
- this.parentClassifySecOid = parentClassifySecOid;
- }
-
- public String getParentClassifySecText() {
- return parentClassifySecText;
- }
-
- public void setParentClassifySecText(String parentClassifySecText) {
- this.parentClassifySecText = parentClassifySecText;
- }
-
- public String getNullableFlag() {
- return nullableFlag;
- }
-
- public void setNullableFlag(String nullableFlag) {
- this.nullableFlag = nullableFlag;
- }
-
- public String getComponentCodeFlag() {
- return componentCodeFlag;
- }
-
- public void setComponentCodeFlag(String componentCodeFlag) {
- this.componentCodeFlag = componentCodeFlag;
- }
-
- public String getSerialDependFlag() {
- return serialDependFlag;
- }
-
- public void setSerialDependFlag(String serialDependFlag) {
- this.serialDependFlag = serialDependFlag;
- }
-
- public String getDisplayFlag() {
- return displayFlag;
- }
-
- public void setDisplayFlag(String displayFlag) {
- this.displayFlag = displayFlag;
- }
-
- public Integer getSerialDependOrder() {
- return serialDependOrder;
- }
-
- public void setSerialDependOrder(Integer serialDependOrder) {
- this.serialDependOrder = serialDependOrder;
- }
-
- /**
- * 璁剧疆 鐮佹绫诲瀷
- */
- public void setSecType (String secType){
- this.secType = secType;
- }
-
- public String getSecTypeText() {
- return secTypeText;
- }
-
- public void setSecTypeText(String secTypeText) {
- this.secTypeText = secTypeText;
- }
-
- public String getSecType() {
- return secType;
- }
-
- public String getCodeSecLengthType() {
- return codeSecLengthType;
- }
-
- public void setCodeSecLengthType(String codeSecLengthType) {
- this.codeSecLengthType = codeSecLengthType;
- }
-
- public String getCodeSecLength() {
- return codeSecLength;
- }
-
- public void setCodeSecLength(String codeSecLength) {
- this.codeSecLength = codeSecLength;
- }
-
- public String getGetValueClass() {
- return getValueClass;
- }
-
- public void setGetValueClass(String getValueClass) {
- this.getValueClass = getValueClass;
- }
-
- public String getCodeDateFormatStr() {
- return codeDateFormatStr;
- }
-
- public void setCodeDateFormatStr(String codeDateFormatStr) {
- this.codeDateFormatStr = codeDateFormatStr;
- }
-
- public String getCodeLevelType() {
- return codeLevelType;
- }
-
- public void setCodeLevelType(String codeLevelType) {
- this.codeLevelType = codeLevelType;
- }
-
- public String getCodeLevelTypeText() {
- return codeLevelTypeText;
- }
-
- public void setCodeLevelTypeText(String codeLevelTypeText) {
- this.codeLevelTypeText = codeLevelTypeText;
- }
-
- public Integer getCodeLevelValue() {
- return codeLevelValue;
- }
-
- public void setCodeLevelValue(Integer codeLevelValue) {
- this.codeLevelValue = codeLevelValue;
- }
-
- public Integer getValueCutLength() {
- return valueCutLength;
- }
-
- public void setValueCutLength(Integer valueCutLength) {
- this.valueCutLength = valueCutLength;
- }
-
- public String getValueCutType() {
- return valueCutType;
- }
-
- public void setValueCutType(String valueCutType) {
- this.valueCutType = valueCutType;
- }
-
- public String getValueCutTypeText() {
- return valueCutTypeText;
- }
-
- public void setValueCutTypeText(String valueCutTypeText) {
- this.valueCutTypeText = valueCutTypeText;
- }
-
- public String getCodeGetValueType() {
- return codeGetValueType;
- }
-
- public void setCodeGetValueType(String codeGetValueType) {
- this.codeGetValueType = codeGetValueType;
- }
-
- public String getCodeGetValueTypeText() {
- return codeGetValueTypeText;
- }
-
- public void setCodeGetValueTypeText(String codeGetValueTypeText) {
- this.codeGetValueTypeText = codeGetValueTypeText;
- }
-
- public String getReferCodeClassifyOid() {
- return referCodeClassifyOid;
- }
-
- public void setReferCodeClassifyOid(String referCodeClassifyOid) {
- this.referCodeClassifyOid = referCodeClassifyOid;
- }
-
- public String getReferConfig() {
- return referConfig;
- }
-
- public void setReferConfig(String referConfig) {
- this.referConfig = referConfig;
- }
-
- public String getReferValueInfo() {
- return referValueInfo;
- }
-
- public void setReferValueInfo(String referValueInfo) {
- this.referValueInfo = referValueInfo;
- }
-
- public String getFilterSql() {
- return filterSql;
- }
-
- public void setFilterSql(String filterSql) {
- this.filterSql = filterSql;
- }
-
- public String getSerialStart() {
- return serialStart;
- }
-
- public void setSerialStart(String serialStart) {
- this.serialStart = serialStart;
- }
-
- public Integer getSerialStep() {
- return serialStep;
- }
-
- public void setSerialStep(Integer serialStep) {
- this.serialStep = serialStep;
- }
-
- public String getCodeFillType() {
- return codeFillType;
- }
-
- public void setCodeFillType(String codeFillType) {
- this.codeFillType = codeFillType;
- }
-
- public String getCodeFillTypeText() {
- return codeFillTypeText;
- }
-
- public void setCodeFillTypeText(String codeFillTypeText) {
- this.codeFillTypeText = codeFillTypeText;
- }
-
- public String getCodeFillSeparator() {
- return codeFillSeparator;
- }
-
- public void setCodeFillSeparator(String codeFillSeparator) {
- this.codeFillSeparator = codeFillSeparator;
- }
-
- public String getCodeFillLength() {
- return codeFillLength;
- }
-
- public void setCodeFillLength(String codeFillLength) {
- this.codeFillLength = codeFillLength;
- }
-
- public Integer getCodeFillLimit() {
- return codeFillLimit;
- }
-
- public void setCodeFillLimit(Integer codeFillLimit) {
- this.codeFillLimit = codeFillLimit;
- }
-
- public String getCodeFillFlag() {
- return codeFillFlag;
- }
-
- public void setCodeFillFlag(String codeFillFlag) {
- this.codeFillFlag = codeFillFlag;
- }
-
- public String getCustomCodeSerialClass() {
- return customCodeSerialClass;
- }
-
- public void setCustomCodeSerialClass(String customCodeSerialClass) {
- this.customCodeSerialClass = customCodeSerialClass;
- }
-
-
- public List<CodeFixedValueVO> getFixedValueVOList() {
- return fixedValueVOList;
- }
-
- public void setFixedValueVOList(List<CodeFixedValueVO> fixedValueVOList) {
- this.fixedValueVOList = fixedValueVOList;
- }
-
- public String getReferAttributeName() {
- return referAttributeName;
- }
-
- public void setReferAttributeName(String referAttributeName) {
- this.referAttributeName = referAttributeName;
- }
-
- public String getReferBtmId() {
- return referBtmId;
- }
-
- public void setReferBtmId(String referBtmId) {
- this.referBtmId = referBtmId;
- }
-
- public String getReferBtmName() {
- return referBtmName;
- }
-
- public void setReferBtmName(String referBtmName) {
- this.referBtmName = referBtmName;
- }
-
- @Override
- public String toString() {
- return "CodeBasicSecVO{" +
- "secType='" + secType + '\'' +
- ", secTypeText='" + secTypeText + '\'' +
- ", pkCodeRule='" + pkCodeRule + '\'' +
- ", orderNum=" + orderNum +
- ", codeSecLengthType='" + codeSecLengthType + '\'' +
- ", codeSecLengthTypeText='" + codeSecLengthTypeText + '\'' +
- ", codeSecLength='" + codeSecLength + '\'' +
- ", referAttributeName='" + referAttributeName + '\'' +
- ", referAttributeId='" + referAttributeId + '\'' +
- ", getValueClass='" + getValueClass + '\'' +
- ", codeDateFormatStr='" + codeDateFormatStr + '\'' +
- ", codeLevelType='" + codeLevelType + '\'' +
- ", codeLevelTypeText='" + codeLevelTypeText + '\'' +
- ", codeLevelValue=" + codeLevelValue +
- ", valueCutLength=" + valueCutLength +
- ", valueCutType='" + valueCutType + '\'' +
- ", valueCutTypeText='" + valueCutTypeText + '\'' +
- ", codeGetValueType='" + codeGetValueType + '\'' +
- ", codeGetValueTypeText='" + codeGetValueTypeText + '\'' +
- ", referCodeClassifyOid='" + referCodeClassifyOid + '\'' +
- ", referCodeClassifyOidName='" + referCodeClassifyOidName + '\'' +
- ", referBtmId='" + referBtmId + '\'' +
- ", referBtmName='" + referBtmName + '\'' +
- ", referConfig='" + referConfig + '\'' +
- ", referValueInfo='" + referValueInfo + '\'' +
- ", filterSql='" + filterSql + '\'' +
- ", serialStart='" + serialStart + '\'' +
- ", serialStep=" + serialStep +
- ", codeFillType='" + codeFillType + '\'' +
- ", codeFillTypeText='" + codeFillTypeText + '\'' +
- ", codeFillSeparator='" + codeFillSeparator + '\'' +
- ", codeFillLength='" + codeFillLength + '\'' +
- ", codeFillLimit=" + codeFillLimit +
- ", codeFillFlag='" + codeFillFlag + '\'' +
- ", customCodeSerialClass='" + customCodeSerialClass + '\'' +
- ", matchClassifyValueFlag='" + matchClassifyValueFlag + '\'' +
- ", parentClassifySecOid='" + parentClassifySecOid + '\'' +
- ", parentClassifySecText='" + parentClassifySecText + '\'' +
- ", nullableFlag='" + nullableFlag + '\'' +
- ", componentCodeFlag='" + componentCodeFlag + '\'' +
- ", serialDependFlag='" + serialDependFlag + '\'' +
- ", displayFlag='" + displayFlag + '\'' +
- ", serialDependOrder=" + serialDependOrder +
- ", fixedValueVOList=" + fixedValueVOList +
- "} " + super.toString();
- }
}
--
Gitblit v1.9.3