From 436a5a391a514c9ac345554bafead583f124d8b4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 五月 2023 22:55:04 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java           |  797 -------------------
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java                        |    4 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java         |  117 --
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java             |    4 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java   |  867 +--------------------
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java          |   30 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java             |   15 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java |  147 ---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java         |   37 
 Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml                                                                        |    5 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java              |   82 ++
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeClstemplateVO.java                      |   30 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java                 |   74 +
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java        |   90 ++
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java                  |   52 -
 15 files changed, 411 insertions(+), 1,940 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
index 53b5331..fbb0240 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
@@ -1,19 +1,38 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 搴勯獮 (smallchill@163.com)
+ */
 package com.vci.ubcs.code.dto;
 
-
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
+ * 缂栫爜搴撳畾涔�-妯℃澘灞炴�� 鏁版嵁浼犺緭瀵硅薄瀹炰綋绫�
  *
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @since 2023-05-8
  */
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class CodeClassifyTemplateAttrDTO extends BaseModelVO {
 
 	/**
-     * 绂佹淇敼杩欎釜鍊�
-     */
+	 * 绂佹淇敼杩欎釜鍊�
+	 */
 	private static final long serialVersionUID = 4615707118652601470L;
 
 	/**
@@ -261,787 +280,31 @@
 	/**
 	 * 璇存槑
 	 */
+	//@Column(columnDefinition = "璇存槑")
 	private String explain;
 
 	/**
 	 * 閫夋嫨搴撴爣璇�
 	 */
+	//@Column(columnDefinition = "閫夋嫨搴撴爣璇�")
 	private String libraryIdentification;
 
 	/**
 	 * 绾ц仈灞炴�х紪鍙�
 	 */
+	//@Column(columnDefinition = "绾ц仈灞炴�х紪鍙�")
 	private String parentCode;
 
 	/**
 	 * 绾ц仈灞炴�у悕绉�
 	 */
+	//@Column(columnDefinition = "绾ц仈灞炴�у悕绉�")
 	private String parentName;
 
 	/**
 	 * 绾ц仈鏌ヨ灞炴��
 	 */
+	//@Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
 	private String parentQueryAttr;
 
-	public String getExplain() {
-		return explain;
-	}
-
-	public void setExplain(String explain) {
-		this.explain = explain;
-	}
-
-	public String getLibraryIdentification() {
-		return libraryIdentification;
-	}
-
-	public void setLibraryIdentification(String libraryIdentification) {
-		this.libraryIdentification = libraryIdentification;
-	}
-
-	public String getParentCode() {
-		return parentCode;
-	}
-
-	public void setParentCode(String parentCode) {
-		this.parentCode = parentCode;
-	}
-
-	public String getParentName() {
-		return parentName;
-	}
-
-	public void setParentName(String parentName) {
-		this.parentName = parentName;
-	}
-
-	public String getParentQueryAttr() {
-		return parentQueryAttr;
-	}
-
-	public void setParentQueryAttr(String parentQueryAttr) {
-		this.parentQueryAttr = parentQueryAttr;
-	}
-
-	public String getEnumString() {
-		return enumString;
-	}
-
-	public void setEnumString(String enumString) {
-		this.enumString = enumString;
-	}
-
-	/**
-	 * 鑾峰彇 鎵�灞炴ā鏉�
-	 */
-	public String getClassifytemplateoid (){
-		return classifytemplateoid;
-	}
-
-	/**
-	 * 璁剧疆 鎵�灞炴ā鏉�
-	 */
-	public void setClassifytemplateoid (String classifytemplateoid){
-		this.classifytemplateoid = classifytemplateoid;
-	}
-
-	/**
-	 * 鑾峰彇鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	 */
-	public String getClassifytemplateoidName (){
-		return classifytemplateoidName;
-	}
-
-	/**
-	 * 璁剧疆鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	 */
-	public void setClassifytemplateoidName (String classifytemplateoidName){
-		this.classifytemplateoidName = classifytemplateoidName;
-	}
-	/**
-	 * 鑾峰彇 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
-	 */
-	public String getClassifyattributeoid (){
-		return classifyattributeoid;
-	}
-
-	/**
-	 * 璁剧疆 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
-	 */
-	public void setClassifyattributeoid (String classifyattributeoid){
-		this.classifyattributeoid = classifyattributeoid;
-	}
-
-	/**
-	 * 鑾峰彇鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
-	 */
-	public String getClassifyattributeoidName (){
-		return classifyattributeoidName;
-	}
-
-	/**
-	 * 璁剧疆鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
-	 */
-	public void setClassifyattributeoidName (String classifyattributeoidName){
-		this.classifyattributeoidName = classifyattributeoidName;
-	}
-	/**
-	 * 鑾峰彇 灞炴�х殑绫诲瀷
-	 */
-	public String getAttributedatatype (){
-		return attributedatatype;
-	}
-
-	/**
-	 * 璁剧疆 灞炴�х殑绫诲瀷
-	 */
-	public void setAttributedatatype (String attributedatatype){
-		this.attributedatatype = attributedatatype;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁鍏抽敭灞炴��
-	 */
-	public String getKeyattrflag (){
-		return keyattrflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁鍏抽敭灞炴��
-	 */
-	public void setKeyattrflag (String keyattrflag){
-		this.keyattrflag = keyattrflag;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁蹇�熸煡璇㈠睘鎬�
-	 */
-	public String getQueryattrflag (){
-		return queryattrflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁蹇�熸煡璇㈠睘鎬�
-	 */
-	public void setQueryattrflag (String queryattrflag){
-		this.queryattrflag = queryattrflag;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁楂樼骇鏌ヨ灞炴��
-	 */
-	public String getSeniorqueryattrflag (){
-		return seniorqueryattrflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁楂樼骇鏌ヨ灞炴��
-	 */
-	public void setSeniorqueryattrflag (String seniorqueryattrflag){
-		this.seniorqueryattrflag = seniorqueryattrflag;
-	}
-
-	/**
-	 * 鑾峰彇 鐩镐技鏌ラ噸灞炴��
-	 */
-	public String getSamerepeatattrflag (){
-		return samerepeatattrflag;
-	}
-
-	/**
-	 * 璁剧疆 鐩镐技鏌ラ噸灞炴��
-	 */
-	public void setSamerepeatattrflag (String samerepeatattrflag){
-		this.samerepeatattrflag = samerepeatattrflag;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁鎺掑簭
-	 */
-	public String getSortattrflag (){
-		return sortattrflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁鎺掑簭
-	 */
-	public void setSortattrflag (String sortattrflag){
-		this.sortattrflag = sortattrflag;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁鐢熸垚浜岀淮鐮�
-	 */
-	public String getQrcodeflag (){
-		return qrcodeflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁鐢熸垚浜岀淮鐮�
-	 */
-	public void setQrcodeflag (String qrcodeflag){
-		this.qrcodeflag = qrcodeflag;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁鐢熸垚涓�缁寸爜
-	 */
-	public String getBarcodeflag (){
-		return barcodeflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁鐢熸垚涓�缁寸爜
-	 */
-	public void setBarcodeflag (String barcodeflag){
-		this.barcodeflag = barcodeflag;
-	}
-
-	/**
-	 * 鑾峰彇 缁勫悎瑙勫垯
-	 */
-	public String getComponentrule (){
-		return componentrule;
-	}
-
-	/**
-	 * 璁剧疆 缁勫悎瑙勫垯
-	 */
-	public void setComponentrule (String componentrule){
-		this.componentrule = componentrule;
-	}
-
-	/**
-	 * 鑾峰彇 楠岃瘉瑙勫垯
-	 */
-	public String getVerifyrule (){
-		return verifyrule;
-	}
-
-	/**
-	 * 璁剧疆 楠岃瘉瑙勫垯
-	 */
-	public void setVerifyrule (String verifyrule){
-		this.verifyrule = verifyrule;
-	}
-
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆灞傜骇
-	 */
-	public String getClassifyinvokelevel (){
-		return classifyinvokelevel;
-	}
-
-	/**
-	 * 璁剧疆 鍒嗙被娉ㄥ叆灞傜骇
-	 */
-	public void setClassifyinvokelevel (String classifyinvokelevel){
-		this.classifyinvokelevel = classifyinvokelevel;
-	}
-
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
-	 */
-	public String getClassifyinvokeattr (){
-		return classifyinvokeattr;
-	}
-
-	/**
-	 * 璁剧疆 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
-	 */
-	public void setClassifyinvokeattr (String classifyinvokeattr){
-		this.classifyinvokeattr = classifyinvokeattr;
-	}
-
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
-	 */
-	public String getClassifyinvokeattrname (){
-		return classifyinvokeattrname;
-	}
-
-	/**
-	 * 璁剧疆 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
-	 */
-	public void setClassifyinvokeattrname (String classifyinvokeattrname){
-		this.classifyinvokeattrname = classifyinvokeattrname;
-	}
-
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
-	 */
-	public String getClassifyinvokeeditflag (){
-		return classifyinvokeeditflag;
-	}
-
-	/**
-	 * 璁剧疆 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
-	 */
-	public void setClassifyinvokeeditflag (String classifyinvokeeditflag){
-		this.classifyinvokeeditflag = classifyinvokeeditflag;
-	}
-
-	/**
-	 * 鑾峰彇 鐮佸�煎簭鍙�
-	 */
-	public Integer getOrdernum (){
-		return ordernum;
-	}
-
-	/**
-	 * 璁剧疆 鐮佸�煎簭鍙�
-	 */
-	public void setOrdernum (Integer ordernum){
-		this.ordernum = ordernum;
-	}
-
-	/**
-	 * 鑾峰彇 琛ㄥ崟閲屾槸鍚︽樉绀�
-	 */
-	public String getFormdisplayflag (){
-		return formdisplayflag;
-	}
-
-	/**
-	 * 璁剧疆 琛ㄥ崟閲屾槸鍚︽樉绀�
-	 */
-	public void setFormdisplayflag (String formdisplayflag){
-		this.formdisplayflag = formdisplayflag;
-	}
-
-	/**
-	 * 鑾峰彇 鍒楄〃閲屾槸鍚︽樉绀�
-	 */
-	public String getTabledisplayflag (){
-		return tabledisplayflag;
-	}
-
-	/**
-	 * 璁剧疆 鍒楄〃閲屾槸鍚︽樉绀�
-	 */
-	public void setTabledisplayflag (String tabledisplayflag){
-		this.tabledisplayflag = tabledisplayflag;
-	}
-
-	/**
-	 * 鑾峰彇 鎵�灞炲睘鎬у垎缁�
-	 */
-	public String getAttributegroup (){
-		return attributegroup;
-	}
-
-	/**
-	 * 璁剧疆 鎵�灞炲睘鎬у垎缁�
-	 */
-	public void setAttributegroup (String attributegroup){
-		this.attributegroup = attributegroup;
-	}
-
-	/**
-	 * 鑾峰彇 浣跨敤鏋氫妇鑻辨枃缂栧彿
-	 */
-	public String getEnumid (){
-		return enumid;
-	}
-
-	/**
-	 * 璁剧疆 浣跨敤鏋氫妇鑻辨枃缂栧彿
-	 */
-	public void setEnumid (String enumid){
-		this.enumid = enumid;
-	}
-
-	/**
-	 * 鑾峰彇 浣跨敤鏋氫妇涓枃鍚嶇О
-	 */
-	public String getEnumname (){
-		return enumname;
-	}
-
-	/**
-	 * 璁剧疆 浣跨敤鏋氫妇涓枃鍚嶇О
-	 */
-	public void setEnumname (String enumname){
-		this.enumname = enumname;
-	}
-
-	/**
-	 * 鑾峰彇 鏋氫妇鏄惁鍙互缂栬緫
-	 */
-	public String getEnumeditflag (){
-		return enumeditflag;
-	}
-
-	/**
-	 * 璁剧疆 鏋氫妇鏄惁鍙互缂栬緫
-	 */
-	public void setEnumeditflag (String enumeditflag){
-		this.enumeditflag = enumeditflag;
-	}
-
-	/**
-	 * 鑾峰彇 鍙傜収鐨勪笟鍔$被鍨嬭嫳鏂囧悕绉�
-	 */
-	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;
-	}
-
-
-	/**
-	 * 鑾峰彇 鏄惁蹇呰緭
-	 */
-	public String getRequireflag (){
-		return requireflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁蹇呰緭
-	 */
-	public void setRequireflag (String requireflag){
-		this.requireflag = requireflag;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁鍙
-	 */
-	public String getReadonlyflag (){
-		return readonlyflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁鍙
-	 */
-	public void setReadonlyflag (String readonlyflag){
-		this.readonlyflag = readonlyflag;
-	}
-
-	/**
-	 * 鑾峰彇 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
-	 */
-	public Integer getControllength (){
-		return controllength;
-	}
-
-	/**
-	 * 璁剧疆 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
-	 */
-	public void setControllength (Integer controllength){
-		this.controllength = controllength;
-	}
-
-	/**
-	 * 鑾峰彇 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
-	 */
-	public String getFormdisplaystyle (){
-		return formdisplaystyle;
-	}
-
-	/**
-	 * 璁剧疆 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
-	 */
-	public void setFormdisplaystyle (String formdisplaystyle){
-		this.formdisplaystyle = formdisplaystyle;
-	}
-
-	/**
-	 * 鑾峰彇 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
-	 */
-	public String getTabledisplaystyle (){
-		return tabledisplaystyle;
-	}
-
-	/**
-	 * 璁剧疆 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
-	 */
-	public void setTabledisplaystyle (String tabledisplaystyle){
-		this.tabledisplaystyle = tabledisplaystyle;
-	}
-
-	/**
-	 * 鑾峰彇 琛ㄥ崟涓秴閾炬帴鍐呭
-	 */
-	public String getFormhref (){
-		return formhref;
-	}
-
-	/**
-	 * 璁剧疆 琛ㄥ崟涓秴閾炬帴鍐呭
-	 */
-	public void setFormhref (String formhref){
-		this.formhref = formhref;
-	}
-
-	/**
-	 * 鑾峰彇 琛ㄦ牸涓秴閾炬帴鍐呭
-	 */
-	public String getTablehref (){
-		return tablehref;
-	}
-
-	/**
-	 * 璁剧疆 琛ㄦ牸涓秴閾炬帴鍐呭
-	 */
-	public void setTablehref (String tablehref){
-		this.tablehref = tablehref;
-	}
-
-	/**
-	 * 鑾峰彇 灏忔暟绮惧害
-	 */
-	public Integer getPrecisionlength (){
-		return precisionlength;
-	}
-
-	/**
-	 * 璁剧疆 灏忔暟绮惧害
-	 */
-	public void setPrecisionlength (Integer precisionlength){
-		this.precisionlength = precisionlength;
-	}
-
-	/**
-	 * 鑾峰彇 灏忔暟鍒诲害
-	 */
-	public Integer getScalelength (){
-		return scalelength;
-	}
-
-	/**
-	 * 璁剧疆 灏忔暟鍒诲害
-	 */
-	public void setScalelength (Integer scalelength){
-		this.scalelength = scalelength;
-	}
-
-	/**
-	 * 鑾峰彇 鍙栧�艰寖鍥�
-	 */
-	public String getValuearea (){
-		return valuearea;
-	}
-
-	/**
-	 * 璁剧疆 鍙栧�艰寖鍥�
-	 */
-	public void setValuearea (String valuearea){
-		this.valuearea = valuearea;
-	}
-
-	/**
-	 * 鑾峰彇 鏃堕棿鏍煎紡
-	 */
-	public String getCodedateformat (){
-		return codedateformat;
-	}
-
-	/**
-	 * 璁剧疆 鏃堕棿鏍煎紡
-	 */
-	public void setCodedateformat (String codedateformat){
-		this.codedateformat = codedateformat;
-	}
-
-	/**
-	 * 鑾峰彇 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
-	 */
-	public String getTabledisplayjs (){
-		return tabledisplayjs;
-	}
-
-	/**
-	 * 璁剧疆 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
-	 */
-	public void setTabledisplayjs (String tabledisplayjs){
-		this.tabledisplayjs = tabledisplayjs;
-	}
-
-	/**
-	 * 鑾峰彇 鏄惁鏄剧ず澶氳鏂囨湰
-	 */
-	public String getTextareaflag (){
-		return textareaflag;
-	}
-
-	/**
-	 * 璁剧疆 鏄惁鏄剧ず澶氳鏂囨湰
-	 */
-	public void setTextareaflag (String textareaflag){
-		this.textareaflag = textareaflag;
-	}
-
-	/**
-	 * 鑾峰彇 棰勮鍥�
-	 */
-	public String getImageflag (){
-		return imageflag;
-	}
-
-	/**
-	 * 璁剧疆 棰勮鍥�
-	 */
-	public void setImageflag (String imageflag){
-		this.imageflag = imageflag;
-	}
-
-	/**
-	 * 鑾峰彇 榛樿鍊�
-	 */
-	public String getDefaultvalue (){
-		return defaultvalue;
-	}
-
-	/**
-	 * 璁剧疆 榛樿鍊�
-	 */
-	public void setDefaultvalue (String defaultvalue){
-		this.defaultvalue = defaultvalue;
-	}
-
-	/**
-	 * 鑾峰彇 鍓嶇紑
-	 */
-	public String getPrefixvalue (){
-		return prefixvalue;
-	}
-
-	/**
-	 * 璁剧疆 鍓嶇紑
-	 */
-	public void setPrefixvalue (String prefixvalue){
-		this.prefixvalue = prefixvalue;
-	}
-
-	/**
-	 * 鑾峰彇 鍚庣紑
-	 */
-	public String getSuffixvalue (){
-		return suffixvalue;
-	}
-
-	/**
-	 * 璁剧疆 鍚庣紑
-	 */
-	public void setSuffixvalue (String suffixvalue){
-		this.suffixvalue = suffixvalue;
-	}
-
-	/**
-	 * 鑾峰彇 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
-	 */
-	public String getFiltersourceattr (){
-		return filtersourceattr;
-	}
-
-	/**
-	 * 璁剧疆 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
-	 */
-	public void setFiltersourceattr (String filtersourceattr){
-		this.filtersourceattr = filtersourceattr;
-	}
-
-	/**
-	 * 鑾峰彇 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
-	 */
-	public String getFiltersourceattrname (){
-		return filtersourceattrname;
-	}
-
-	/**
-	 * 璁剧疆 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
-	 */
-	public void setFiltersourceattrname (String filtersourceattrname){
-		this.filtersourceattrname = filtersourceattrname;
-	}
-
-	public Integer getAttrTableWidth() {
-		return attrTableWidth;
-	}
-
-	public void setAttrTableWidth(Integer attrTableWidth) {
-		this.attrTableWidth = attrTableWidth;
-	}
-
-	public String getReferConfig() {
-		return referConfig;
-	}
-
-	public void setReferConfig(String referConfig) {
-		this.referConfig = referConfig;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeClassifyTemplateAttrDTO{" +
-				"classifytemplateoid='" + classifytemplateoid + '\'' +
-				", classifytemplateoidName='" + classifytemplateoidName + '\'' +
-				", classifyattributeoid='" + classifyattributeoid + '\'' +
-				", classifyattributeoidName='" + classifyattributeoidName + '\'' +
-				", attributedatatype='" + attributedatatype + '\'' +
-				", keyattrflag='" + keyattrflag + '\'' +
-				", queryattrflag='" + queryattrflag + '\'' +
-				", seniorqueryattrflag='" + seniorqueryattrflag + '\'' +
-				", samerepeatattrflag='" + samerepeatattrflag + '\'' +
-				", sortattrflag='" + sortattrflag + '\'' +
-				", qrcodeflag='" + qrcodeflag + '\'' +
-				", barcodeflag='" + barcodeflag + '\'' +
-				", componentrule='" + componentrule + '\'' +
-				", verifyrule='" + verifyrule + '\'' +
-				", classifyinvokelevel='" + classifyinvokelevel + '\'' +
-				", classifyinvokeattr='" + classifyinvokeattr + '\'' +
-				", classifyinvokeattrname='" + classifyinvokeattrname + '\'' +
-				", classifyinvokeeditflag='" + classifyinvokeeditflag + '\'' +
-				", ordernum=" + ordernum +
-				", formdisplayflag='" + formdisplayflag + '\'' +
-				", tabledisplayflag='" + tabledisplayflag + '\'' +
-				", attributegroup='" + attributegroup + '\'' +
-				", enumString='" + enumString + '\'' +
-				", enumid='" + enumid + '\'' +
-				", enumname='" + enumname + '\'' +
-				", enumeditflag='" + enumeditflag + '\'' +
-				", referbtmid='" + referbtmid + '\'' +
-				", referbtmname='" + referbtmname + '\'' +
-				", referConfig='" + referConfig + '\'' +
-				", requireflag='" + requireflag + '\'' +
-				", readonlyflag='" + readonlyflag + '\'' +
-				", controllength=" + controllength +
-				", formdisplaystyle='" + formdisplaystyle + '\'' +
-				", tabledisplaystyle='" + tabledisplaystyle + '\'' +
-				", formhref='" + formhref + '\'' +
-				", tablehref='" + tablehref + '\'' +
-				", precisionlength=" + precisionlength +
-				", scalelength=" + scalelength +
-				", valuearea='" + valuearea + '\'' +
-				", codedateformat='" + codedateformat + '\'' +
-				", tabledisplayjs='" + tabledisplayjs + '\'' +
-				", textareaflag='" + textareaflag + '\'' +
-				", imageflag='" + imageflag + '\'' +
-				", defaultvalue='" + defaultvalue + '\'' +
-				", prefixvalue='" + prefixvalue + '\'' +
-				", suffixvalue='" + suffixvalue + '\'' +
-				", filtersourceattr='" + filtersourceattr + '\'' +
-				", filtersourceattrname='" + filtersourceattrname + '\'' +
-				", attrTableWidth=" + attrTableWidth +
-				"} " + super.toString();
-	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java
index bf77cfb..ca636ca 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java
@@ -2,6 +2,7 @@
 
 
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import lombok.Data;
 
 /**
  * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
@@ -9,6 +10,7 @@
  * @author weidy
  * @date 2022-01-24
  */
+@Data
 public class CodeClassifyTemplateButtonDTO extends BaseModelVO {
 
 	/**
@@ -19,25 +21,25 @@
 	/**
 	 * 鎵�灞炴ā鏉�
 	 */
-	private String classifytemplateoid;
+	private String classifyTemplateOid;
 
 	/**
 	 * 鎵�灞炴ā鏉挎樉绀烘枃鏈�
 	 */
-	private String classifytemplateoidName;
+	private String classifyTemplateOidName;
 	/**
 	 * 鎸夐挳鐨勪富閿�
 	 */
-	private String classifybuttonoid;
+	private String classifyButtonOid;
 
 	/**
 	 * 鎸夐挳鐨勪富閿樉绀烘枃鏈�
 	 */
-	private String classifybuttonoidName;
+	private String classifyButtonOidName;
 	/**
 	 * 鎸夐挳鐢ㄩ��
 	 */
-	private String buttonuse;
+	private String buttonUse;
 
 	/**
 	 * 鎸夐挳鐢ㄩ�旀樉绀哄璞�
@@ -47,109 +49,6 @@
 	/**
 	 * 鐮佸�煎簭鍙�
 	 */
-	private Integer ordernum;
+	private Integer orderNum;
 
-
-	/**
-	 * 鑾峰彇 鎵�灞炴ā鏉�
-	 */
-	public String getClassifytemplateoid (){
-		return classifytemplateoid;
-	}
-
-	/**
-	 * 璁剧疆 鎵�灞炴ā鏉�
-	 */
-	public void setClassifytemplateoid (String classifytemplateoid){
-		this.classifytemplateoid = classifytemplateoid;
-	}
-
-	/**
-	 * 鑾峰彇鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	 */
-	public String getClassifytemplateoidName (){
-		return classifytemplateoidName;
-	}
-
-	/**
-	 * 璁剧疆鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	 */
-	public void setClassifytemplateoidName (String classifytemplateoidName){
-		this.classifytemplateoidName = classifytemplateoidName;
-	}
-	/**
-	 * 鑾峰彇 鎸夐挳鐨勪富閿�
-	 */
-	public String getClassifybuttonoid (){
-		return classifybuttonoid;
-	}
-
-	/**
-	 * 璁剧疆 鎸夐挳鐨勪富閿�
-	 */
-	public void setClassifybuttonoid (String classifybuttonoid){
-		this.classifybuttonoid = classifybuttonoid;
-	}
-
-	/**
-	 * 鑾峰彇鎸夐挳鐨勪富閿樉绀烘枃鏈�
-	 */
-	public String getClassifybuttonoidName (){
-		return classifybuttonoidName;
-	}
-
-	/**
-	 * 璁剧疆鎸夐挳鐨勪富閿樉绀烘枃鏈�
-	 */
-	public void setClassifybuttonoidName (String classifybuttonoidName){
-		this.classifybuttonoidName = classifybuttonoidName;
-	}
-	/**
-	 * 鑾峰彇 鎸夐挳鐢ㄩ��
-	 */
-	public String getButtonuse (){
-		return buttonuse;
-	}
-
-	/**
-	 * 璁剧疆 鎸夐挳鐢ㄩ��
-	 */
-	public void setButtonuse (String buttonuse){
-		this.buttonuse = buttonuse;
-	}
-
-	/**
-	 * 鑾峰彇 鐮佸�煎簭鍙�
-	 */
-	public Integer getOrdernum (){
-		return ordernum;
-	}
-
-	/**
-	 * 璁剧疆 鐮佸�煎簭鍙�
-	 */
-	public void setOrdernum (Integer ordernum){
-		this.ordernum = ordernum;
-	}
-
-	public String getButtonUseText() {
-		return buttonUseText;
-	}
-
-	public void setButtonUseText(String buttonUseText) {
-		this.buttonUseText = buttonUseText;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeClassifyTemplateButtonDTO{" +
-				"classifytemplateoid='" + classifytemplateoid + '\'' +
-				", classifytemplateoidName='" + classifytemplateoidName + '\'' +
-				", classifybuttonoid='" + classifybuttonoid + '\'' +
-				", classifybuttonoidName='" + classifybuttonoidName + '\'' +
-				", buttonuse='" + buttonuse + '\'' +
-				", buttonUseText='" + buttonUseText + '\'' +
-				", ordernum=" + ordernum +
-				"} " + super.toString();
-	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
index 994d025..e9e485b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
@@ -2,15 +2,17 @@
 
 
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import lombok.Data;
 
 import java.util.List;
 
 /**
  * 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
  *
- * @author weidy
+ * @author ludc
  * @date 2022-01-24
  */
+@Data
 public class CodeTemplatePhaseDTO extends BaseModelVO {
 
 	/**
@@ -21,60 +23,16 @@
 	/**
 	 * 鎵�灞炵紪鐮佽鍒�
 	 */
-	private String codeclassifytemplateoid;
+	private String codeClassifyTemplateOid;
 
 	/**
 	 * 鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
 	 */
-	private String codeclassifytemplateoidName;
+	private String codeClassifyTemplateOidName;
 
 	/**
 	 * 鍖呭惈鐨勫睘鎬�
 	 */
 	private List<CodePhaseAttrDTO> attributes;
 
-	/**
-	 * 鑾峰彇 鎵�灞炵紪鐮佽鍒�
-	 */
-	public String getCodeclassifytemplateoid (){
-		return codeclassifytemplateoid;
-	}
-
-	/**
-	 * 璁剧疆 鎵�灞炵紪鐮佽鍒�
-	 */
-	public void setCodeclassifytemplateoid (String codeclassifytemplateoid){
-		this.codeclassifytemplateoid = codeclassifytemplateoid;
-	}
-
-	/**
-	 * 鑾峰彇鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
-	 */
-	public String getCodeclassifytemplateoidName (){
-		return codeclassifytemplateoidName;
-	}
-
-	/**
-	 * 璁剧疆鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
-	 */
-	public void setCodeclassifytemplateoidName (String codeclassifytemplateoidName){
-		this.codeclassifytemplateoidName = codeclassifytemplateoidName;
-	}
-
-	public List<CodePhaseAttrDTO> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(List<CodePhaseAttrDTO> attributes) {
-		this.attributes = attributes;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeTemplatePhaseDTO{" +
-				"codeclassifytemplateoid='" + codeclassifytemplateoid + '\'' +
-				", codeclassifytemplateoidName='" + codeclassifytemplateoidName + '\'' +
-				", attributes=" + attributes +
-				"} " + super.toString();
-	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeClstemplateVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeClstemplateVO.java
index b0af4bb..93a8daf 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeClstemplateVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeClstemplateVO.java
@@ -1,41 +1,31 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 搴勯獮 (smallchill@163.com)
- */
 package com.vci.ubcs.code.vo;
 
 import com.vci.ubcs.code.entity.CodeClstemplateEntity;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
- * 缂栫爜搴撳畾涔�-妯℃澘绠$悊 瑙嗗浘瀹炰綋绫�
+ * 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
  *
  * @author yuxc
- * @since 2023-04-10
+ * @date 2022-01-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class CodeClstemplateVO extends CodeClstemplateEntity {
-	private static final long serialVersionUID = 1L;
+
+	/**
+     * 绂佹淇敼杩欎釜鍊�
+     */
+	private static final long serialVersionUID = 4615707118684061936L;
 
 	/**
 	 * 鍖呭惈鐨勫睘鎬у唴瀹�
 	 */
-	private List<CodeClstempattrVO> attributes;
+	private List<CodeClassifyTemplateAttrVO> attributes;
 
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java
index b98fc98..da162b4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java
@@ -16,7 +16,7 @@
  */
 package com.vci.ubcs.code.vo;
 
-import com.vci.ubcs.code.entity.CodePhaseattrEntity;
+import com.vci.ubcs.code.entity.CodePhaseAttr;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CodePhaseattrVO extends CodePhaseattrEntity {
+public class CodePhaseattrVO extends CodePhaseAttr {
 	private static final long serialVersionUID = 1L;
 
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
index caabe2b..050798b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
@@ -1,11 +1,14 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
+import lombok.Data;
+
 /**
  * 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
  *
  * @author weidy
  * @date 2022-01-24
  */
+@Data
 public class CodeClassifyTemplateAttrVO extends BaseModelVO {
 
 	/**
@@ -16,284 +19,242 @@
 	/**
 	* 鎵�灞炴ā鏉�
 	*/
-	private String classifytemplateoid;
+	private String classifyTemplateOid;
 
 	/**
 	* 鎵�灞炴ā鏉挎樉绀烘枃鏈�
 	*/
-	private String classifytemplateoidName;
+	private String classifyTemplateOidName;
 
 	/**
 	* 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
 	*/
-	private String classifyattributeoid;
+	private String classifyAttributeOid;
 
 	/**
 	* 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
 	*/
-	private String classifyattributeoidName;
+	private String classifyAttributeOidName;
 
 	/**
 	* 灞炴�х殑绫诲瀷
 	*/
-	private String attributedatatype;
+	private String attributeDataType;
 
 	/**
 	 * 灞炴�х被鍨嬫樉绀�
 	 */
 	private String attributeDataTypeText;
 
-
 	/**
 	* 鏄惁鍏抽敭灞炴��
 	*/
-	private String keyattrflag;
-
+	private String keyAttrFlag;
 
 	/**
 	* 鏄惁蹇�熸煡璇㈠睘鎬�
 	*/
-	private String queryattrflag;
-
+	private String queryAttrFlag;
 
 	/**
 	* 鏄惁楂樼骇鏌ヨ灞炴��
 	*/
-	private String seniorqueryattrflag;
-
+	private String seniorQueryAttrFlag;
 
 	/**
 	* 鐩镐技鏌ラ噸灞炴��
 	*/
-	private String samerepeatattrflag;
-
+	private String sameRepeatAttrFlag;
 
 	/**
 	* 鏄惁鎺掑簭
 	*/
-	private String sortattrflag;
-
+	private String sortAttrFlag;
 
 	/**
 	* 鏄惁鐢熸垚浜岀淮鐮�
 	*/
-	private String qrcodeflag;
-
+	private String qrcodeFlag;
 
 	/**
 	* 鏄惁鐢熸垚涓�缁寸爜
 	*/
-	private String barcodeflag;
-
+	private String barcodeFlag;
 
 	/**
 	* 缁勫悎瑙勫垯
 	*/
-	private String componentrule;
-
+	private String componentRule;
 
 	/**
 	* 楠岃瘉瑙勫垯
 	*/
-	private String verifyrule;
-
+	private String verifyRule;
 
 	/**
 	* 鍒嗙被娉ㄥ叆灞傜骇
 	*/
-	private String classifyinvokelevel;
-
+	private String classifyInvokeLevel;
 
 	/**
 	* 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
 	*/
-	private String classifyinvokeattr;
-
+	private String classifyInvokeAttr;
 
 	/**
 	* 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
 	*/
-	private String classifyinvokeattrname;
-
+	private String classifyInvokeAttrName;
 
 	/**
 	* 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
 	*/
-	private String classifyinvokeeditflag;
-
+	private String classifyInvokeEditFlag;
 
 	/**
 	* 鐮佸�煎簭鍙�
 	*/
-	private Integer ordernum;
-
+	private Integer orderNum;
 
 	/**
 	* 琛ㄥ崟閲屾槸鍚︽樉绀�
 	*/
-	private String formdisplayflag;
-
+	private String formDisplayFlag;
 
 	/**
 	* 鍒楄〃閲屾槸鍚︽樉绀�
 	*/
-	private String tabledisplayflag;
-
+	private String tableDisplayFlag;
 
 	/**
 	* 鎵�灞炲睘鎬у垎缁�
 	*/
-	private String attributegroup;
-
+	private String attributeGroup;
 
 	/**
 	* 浣跨敤鏋氫妇鑻辨枃缂栧彿
 	*/
-	private String enumid;
-
+	private String enumId;
 
 	/**
 	* 浣跨敤鏋氫妇涓枃鍚嶇О
 	*/
-	private String enumname;
-
+	private String enumName;
 
 	/**
 	* 鏋氫妇鏄惁鍙互缂栬緫
 	*/
-	private String enumeditflag;
-
+	private String enumEditFlag;
 
 	/**
 	* 鍙傜収鐨勪笟鍔$被鍨嬭嫳鏂囧悕绉�
 	*/
-	private String referbtmid;
-
+	private String referBtmId;
 
 	/**
 	* 鍙傜収鐨勪笟鍔$被鍨嬩腑鏂囧悕绉�
 	*/
-	private String referbtmname;
-
+	private String referBtmName;
 
 	/**
 	* 鍙傜収绐楀彛閰嶇疆
 	*/
 	private String referConfig;
 
-
 	/**
 	* 鏄惁蹇呰緭
 	*/
-	private String requireflag;
-
+	private String requireFlag;
 
 	/**
 	* 鏄惁鍙
 	*/
-	private String readonlyflag;
-
+	private String readOnlyFlag;
 
 	/**
 	* 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
 	*/
-	private Integer controllength;
-
+	private Integer controlLength;
 
 	/**
 	* 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
 	*/
-	private String formdisplaystyle;
-
+	private String formDisplayStyle;
 
 	/**
 	* 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
 	*/
-	private String tabledisplaystyle;
-
+	private String tableDisplayStyle;
 
 	/**
 	* 琛ㄥ崟涓秴閾炬帴鍐呭
 	*/
-	private String formhref;
-
+	private String formHref;
 
 	/**
 	* 琛ㄦ牸涓秴閾炬帴鍐呭
 	*/
-	private String tablehref;
-
+	private String tableHref;
 
 	/**
 	* 灏忔暟绮惧害
 	*/
-	private Integer precisionlength;
-
+	private Integer precisionLength;
 
 	/**
 	* 灏忔暟鍒诲害
 	*/
-	private Integer scalelength;
-
+	private Integer scaleLength;
 
 	/**
 	* 鍙栧�艰寖鍥�
 	*/
-	private String valuearea;
-
+	private String valueArea;
 
 	/**
 	* 鏃堕棿鏍煎紡
 	*/
-	private String codedateformat;
-
+	private String codeDateFormat;
 
 	/**
 	* 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
 	*/
-	private String tabledisplayjs;
-
+	private String tableDisplayJs;
 
 	/**
 	* 鏄惁鏄剧ず澶氳鏂囨湰
 	*/
-	private String textareaflag;
-
+	private String textAreaFlag;
 
 	/**
 	* 棰勮鍥�
 	*/
-	private String imageflag;
-
+	private String imageFlag;
 
 	/**
 	* 榛樿鍊�
 	*/
-	private String defaultvalue;
-
+	private String defaultValue;
 
 	/**
 	* 鍓嶇紑
 	*/
-	private String prefixvalue;
-
+	private String prefixValue;
 
 	/**
 	* 鍚庣紑
 	*/
-	private String suffixvalue;
-
+	private String suffixValue;
 
 	/**
 	* 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
 	*/
-	private String filtersourceattr;
-
+	private String filterSourceAttr;
 
 	/**
 	* 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
 	*/
-	private String filtersourceattrname;
+	private String filterSourceAttrName;
 
 	/**
 	 * 浣跨敤鏋氫妇娉ㄥ叆鐨勫瓧绗︿覆鏍煎紡
@@ -330,734 +291,4 @@
 	 */
 	private String parentQueryAttr;
 
-	public String getExplain() {
-		return explain;
-	}
-
-	public void setExplain(String explain) {
-		this.explain = explain;
-	}
-
-	public String getLibraryIdentification() {
-		return libraryIdentification;
-	}
-
-	public void setLibraryIdentification(String libraryIdentification) {
-		this.libraryIdentification = libraryIdentification;
-	}
-
-	public String getParentCode() {
-		return parentCode;
-	}
-
-	public void setParentCode(String parentCode) {
-		this.parentCode = parentCode;
-	}
-
-	public String getParentName() {
-		return parentName;
-	}
-
-	public void setParentName(String parentName) {
-		this.parentName = parentName;
-	}
-
-	public String getParentQueryAttr() {
-		return parentQueryAttr;
-	}
-
-	public void setParentQueryAttr(String parentQueryAttr) {
-		this.parentQueryAttr = parentQueryAttr;
-	}
-
-	/**
-	 * 鑾峰彇 鎵�灞炴ā鏉�
-	 */
-	public String getClassifytemplateoid (){
-		return classifytemplateoid;
-	}
-
-	/**
-	* 璁剧疆 鎵�灞炴ā鏉�
-	*/
-	public void setClassifytemplateoid (String classifytemplateoid){
-		this.classifytemplateoid = classifytemplateoid;
-	}
-	/**
-	 * 鑾峰彇鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	 */
-	public String getClassifytemplateoidName (){
-		return classifytemplateoidName;
-	}
-
-	/**
-	* 璁剧疆鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	*/
-	public void setClassifytemplateoidName (String classifytemplateoidName){
-		this.classifytemplateoidName = classifytemplateoidName;
-	}
-	/**
-	 * 鑾峰彇 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
-	 */
-	public String getClassifyattributeoid (){
-		return classifyattributeoid;
-	}
-
-	/**
-	* 璁剧疆 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
-	*/
-	public void setClassifyattributeoid (String classifyattributeoid){
-		this.classifyattributeoid = classifyattributeoid;
-	}
-	/**
-	 * 鑾峰彇鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
-	 */
-	public String getClassifyattributeoidName (){
-		return classifyattributeoidName;
-	}
-
-	/**
-	* 璁剧疆鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
-	*/
-	public void setClassifyattributeoidName (String classifyattributeoidName){
-		this.classifyattributeoidName = classifyattributeoidName;
-	}
-	/**
-	 * 鑾峰彇 灞炴�х殑绫诲瀷
-	 */
-	public String getAttributedatatype (){
-		return attributedatatype;
-	}
-
-	/**
-	* 璁剧疆 灞炴�х殑绫诲瀷
-	*/
-	public void setAttributedatatype (String attributedatatype){
-		this.attributedatatype = attributedatatype;
-	}
-	/**
-	 * 鑾峰彇 鏄惁鍏抽敭灞炴��
-	 */
-	public String getKeyattrflag (){
-		return keyattrflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁鍏抽敭灞炴��
-	*/
-	public void setKeyattrflag (String keyattrflag){
-		this.keyattrflag = keyattrflag;
-	}
-	/**
-	 * 鑾峰彇 鏄惁蹇�熸煡璇㈠睘鎬�
-	 */
-	public String getQueryattrflag (){
-		return queryattrflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁蹇�熸煡璇㈠睘鎬�
-	*/
-	public void setQueryattrflag (String queryattrflag){
-		this.queryattrflag = queryattrflag;
-	}
-	/**
-	 * 鑾峰彇 鏄惁楂樼骇鏌ヨ灞炴��
-	 */
-	public String getSeniorqueryattrflag (){
-		return seniorqueryattrflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁楂樼骇鏌ヨ灞炴��
-	*/
-	public void setSeniorqueryattrflag (String seniorqueryattrflag){
-		this.seniorqueryattrflag = seniorqueryattrflag;
-	}
-	/**
-	 * 鑾峰彇 鐩镐技鏌ラ噸灞炴��
-	 */
-	public String getSamerepeatattrflag (){
-		return samerepeatattrflag;
-	}
-
-	/**
-	* 璁剧疆 鐩镐技鏌ラ噸灞炴��
-	*/
-	public void setSamerepeatattrflag (String samerepeatattrflag){
-		this.samerepeatattrflag = samerepeatattrflag;
-	}
-	/**
-	 * 鑾峰彇 鏄惁鎺掑簭
-	 */
-	public String getSortattrflag (){
-		return sortattrflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁鎺掑簭
-	*/
-	public void setSortattrflag (String sortattrflag){
-		this.sortattrflag = sortattrflag;
-	}
-	/**
-	 * 鑾峰彇 鏄惁鐢熸垚浜岀淮鐮�
-	 */
-	public String getQrcodeflag (){
-		return qrcodeflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁鐢熸垚浜岀淮鐮�
-	*/
-	public void setQrcodeflag (String qrcodeflag){
-		this.qrcodeflag = qrcodeflag;
-	}
-	/**
-	 * 鑾峰彇 鏄惁鐢熸垚涓�缁寸爜
-	 */
-	public String getBarcodeflag (){
-		return barcodeflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁鐢熸垚涓�缁寸爜
-	*/
-	public void setBarcodeflag (String barcodeflag){
-		this.barcodeflag = barcodeflag;
-	}
-	/**
-	 * 鑾峰彇 缁勫悎瑙勫垯
-	 */
-	public String getComponentrule (){
-		return componentrule;
-	}
-
-	/**
-	* 璁剧疆 缁勫悎瑙勫垯
-	*/
-	public void setComponentrule (String componentrule){
-		this.componentrule = componentrule;
-	}
-	/**
-	 * 鑾峰彇 楠岃瘉瑙勫垯
-	 */
-	public String getVerifyrule (){
-		return verifyrule;
-	}
-
-	/**
-	* 璁剧疆 楠岃瘉瑙勫垯
-	*/
-	public void setVerifyrule (String verifyrule){
-		this.verifyrule = verifyrule;
-	}
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆灞傜骇
-	 */
-	public String getClassifyinvokelevel (){
-		return classifyinvokelevel;
-	}
-
-	/**
-	* 璁剧疆 鍒嗙被娉ㄥ叆灞傜骇
-	*/
-	public void setClassifyinvokelevel (String classifyinvokelevel){
-		this.classifyinvokelevel = classifyinvokelevel;
-	}
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
-	 */
-	public String getClassifyinvokeattr (){
-		return classifyinvokeattr;
-	}
-
-	/**
-	* 璁剧疆 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
-	*/
-	public void setClassifyinvokeattr (String classifyinvokeattr){
-		this.classifyinvokeattr = classifyinvokeattr;
-	}
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
-	 */
-	public String getClassifyinvokeattrname (){
-		return classifyinvokeattrname;
-	}
-
-	/**
-	* 璁剧疆 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
-	*/
-	public void setClassifyinvokeattrname (String classifyinvokeattrname){
-		this.classifyinvokeattrname = classifyinvokeattrname;
-	}
-	/**
-	 * 鑾峰彇 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
-	 */
-	public String getClassifyinvokeeditflag (){
-		return classifyinvokeeditflag;
-	}
-
-	/**
-	* 璁剧疆 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
-	*/
-	public void setClassifyinvokeeditflag (String classifyinvokeeditflag){
-		this.classifyinvokeeditflag = classifyinvokeeditflag;
-	}
-	/**
-	 * 鑾峰彇 鐮佸�煎簭鍙�
-	 */
-	public Integer getOrdernum (){
-		return ordernum;
-	}
-
-	/**
-	* 璁剧疆 鐮佸�煎簭鍙�
-	*/
-	public void setOrdernum (Integer ordernum){
-		this.ordernum = ordernum;
-	}
-	/**
-	 * 鑾峰彇 琛ㄥ崟閲屾槸鍚︽樉绀�
-	 */
-	public String getFormdisplayflag (){
-		return formdisplayflag;
-	}
-
-	/**
-	* 璁剧疆 琛ㄥ崟閲屾槸鍚︽樉绀�
-	*/
-	public void setFormdisplayflag (String formdisplayflag){
-		this.formdisplayflag = formdisplayflag;
-	}
-	/**
-	 * 鑾峰彇 鍒楄〃閲屾槸鍚︽樉绀�
-	 */
-	public String getTabledisplayflag (){
-		return tabledisplayflag;
-	}
-
-	/**
-	* 璁剧疆 鍒楄〃閲屾槸鍚︽樉绀�
-	*/
-	public void setTabledisplayflag (String tabledisplayflag){
-		this.tabledisplayflag = tabledisplayflag;
-	}
-	/**
-	 * 鑾峰彇 鎵�灞炲睘鎬у垎缁�
-	 */
-	public String getAttributegroup (){
-		return attributegroup;
-	}
-
-	/**
-	* 璁剧疆 鎵�灞炲睘鎬у垎缁�
-	*/
-	public void setAttributegroup (String attributegroup){
-		this.attributegroup = attributegroup;
-	}
-	/**
-	 * 鑾峰彇 浣跨敤鏋氫妇鑻辨枃缂栧彿
-	 */
-	public String getEnumid (){
-		return enumid;
-	}
-
-	/**
-	* 璁剧疆 浣跨敤鏋氫妇鑻辨枃缂栧彿
-	*/
-	public void setEnumid (String enumid){
-		this.enumid = enumid;
-	}
-	/**
-	 * 鑾峰彇 浣跨敤鏋氫妇涓枃鍚嶇О
-	 */
-	public String getEnumname (){
-		return enumname;
-	}
-
-	/**
-	* 璁剧疆 浣跨敤鏋氫妇涓枃鍚嶇О
-	*/
-	public void setEnumname (String enumname){
-		this.enumname = enumname;
-	}
-	/**
-	 * 鑾峰彇 鏋氫妇鏄惁鍙互缂栬緫
-	 */
-	public String getEnumeditflag (){
-		return enumeditflag;
-	}
-
-	/**
-	* 璁剧疆 鏋氫妇鏄惁鍙互缂栬緫
-	*/
-	public void setEnumeditflag (String enumeditflag){
-		this.enumeditflag = enumeditflag;
-	}
-	/**
-	 * 鑾峰彇 鍙傜収鐨勪笟鍔$被鍨嬭嫳鏂囧悕绉�
-	 */
-	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;
-	}
-
-	public String getReferConfig() {
-		return referConfig;
-	}
-
-	public void setReferConfig(String referConfig) {
-		this.referConfig = referConfig;
-	}
-
-	/**
-
-	/**
-	 * 鑾峰彇 鏄惁蹇呰緭
-	 */
-	public String getRequireflag (){
-		return requireflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁蹇呰緭
-	*/
-	public void setRequireflag (String requireflag){
-		this.requireflag = requireflag;
-	}
-	/**
-	 * 鑾峰彇 鏄惁鍙
-	 */
-	public String getReadonlyflag (){
-		return readonlyflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁鍙
-	*/
-	public void setReadonlyflag (String readonlyflag){
-		this.readonlyflag = readonlyflag;
-	}
-	/**
-	 * 鑾峰彇 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
-	 */
-	public Integer getControllength (){
-		return controllength;
-	}
-
-	/**
-	* 璁剧疆 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
-	*/
-	public void setControllength (Integer controllength){
-		this.controllength = controllength;
-	}
-	/**
-	 * 鑾峰彇 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
-	 */
-	public String getFormdisplaystyle (){
-		return formdisplaystyle;
-	}
-
-	/**
-	* 璁剧疆 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
-	*/
-	public void setFormdisplaystyle (String formdisplaystyle){
-		this.formdisplaystyle = formdisplaystyle;
-	}
-	/**
-	 * 鑾峰彇 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
-	 */
-	public String getTabledisplaystyle (){
-		return tabledisplaystyle;
-	}
-
-	/**
-	* 璁剧疆 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
-	*/
-	public void setTabledisplaystyle (String tabledisplaystyle){
-		this.tabledisplaystyle = tabledisplaystyle;
-	}
-	/**
-	 * 鑾峰彇 琛ㄥ崟涓秴閾炬帴鍐呭
-	 */
-	public String getFormhref (){
-		return formhref;
-	}
-
-	/**
-	* 璁剧疆 琛ㄥ崟涓秴閾炬帴鍐呭
-	*/
-	public void setFormhref (String formhref){
-		this.formhref = formhref;
-	}
-	/**
-	 * 鑾峰彇 琛ㄦ牸涓秴閾炬帴鍐呭
-	 */
-	public String getTablehref (){
-		return tablehref;
-	}
-
-	/**
-	* 璁剧疆 琛ㄦ牸涓秴閾炬帴鍐呭
-	*/
-	public void setTablehref (String tablehref){
-		this.tablehref = tablehref;
-	}
-	/**
-	 * 鑾峰彇 灏忔暟绮惧害
-	 */
-	public Integer getPrecisionlength (){
-		return precisionlength;
-	}
-
-	/**
-	* 璁剧疆 灏忔暟绮惧害
-	*/
-	public void setPrecisionlength (Integer precisionlength){
-		this.precisionlength = precisionlength;
-	}
-	/**
-	 * 鑾峰彇 灏忔暟鍒诲害
-	 */
-	public Integer getScalelength (){
-		return scalelength;
-	}
-
-	/**
-	* 璁剧疆 灏忔暟鍒诲害
-	*/
-	public void setScalelength (Integer scalelength){
-		this.scalelength = scalelength;
-	}
-	/**
-	 * 鑾峰彇 鍙栧�艰寖鍥�
-	 */
-	public String getValuearea (){
-		return valuearea;
-	}
-
-	/**
-	* 璁剧疆 鍙栧�艰寖鍥�
-	*/
-	public void setValuearea (String valuearea){
-		this.valuearea = valuearea;
-	}
-	/**
-	 * 鑾峰彇 鏃堕棿鏍煎紡
-	 */
-	public String getCodedateformat (){
-		return codedateformat;
-	}
-
-	/**
-	* 璁剧疆 鏃堕棿鏍煎紡
-	*/
-	public void setCodedateformat (String codedateformat){
-		this.codedateformat = codedateformat;
-	}
-	/**
-	 * 鑾峰彇 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
-	 */
-	public String getTabledisplayjs (){
-		return tabledisplayjs;
-	}
-
-	/**
-	* 璁剧疆 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
-	*/
-	public void setTabledisplayjs (String tabledisplayjs){
-		this.tabledisplayjs = tabledisplayjs;
-	}
-	/**
-	 * 鑾峰彇 鏄惁鏄剧ず澶氳鏂囨湰
-	 */
-	public String getTextareaflag (){
-		return textareaflag;
-	}
-
-	/**
-	* 璁剧疆 鏄惁鏄剧ず澶氳鏂囨湰
-	*/
-	public void setTextareaflag (String textareaflag){
-		this.textareaflag = textareaflag;
-	}
-	/**
-	 * 鑾峰彇 棰勮鍥�
-	 */
-	public String getImageflag (){
-		return imageflag;
-	}
-
-	/**
-	* 璁剧疆 棰勮鍥�
-	*/
-	public void setImageflag (String imageflag){
-		this.imageflag = imageflag;
-	}
-	/**
-	 * 鑾峰彇 榛樿鍊�
-	 */
-	public String getDefaultvalue (){
-		return defaultvalue;
-	}
-
-	/**
-	* 璁剧疆 榛樿鍊�
-	*/
-	public void setDefaultvalue (String defaultvalue){
-		this.defaultvalue = defaultvalue;
-	}
-	/**
-	 * 鑾峰彇 鍓嶇紑
-	 */
-	public String getPrefixvalue (){
-		return prefixvalue;
-	}
-
-	/**
-	* 璁剧疆 鍓嶇紑
-	*/
-	public void setPrefixvalue (String prefixvalue){
-		this.prefixvalue = prefixvalue;
-	}
-	/**
-	 * 鑾峰彇 鍚庣紑
-	 */
-	public String getSuffixvalue (){
-		return suffixvalue;
-	}
-
-	/**
-	* 璁剧疆 鍚庣紑
-	*/
-	public void setSuffixvalue (String suffixvalue){
-		this.suffixvalue = suffixvalue;
-	}
-	/**
-	 * 鑾峰彇 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
-	 */
-	public String getFiltersourceattr (){
-		return filtersourceattr;
-	}
-
-	public String getAttributeDataTypeText() {
-		return attributeDataTypeText;
-	}
-
-	public void setAttributeDataTypeText(String attributeDataTypeText) {
-		this.attributeDataTypeText = attributeDataTypeText;
-	}
-
-	/**
-	* 璁剧疆 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
-	*/
-	public void setFiltersourceattr (String filtersourceattr){
-		this.filtersourceattr = filtersourceattr;
-	}
-	/**
-	 * 鑾峰彇 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
-	 */
-	public String getFiltersourceattrname (){
-		return filtersourceattrname;
-	}
-
-	/**
-	* 璁剧疆 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
-	*/
-	public void setFiltersourceattrname (String filtersourceattrname){
-		this.filtersourceattrname = filtersourceattrname;
-	}
-
-	public String getEnumString() {
-		return enumString;
-	}
-
-	public void setEnumString(String enumString) {
-		this.enumString = enumString;
-	}
-
-
-	public Integer getAttrTableWidth() {
-		return attrTableWidth;
-	}
-
-	public void setAttrTableWidth(Integer attrTableWidth) {
-		this.attrTableWidth = attrTableWidth;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeClassifyTemplateAttrVO{" +
-				"classifytemplateoid='" + classifytemplateoid + '\'' +
-				", classifytemplateoidName='" + classifytemplateoidName + '\'' +
-				", classifyattributeoid='" + classifyattributeoid + '\'' +
-				", classifyattributeoidName='" + classifyattributeoidName + '\'' +
-				", attributedatatype='" + attributedatatype + '\'' +
-				", attributeDataTypeText='" + attributeDataTypeText + '\'' +
-				", keyattrflag='" + keyattrflag + '\'' +
-				", queryattrflag='" + queryattrflag + '\'' +
-				", seniorqueryattrflag='" + seniorqueryattrflag + '\'' +
-				", samerepeatattrflag='" + samerepeatattrflag + '\'' +
-				", sortattrflag='" + sortattrflag + '\'' +
-				", qrcodeflag='" + qrcodeflag + '\'' +
-				", barcodeflag='" + barcodeflag + '\'' +
-				", componentrule='" + componentrule + '\'' +
-				", verifyrule='" + verifyrule + '\'' +
-				", classifyinvokelevel='" + classifyinvokelevel + '\'' +
-				", classifyinvokeattr='" + classifyinvokeattr + '\'' +
-				", classifyinvokeattrname='" + classifyinvokeattrname + '\'' +
-				", classifyinvokeeditflag='" + classifyinvokeeditflag + '\'' +
-				", ordernum=" + ordernum +
-				", formdisplayflag='" + formdisplayflag + '\'' +
-				", tabledisplayflag='" + tabledisplayflag + '\'' +
-				", attributegroup='" + attributegroup + '\'' +
-				", enumid='" + enumid + '\'' +
-				", enumname='" + enumname + '\'' +
-				", enumeditflag='" + enumeditflag + '\'' +
-				", referbtmid='" + referbtmid + '\'' +
-				", referbtmname='" + referbtmname + '\'' +
-				", referConfig='" + referConfig + '\'' +
-				", requireflag='" + requireflag + '\'' +
-				", readonlyflag='" + readonlyflag + '\'' +
-				", controllength=" + controllength +
-				", formdisplaystyle='" + formdisplaystyle + '\'' +
-				", tabledisplaystyle='" + tabledisplaystyle + '\'' +
-				", formhref='" + formhref + '\'' +
-				", tablehref='" + tablehref + '\'' +
-				", precisionlength=" + precisionlength +
-				", scalelength=" + scalelength +
-				", valuearea='" + valuearea + '\'' +
-				", codedateformat='" + codedateformat + '\'' +
-				", tabledisplayjs='" + tabledisplayjs + '\'' +
-				", textareaflag='" + textareaflag + '\'' +
-				", imageflag='" + imageflag + '\'' +
-				", defaultvalue='" + defaultvalue + '\'' +
-				", prefixvalue='" + prefixvalue + '\'' +
-				", suffixvalue='" + suffixvalue + '\'' +
-				", filtersourceattr='" + filtersourceattr + '\'' +
-				", filtersourceattrname='" + filtersourceattrname + '\'' +
-				", enumString='" + enumString + '\'' +
-				", attrTableWidth=" + attrTableWidth +
-				"} " + super.toString();
-	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java
index 4ba81b6..ac5cf44 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java
@@ -1,13 +1,17 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
 import com.vci.ubcs.code.entity.CodeClassifyTemplateButton;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
  *
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @date 2023-05-9
  */
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class CodeClassifyTemplateButtonVO extends CodeClassifyTemplateButton {
 
 	/**
@@ -16,161 +20,28 @@
 	private static final long serialVersionUID = 4615707118535405378L;
 
 	/**
-	* 鎵�灞炴ā鏉�
-	*/
-	private String classifytemplateoid;
-
-	/**
 	* 鎵�灞炴ā鏉挎樉绀烘枃鏈�
 	*/
-	private String classifytemplateoidName;
-
-	/**
-	* 鎸夐挳鐨勪富閿�
-	*/
-	private String classifybuttonoid;
+	private String classifyTemplateOidName;
 
 	/**
 	* 鎸夐挳鐨勪富閿樉绀烘枃鏈�
 	*/
-	private String classifybuttonoidName;
-
-	/**
-	* 鎸夐挳鐢ㄩ��
-	*/
-	private String buttonuse;
+	private String classifyButtonOidName;
 
 	/**
 	 * 鎸夐挳鐢ㄩ�旀樉绀哄璞�
 	 */
 	private String buttonUseText;
 
-
 	/**
 	* 鐮佸�煎簭鍙�
 	*/
-	private Integer ordernum;
+	private Integer orderNum;
 
 	/**
 	 * 鎸夐挳鐨勭浉鍏冲唴瀹�
 	 */
 	private CodeButtonVO buttonVO;
 
-
-
-
-	/**
-	 * 鑾峰彇 鎵�灞炴ā鏉�
-	 */
-	@Override
-	public String getClassifytemplateoid (){
-		return classifytemplateoid;
-	}
-
-	/**
-	* 璁剧疆 鎵�灞炴ā鏉�
-	*/
-	@Override
-	public void setClassifytemplateoid (String classifytemplateoid){
-		this.classifytemplateoid = classifytemplateoid;
-	}
-	/**
-	 * 鑾峰彇鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	 */
-	public String getClassifytemplateoidName (){
-		return classifytemplateoidName;
-	}
-
-	/**
-	* 璁剧疆鎵�灞炴ā鏉挎樉绀烘枃鏈�
-	*/
-	public void setClassifytemplateoidName (String classifytemplateoidName){
-		this.classifytemplateoidName = classifytemplateoidName;
-	}
-	/**
-	 * 鑾峰彇 鎸夐挳鐨勪富閿�
-	 */
-	@Override
-	public String getClassifybuttonoid (){
-		return classifybuttonoid;
-	}
-
-	/**
-	* 璁剧疆 鎸夐挳鐨勪富閿�
-	*/
-	@Override
-	public void setClassifybuttonoid (String classifybuttonoid){
-		this.classifybuttonoid = classifybuttonoid;
-	}
-	/**
-	 * 鑾峰彇鎸夐挳鐨勪富閿樉绀烘枃鏈�
-	 */
-	public String getClassifybuttonoidName (){
-		return classifybuttonoidName;
-	}
-
-	/**
-	* 璁剧疆鎸夐挳鐨勪富閿樉绀烘枃鏈�
-	*/
-	public void setClassifybuttonoidName (String classifybuttonoidName){
-		this.classifybuttonoidName = classifybuttonoidName;
-	}
-	/**
-	 * 鑾峰彇 鎸夐挳鐢ㄩ��
-	 */
-	@Override
-	public String getButtonuse (){
-		return buttonuse;
-	}
-
-	/**
-	* 璁剧疆 鎸夐挳鐢ㄩ��
-	*/
-	@Override
-	public void setButtonuse (String buttonuse){
-		this.buttonuse = buttonuse;
-	}
-	/**
-	 * 鑾峰彇 鐮佸�煎簭鍙�
-	 */
-	public Integer getOrdernum (){
-		return ordernum;
-	}
-
-	/**
-	* 璁剧疆 鐮佸�煎簭鍙�
-	*/
-	public void setOrdernum (Integer ordernum){
-		this.ordernum = ordernum;
-	}
-
-	public String getButtonUseText() {
-		return buttonUseText;
-	}
-
-	public void setButtonUseText(String buttonUseText) {
-		this.buttonUseText = buttonUseText;
-	}
-
-	public CodeButtonVO getButtonVO() {
-		return buttonVO;
-	}
-
-	public void setButtonVO(CodeButtonVO buttonVO) {
-		this.buttonVO = buttonVO;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeClassifyTemplateButtonVO{" +
-				"classifytemplateoid='" + classifytemplateoid + '\'' +
-				", classifytemplateoidName='" + classifytemplateoidName + '\'' +
-				", classifybuttonoid='" + classifybuttonoid + '\'' +
-				", classifybuttonoidName='" + classifybuttonoidName + '\'' +
-				", buttonuse='" + buttonuse + '\'' +
-				", buttonUseText='" + buttonUseText + '\'' +
-				", ordernum=" + ordernum +
-				", buttonVO=" + buttonVO +
-				"} " + super.toString();
-	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java
index a0f186f..420b491 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java
@@ -1,42 +1,15 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
+import com.vci.ubcs.code.vo.CodeClstemplateVO;
+
 import java.util.ArrayList;
 import java.util.List;
 
 public class CodeImportTemplateVO {
     private List<ColumnVO> cloNamesList=new ArrayList<>();
-    private CodeClassifyTemplateVO codeClassifyTemplateVO;
+
+    private CodeClstemplateVO codeClstemplateVO;
+
     private CodeClassifyVO codeClassifyVO;
-    public List<ColumnVO> getCloNamesList() {
-        return cloNamesList;
-    }
 
-    public void setCloNamesList(List<ColumnVO> cloNamesList) {
-        this.cloNamesList = cloNamesList;
-    }
-
-    public CodeClassifyTemplateVO getCodeClassifyTemplateVO() {
-        return codeClassifyTemplateVO;
-    }
-
-    public void setCodeClassifyTemplateVO(CodeClassifyTemplateVO codeClassifyTemplateVO) {
-        this.codeClassifyTemplateVO = codeClassifyTemplateVO;
-    }
-
-    public CodeClassifyVO getCodeClassifyVO() {
-        return codeClassifyVO;
-    }
-
-    public void setCodeClassifyVO(CodeClassifyVO codeClassifyVO) {
-        this.codeClassifyVO = codeClassifyVO;
-    }
-
-    @Override
-    public String toString() {
-        return "CodeImportTemplateVO{" +
-                "cloNamesList=" + cloNamesList +
-                ", codeClassifyTemplateVO=" + codeClassifyTemplateVO +
-                ", codeClassifyVO=" + codeClassifyVO +
-                '}';
-    }
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java
index d6bbb76..aafe730 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java
@@ -1,5 +1,8 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
+
+import com.vci.ubcs.code.vo.CodeClstemplateVO;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,15 +49,15 @@
      * 鏁版嵁
      */
     private List<Map<String,String>> datas = new ArrayList<>();
-    private CodeClassifyTemplateVO codeClassifyTemplateVO;
+    private CodeClstemplateVO codeClstemplateVO;
     private CodeClassifyVO codeClassifyVO;
 
-    public CodeClassifyTemplateVO getCodeClassifyTemplateVO() {
-        return codeClassifyTemplateVO;
+    public CodeClstemplateVO getCodeClassifyTemplateVO() {
+        return codeClstemplateVO;
     }
 
-    public void setCodeClassifyTemplateVO(CodeClassifyTemplateVO codeClassifyTemplateVO) {
-        this.codeClassifyTemplateVO = codeClassifyTemplateVO;
+    public void setCodeClassifyTemplateVO(CodeClstemplateVO codeClstemplateVO) {
+        this.codeClstemplateVO = codeClstemplateVO;
     }
 
     public CodeClassifyVO getCodeClassifyVO() {
@@ -125,7 +128,7 @@
                 ", fields=" + fields +
                 ", colNames=" + colNames +
                 ", datas=" + datas +
-                ", codeClassifyTemplateVO=" + codeClassifyTemplateVO +
+                ", codeClstemplateVO=" + codeClstemplateVO +
                 ", codeClassifyVO=" + codeClassifyVO +
                 '}';
     }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java
new file mode 100644
index 0000000..af805e5
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java
@@ -0,0 +1,30 @@
+package com.vci.ubcs.code.vo.pagemodel;
+
+import com.vci.ubcs.code.entity.CodeTemplatePhase;
+import lombok.Data;
+
+/**
+ * 妯℃澘闃舵鏄剧ず瀵硅薄
+ *
+ * @author ludc
+ * @date 2022-01-24
+ */
+@Data
+public class CodeTemplatePhaseVO extends CodeTemplatePhase {
+
+	/**
+     * 绂佹淇敼杩欎釜鍊�
+     */
+	private static final long serialVersionUID = 4615707117825912259L;
+
+	/**
+	* 鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
+	*/
+	private String codeclassifytemplateoidName;
+
+	/**
+	* 鐮佸�煎簭鍙�
+	*/
+	private Integer orderNum;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml
index 22f6d7c..8702264 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml
@@ -40,5 +40,10 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>4.1.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+            <version>${mybatisplus.join.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index d070f14..182d4eb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -1,5 +1,6 @@
 package com.vci.ubcs.starter.util;
 
+import com.alibaba.druid.util.StringUtils;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -9,6 +10,7 @@
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
@@ -29,7 +31,7 @@
 	public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
 		BaseModel baseModel = object;
 		try {
-			baseModel.setOid(VciBaseUtil.getPk());
+			baseModel.setOid(VciBaseUtil.getPk().toUpperCase());
 			baseModel.setCreateTime(new Date());
 			baseModel.setNameOid(VciBaseUtil.getPk());
 			baseModel.setLastModifyTime(new Date());
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java
new file mode 100644
index 0000000..83a1332
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java
@@ -0,0 +1,90 @@
+package com.vci.ubcs.starter.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+
+import java.util.Map;
+
+public class MPJLambdaWrapperSqlKeyword {
+
+	private static final String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql";
+	private static final String EQUAL = "_equal";
+	private static final String NOT_EQUAL = "_notequal";
+	private static final String LIKE = "_like";
+	private static final String LIKE_LEFT = "_likeleft";
+	private static final String LIKE_RIGHT = "_likeright";
+	private static final String NOT_LIKE = "_notlike";
+	private static final String GE = "_ge";
+	private static final String LE = "_le";
+	private static final String GT = "_gt";
+	private static final String LT = "_lt";
+	private static final String DATE_GE = "_datege";
+	private static final String DATE_GT = "_dategt";
+	private static final String DATE_EQUAL = "_dateequal";
+	private static final String DATE_LT = "_datelt";
+	private static final String DATE_LE = "_datele";
+	private static final String IS_NULL = "_null";
+	private static final String NOT_NULL = "_notnull";
+	private static final String IGNORE = "_ignore";
+
+	public MPJLambdaWrapperSqlKeyword() {
+	}
+
+	public static void buildCondition(Map<String, Object> query, MPJLambdaWrapper<?> qw) {
+		if (!Func.isEmpty(query)) {
+			query.forEach((k, v) -> {
+				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+					if (k.endsWith("_equal")) {
+						qw.eq(getColumn(k, "_equal"), v);
+					} else if (k.endsWith("_notequal")) {
+						qw.ne(getColumn(k, "_notequal"), v);
+					} else if (k.endsWith("_likeleft")) {
+						qw.likeLeft(getColumn(k, "_likeleft"), v);
+					} else if (k.endsWith("_likeright")) {
+						qw.likeRight(getColumn(k, "_likeright"), v);
+					} else if (k.endsWith("_notlike")) {
+						qw.notLike(getColumn(k, "_notlike"), v);
+					} else if (k.endsWith("_ge")) {
+						qw.ge(getColumn(k, "_ge"), v);
+					} else if (k.endsWith("_le")) {
+						qw.le(getColumn(k, "_le"), v);
+					} else if (k.endsWith("_gt")) {
+						qw.gt(getColumn(k, "_gt"), v);
+					} else if (k.endsWith("_lt")) {
+						qw.lt(getColumn(k, "_lt"), v);
+					} else if (k.endsWith("_datege")) {
+						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dategt")) {
+						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dateequal")) {
+						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datele")) {
+						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datelt")) {
+						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_null")) {
+						qw.isNull(getColumn(k, "_null"));
+					} else if (k.endsWith("_notnull")) {
+						qw.isNotNull(getColumn(k, "_notnull"));
+					} else {
+						qw.like(getColumn(k, "_like"), v);
+					}
+
+				}
+			});
+		}
+	}
+
+	private static String getColumn(String column, String keyword) {
+		return StringUtil.humpToUnderline(StringUtil.removeSuffix(column, keyword));
+	}
+
+	public static String filter(String param) {
+		return param == null ? null : param.replaceAll("(?i)'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql", "");
+	}
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java
new file mode 100644
index 0000000..f6f584d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java
@@ -0,0 +1,74 @@
+package com.vci.ubcs.starter.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.mp.support.SqlKeyword;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+
+import java.util.Map;
+
+public class Map2MPLLambdaUtil {
+
+	public Map2MPLLambdaUtil() {
+	}
+
+	public static <T> IPage<T> getPage(Query query) {
+		Page<T> page = new Page((long) Func.toInt(query.getCurrent(), 1), (long)Func.toInt(query.getSize(), 10));
+		String[] ascArr = Func.toStrArray(query.getAscs());
+		String[] descArr = ascArr;
+		int var4 = ascArr.length;
+
+		int var5;
+		for(var5 = 0; var5 < var4; ++var5) {
+			String asc = descArr[var5];
+			page.addOrder(new OrderItem[]{OrderItem.asc(StringUtil.cleanIdentifier(asc))});
+		}
+
+		descArr = Func.toStrArray(query.getDescs());
+		String[] var8 = descArr;
+		var5 = descArr.length;
+
+		for(int var9 = 0; var9 < var5; ++var9) {
+			String desc = var8[var9];
+			page.addOrder(new OrderItem[]{OrderItem.desc(StringUtil.cleanIdentifier(desc))});
+		}
+
+		return page;
+	}
+
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(T entity) {
+		return new MPJLambdaWrapper(entity);
+	}
+
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Class<T> clazz) {
+		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+		return getMPJLambdaWrapper(query, exclude, clazz);
+	}
+
+	/**
+	 * map杞崲涓篗PJLambdaWrapper
+	 * @param query
+	 * @param exclude
+	 * @param clazz
+	 * @param <T>
+	 * @return
+	 */
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> {
+			query.remove(k);
+		});
+		MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
+		qw.setEntity(BeanUtil.newInstance(clazz));
+		MPJLambdaWrapperSqlKeyword.buildCondition(query, qw);
+		return qw;
+	}
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java
index 457dbdb..4931b1e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java
@@ -1,12 +1,17 @@
 package com.vci.ubcs.starter.util;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.vci.ubcs.starter.exception.VciBaseException;
+import org.springblade.core.mp.support.SqlKeyword;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * in 鍙傛暟鎴彇锛岃繑鍥瀢rapper
@@ -16,6 +21,44 @@
  */
 public class MybatisParameterUtil {
 
+	/**
+	 * in浣滀负鏌ヨ鏉′欢鏃讹紝闃叉澶т簬1000鍑虹幇鎶ラ敊锛屽鏉′欢杩涜鎴彇锛岃繛琛ㄦ煡璇㈢殑wrapper
+	 * @param wrapper MPJLambdaWrapper,涓嶈繘琛岃繛琛ㄦ煡璇㈡椂浣跨敤
+	 * @param column 浣滀负in鐨勬潯浠跺垪
+	 * @param coll 鏌ヨ鍙傛暟
+	 * @param <T> LambdaQueryWrapper鐨勬硾鍨�
+	 * @param <F> 鏌ヨ鍙傛暟绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
+	public static <T, F> MPJLambdaWrapper<T> cutInParameter(MPJLambdaWrapper<T> wrapper, SFunction<T, ?> column, List<F> coll) throws VciBaseException {
+		List<List<F>> newList = splitList(coll, 900);
+		if (ObjectUtils.isEmpty(newList)) {
+			throw new VciBaseException("鍙傛暟閿欒");
+		} else if (newList.size() == 1) {
+			wrapper.in(column, newList.get(0));
+			return wrapper;
+		}
+		wrapper.and(i -> {
+			i.in(column, newList.get(0));
+			newList.remove(0);
+			for (List<F> objects : newList) {
+				i.or().in(column, objects);
+			}
+		});
+		return wrapper;
+	}
+
+	/**
+	 * in浣滀负鏌ヨ鏉′欢鏃讹紝闃叉澶т簬1000鍑虹幇鎶ラ敊锛屽鏉′欢杩涜鎴彇锛屼笉鍏峰杩炶〃鏌ヨ鐨剋rapper
+	 * @param wrapper LambdaQueryWrapper,涓嶈繘琛岃繛琛ㄦ煡璇㈡椂浣跨敤
+	 * @param column 浣滀负in鐨勬潯浠跺垪
+	 * @param coll 鏌ヨ鍙傛暟
+	 * @param <T> LambdaQueryWrapper鐨勬硾鍨�
+	 * @param <F> 鏌ヨ鍙傛暟绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
 	public static <T, F> LambdaQueryWrapper<T> cutInParameter(LambdaQueryWrapper<T> wrapper, SFunction<T, ?> column, List<F> coll) throws VciBaseException {
 		List<List<F>> newList = splitList(coll, 900);
 		if (ObjectUtils.isEmpty(newList)) {
@@ -34,6 +77,44 @@
 		return wrapper;
 	}
 
+	/**
+	 * notin浣滀负鏌ヨ鏉′欢鏃讹紝闃叉澶т簬1000鍑虹幇鎶ラ敊锛屽鏉′欢杩涜鎴彇锛岃繛琛ㄦ煡璇㈢殑wrapper
+	 * @param wrapper MPJLambdaWrapper,涓嶈繘琛岃繛琛ㄦ煡璇㈡椂浣跨敤
+	 * @param column 浣滀负in鐨勬潯浠跺垪
+	 * @param coll 鏌ヨ鍙傛暟
+	 * @param <T> LambdaQueryWrapper鐨勬硾鍨�
+	 * @param <F> 鏌ヨ鍙傛暟绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
+	public static <T, F> MPJLambdaWrapper<T> cutNotInParameter(MPJLambdaWrapper<T> wrapper, SFunction<T, ?> column, List<F> coll) throws VciBaseException {
+		List<List<F>> newList = splitList(coll, 900);
+		if (ObjectUtils.isEmpty(newList)) {
+			throw new VciBaseException("鍙傛暟閿欒");
+		} else if (newList.size() == 1) {
+			wrapper.notIn(column, newList.get(0));
+			return wrapper;
+		}
+		wrapper.and(i -> {
+			i.in(column, newList.get(0));
+			newList.remove(0);
+			for (List<F> objects : newList) {
+				i.or().notIn(column, objects);
+			}
+		});
+		return wrapper;
+	}
+
+	/**
+	 * notin浣滀负鏌ヨ鏉′欢鏃讹紝闃叉澶т簬1000鍑虹幇鎶ラ敊锛屽鏉′欢杩涜鎴彇锛屼笉鍏峰杩炶〃鏌ヨ鐨剋rapper
+	 * @param wrapper LambdaQueryWrapper,涓嶈繘琛岃繛琛ㄦ煡璇㈡椂浣跨敤
+	 * @param column 浣滀负in鐨勬潯浠跺垪
+	 * @param coll 鏌ヨ鍙傛暟
+	 * @param <T> LambdaQueryWrapper鐨勬硾鍨�
+	 * @param <F> 鏌ヨ鍙傛暟绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
 	public static <T, F> LambdaQueryWrapper<T> cutNotInParameter(LambdaQueryWrapper<T> wrapper, SFunction<T, ?> column, List<F> coll) throws VciBaseException {
 		List<List<F>> newList = splitList(coll, 900);
 		if (ObjectUtils.isEmpty(newList)) {
@@ -67,4 +148,5 @@
 		return newList;
 	}
 
+
 }

--
Gitblit v1.9.3