From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java | 203 ++++----------------------------------------------
1 files changed, 18 insertions(+), 185 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
index c143673..ae62cbc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.vo.pagemodel;
-
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
/**
* 涓婚搴撳垎绫绘樉绀哄璞�
@@ -9,7 +9,8 @@
* @author weidy
* @date 2022-01-20
*/
-public class CodeClassifyVO extends BaseModelVO {
+@Data
+public class CodeClassifyVO extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -19,50 +20,52 @@
/**
* 灞炴�ф帓搴忓彿
*/
- private Integer ordernum;
-
+ private Integer orderNum;
/**
* 鎵�灞炰笟鍔＄被鍨�
*/
- private String btmtypeid;
-
+ private String btmTypeId;
/**
* 鎵�灞炰笟鍔＄被鍨嬪悕绉�
*/
- private String btmtypename;
-
+ private String btmTypeName;
/**
* 缂栫爜瑙勫垯鐨勪富閿�
*/
- private String coderuleoid;
+ private String codeRuleOid;
/**
* 缂栫爜瑙勫垯鐨勪富閿樉绀烘枃鏈�
*/
- private String coderuleoidName;
+ private String codeRuleOidName;
/**
* 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯
*/
- private String codekeyattrrepeatoid;
+ private String codeKeyAttrRepeatOid;
/**
* 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯鏄剧ず鏂囨湰
*/
- private String codekeyattrrepeatoidName;
+ private String codeKeyAttrRepeatOidName;
/**
* 涓婄骇鏁版嵁鐨勪富閿�
*/
- private String parentcodeclassifyoid;
+ private String parentCodeClassifyOid;
/**
* 鏁版嵁鎵�鍦ㄧ殑灞傜骇
*/
private Integer dataLevel;
+
+ /**
+ * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ */
+ private String isParticipateCheck;
/**
* 灞傜骇鐨勮矾寰�
@@ -88,176 +91,6 @@
*/
private String codeResembleRuleOidName;
- public String getCodeResembleRuleOid() {
- return codeResembleRuleOid;
- }
+ private String total;
- public void setCodeResembleRuleOid(String codeResembleRuleOid) {
- this.codeResembleRuleOid = codeResembleRuleOid;
- }
-
- public String getCodeResembleRuleOidName() {
- return codeResembleRuleOidName;
- }
-
- public void setCodeResembleRuleOidName(String codeResembleRuleOidName) {
- this.codeResembleRuleOidName = codeResembleRuleOidName;
- }
-
- /**
- * 鑾峰彇 灞炴�ф帓搴忓彿
- */
- public Integer getOrdernum (){
- return ordernum;
- }
-
- /**
- * 璁剧疆 灞炴�ф帓搴忓彿
- */
- public void setOrdernum (Integer ordernum){
- this.ordernum = ordernum;
- }
- /**
- * 鑾峰彇 鎵�灞炰笟鍔＄被鍨�
- */
- public String getBtmtypeid (){
- return btmtypeid;
- }
-
- /**
- * 璁剧疆 鎵�灞炰笟鍔＄被鍨�
- */
- public void setBtmtypeid (String btmtypeid){
- this.btmtypeid = btmtypeid;
- }
- /**
- * 鑾峰彇 鎵�灞炰笟鍔＄被鍨嬪悕绉�
- */
- public String getBtmtypename (){
- return btmtypename;
- }
-
- /**
- * 璁剧疆 鎵�灞炰笟鍔＄被鍨嬪悕绉�
- */
- public void setBtmtypename (String btmtypename){
- this.btmtypename = btmtypename;
- }
- /**
- * 鑾峰彇 缂栫爜瑙勫垯鐨勪富閿�
- */
- public String getCoderuleoid (){
- return coderuleoid;
- }
-
- /**
- * 璁剧疆 缂栫爜瑙勫垯鐨勪富閿�
- */
- public void setCoderuleoid (String coderuleoid){
- this.coderuleoid = coderuleoid;
- }
- /**
- * 鑾峰彇缂栫爜瑙勫垯鐨勪富閿樉绀烘枃鏈�
- */
- public String getCoderuleoidName (){
- return coderuleoidName;
- }
-
- /**
- * 璁剧疆缂栫爜瑙勫垯鐨勪富閿樉绀烘枃鏈�
- */
- public void setCoderuleoidName (String coderuleoidName){
- this.coderuleoidName = coderuleoidName;
- }
- /**
- * 鑾峰彇 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯
- */
- public String getCodekeyattrrepeatoid (){
- return codekeyattrrepeatoid;
- }
-
- /**
- * 璁剧疆 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯
- */
- public void setCodekeyattrrepeatoid (String codekeyattrrepeatoid){
- this.codekeyattrrepeatoid = codekeyattrrepeatoid;
- }
- /**
- * 鑾峰彇鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯鏄剧ず鏂囨湰
- */
- public String getCodekeyattrrepeatoidName (){
- return codekeyattrrepeatoidName;
- }
-
- /**
- * 璁剧疆鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯鏄剧ず鏂囨湰
- */
- public void setCodekeyattrrepeatoidName (String codekeyattrrepeatoidName){
- this.codekeyattrrepeatoidName = codekeyattrrepeatoidName;
- }
- /**
- * 鑾峰彇 涓婄骇鏁版嵁鐨勪富閿�
- */
- public String getParentcodeclassifyoid (){
- return parentcodeclassifyoid;
- }
-
- /**
- * 璁剧疆 涓婄骇鏁版嵁鐨勪富閿�
- */
- public void setParentcodeclassifyoid (String parentcodeclassifyoid){
- this.parentcodeclassifyoid = parentcodeclassifyoid;
- }
-
- public Integer getDataLevel() {
- return dataLevel;
- }
-
- public void setDataLevel(Integer dataLevel) {
- this.dataLevel = dataLevel;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getNamePath() {
- return namePath;
- }
-
- public void setNamePath(String namePath) {
- this.namePath = namePath;
- }
-
- public String getIdPath() {
- return idPath;
- }
-
- public void setIdPath(String idPath) {
- this.idPath = idPath;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyVO{" +
- "ordernum=" + ordernum +
- ", btmtypeid='" + btmtypeid + '\'' +
- ", btmtypename='" + btmtypename + '\'' +
- ", coderuleoid='" + coderuleoid + '\'' +
- ", coderuleoidName='" + coderuleoidName + '\'' +
- ", codekeyattrrepeatoid='" + codekeyattrrepeatoid + '\'' +
- ", codekeyattrrepeatoidName='" + codekeyattrrepeatoidName + '\'' +
- ", parentcodeclassifyoid='" + parentcodeclassifyoid + '\'' +
- ", dataLevel=" + dataLevel +
- ", path='" + path + '\'' +
- ", namePath='" + namePath + '\'' +
- ", idPath='" + idPath + '\'' +
- ", codeResembleRuleOid='" + codeResembleRuleOid + '\'' +
- ", codeResembleRuleOidName='" + codeResembleRuleOidName + '\'' +
- '}';
- }
}
--
Gitblit v1.9.3