From 3a9ccb0bf9f289505d0a7fc206e23e375943507e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 五月 2023 09:12:07 +0800
Subject: [PATCH] 提交code服务的流程模板相关内容

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml                                 |    4 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java           |  104 -------
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java |    8 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyValueWrapper.java                 |    2 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java              |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java                   |    8 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java            |    6 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java               |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java                     |    8 
 Source/UBCS/pom.xml                                                                                                      |    5 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java               |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java           |   31 -
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempphaseWrapper.java                     |   10 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseEntityVO.java   |    5 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java           |    3 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java          |   22 
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java                  |    1 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java                       |    5 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java                        |   11 
 Source/UBCS-WEB/src/views/code/code.vue                                                                                  |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java     |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java                        |    6 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java               |   28 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyTemplateAttrService.java         |    4 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java   |  118 -------
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java            |   79 +++++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java  |   46 +-
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java                 |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodePhaseattrClient.java                       |    5 
 /dev/null                                                                                                                |   47 ---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java                     |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java                    |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml                                     |    4 
 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java                                 |    2 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java             |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java                       |   10 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeTempphaseClient.java                       |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java           |   31 ++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java            |  155 +++++-----
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java                    |   26 
 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Param.java                         |    2 
 Source/UBCS/ubcs-service/ubcs-ddl/pom.xml                                                                                |   13 
 42 files changed, 344 insertions(+), 493 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 069b97a..89dd072 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2005,7 +2005,7 @@
           this.$refs.crud.toggleSelection();
           this.selectionList = row;
           this.$refs.crud.setCurrentRow(row);
-          //this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+          this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
           this.loadBasic(row);
         },
         // 鍚敤涓庡仠鐢�
@@ -2488,7 +2488,7 @@
     width: 495px;
   }
 
-  .clone-avue-crud > .el-card> .el-card__body > .avue-crud__menu {
+  .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
     display: none!important;
   }
 
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index f8735c7..937c0ff 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -185,11 +185,10 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <!--springboot鎵撳寘鎻掍欢浼氬幓鎵炬瘡涓ā鍧椾笅闈㈢殑鍚姩绫伙紝鍥犱负褰撳墠鏈変笉闇�瑕佸惎鍔ㄧ被鐨勯渶姹傦紝鎵�浠ユ敞閲婃帀锛屼娇鐢╩vn鐨勬墦鍖呮彃浠�-->
-            <!--<plugin>
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>-->
+            </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven.plugin.version}</version>
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index 38a5faf..21b6872 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -41,7 +41,7 @@
 	 * nacos dev 鍦板潃
 	 */
 	//String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
-	String NACOS_DEV_ADDR = "192.168.93.185:38848";
+	String NACOS_DEV_ADDR = "192.168.93.186:38848";
 
 	/**
 	 * nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java
index 81972c6..f843c11 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.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 CodeClassifyProcessTempDTO extends BaseModelVO {
 
 	/**
@@ -19,12 +21,12 @@
 	/**
 	 * 涓婚搴撳垎绫讳富閿�
 	 */
-	private String codeclassifyoid;
+	private String codeClassifyOid;
 
 	/**
 	 * 涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
 	 */
-	private String codeclassifyoidName;
+	private String codeClassifyoidName;
 
 	/**
 	 * 鎵�灞炴ā鏉�
@@ -33,12 +35,12 @@
 	/**
 	 * 娴佺▼妯℃澘鐢ㄩ��
 	 */
-	private String codeprocessuse;
+	private String codeProcessUse;
 
 	/**
 	 * 娴佺▼妯℃澘鐢ㄩ�旀樉绀烘枃鏈�
 	 */
-	private String codeprocessuseText;
+	private String codeProcessUseText;
 
 	/**
 	 * 娴佺▼妯℃澘鐨勭増鏈�
@@ -55,98 +57,4 @@
 	 */
 	private String codeTempAttrOidArrName;
 
-	/**
-	 * 鑾峰彇 涓婚搴撳垎绫讳富閿�
-	 */
-	public String getCodeclassifyoid (){
-		return codeclassifyoid;
-	}
-
-	/**
-	 * 璁剧疆 涓婚搴撳垎绫讳富閿�
-	 */
-	public void setCodeclassifyoid (String codeclassifyoid){
-		this.codeclassifyoid = codeclassifyoid;
-	}
-
-	/**
-	 * 鑾峰彇涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
-	 */
-	public String getCodeclassifyoidName (){
-		return codeclassifyoidName;
-	}
-
-	/**
-	 * 璁剧疆涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
-	 */
-	public void setCodeclassifyoidName (String codeclassifyoidName){
-		this.codeclassifyoidName = codeclassifyoidName;
-	}
-	/**
-	 * 鑾峰彇 娴佺▼妯℃澘鐢ㄩ��
-	 */
-	public String getCodeprocessuse (){
-		return codeprocessuse;
-	}
-
-	/**
-	 * 璁剧疆 娴佺▼妯℃澘鐢ㄩ��
-	 */
-	public void setCodeprocessuse (String codeprocessuse){
-		this.codeprocessuse = codeprocessuse;
-	}
-
-	public String getCodeprocessuseText() {
-		return codeprocessuseText;
-	}
-
-	public void setCodeprocessuseText(String codeprocessuseText) {
-		this.codeprocessuseText = codeprocessuseText;
-	}
-
-	public String getProcessVersion() {
-		return processVersion;
-	}
-
-	public void setProcessVersion(String processVersion) {
-		this.processVersion = processVersion;
-	}
-
-	public String getClassifyTemplateOid() {
-		return classifyTemplateOid;
-	}
-
-	public void setClassifyTemplateOid(String classifyTemplateOid) {
-		this.classifyTemplateOid = classifyTemplateOid;
-	}
-
-	public String getCodeTempAttrOidArr() {
-		return codeTempAttrOidArr;
-	}
-
-	public void setCodeTempAttrOidArr(String codeTempAttrOidArr) {
-		this.codeTempAttrOidArr = codeTempAttrOidArr;
-	}
-
-	public String getCodeTempAttrOidArrName() {
-		return codeTempAttrOidArrName;
-	}
-
-	public void setCodeTempAttrOidArrName(String codeTempAttrOidArrName) {
-		this.codeTempAttrOidArrName = codeTempAttrOidArrName;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeClassifyProcessTempDTO{" +
-				"codeclassifyoid='" + codeclassifyoid + '\'' +
-				", codeclassifyoidName='" + codeclassifyoidName + '\'' +
-				", classifyTemplateOid='" + classifyTemplateOid + '\'' +
-				", codeprocessuse='" + codeprocessuse + '\'' +
-				", codeprocessuseText='" + codeprocessuseText + '\'' +
-				", processVersion='" + processVersion + '\'' +
-				", codeTempAttrOidArr='" + codeTempAttrOidArr + '\'' +
-				", codeTempAttrOidArrName='" + codeTempAttrOidArrName + '\'' +
-				"} " + super.toString();
-	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java
similarity index 96%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java
index bd9536e..bc2e34d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java
@@ -33,7 +33,7 @@
 @TableName("PL_CODE_PHASEATTR")
 @ApiModel(value = "CodePhaseattr瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴��")
 @EqualsAndHashCode(callSuper = true)
-public class CodePhaseAttr extends BaseModel {
+public class CodePhaseattrEntity extends BaseModel {
 
 
 	/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java
similarity index 96%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java
index cbcaa43..110925f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java
@@ -33,7 +33,7 @@
 @TableName("PL_CODE_TEMPPHASE")
 @ApiModel(value = "CodeTempphase瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵")
 @EqualsAndHashCode(callSuper = true)
-public class CodeTemplatePhase extends BaseModel {
+public class CodeTempphaseEntity extends BaseModel {
 	/**
 	 *
 	 */
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 6ffc784..b98fc98 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,8 +16,7 @@
  */
 package com.vci.ubcs.code.vo;
 
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import org.springblade.core.tool.node.INode;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CodePhaseattrVO extends CodePhaseAttr {
+public class CodePhaseattrVO extends CodePhaseattrEntity {
 	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/BaseModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
index fb756b9..0600175 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
@@ -4,6 +4,7 @@
 //
 package com.vci.ubcs.code.vo.pagemodel;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.Transient;
 import java.io.Serializable;
 import java.util.Date;
@@ -33,6 +34,9 @@
 	private String versionValue;
 	private String lcStatus;
 	private String lcStatusText;
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+	)
 	private Date ts;
 	private String owner;
 //	private String checkInBy;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java
index 17a172b..1c5d5fd 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java
@@ -2,16 +2,18 @@
 
 import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import lombok.Data;
 
 import java.util.List;
 
 /**
  * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
  *
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @date 2023-05-6
  */
-public class CodeClassifyProcessTempVO extends CodeClassifyProcessTemp {
+@Data
+public class CodeClassifyProcessTempVO extends BaseModelVO {
 
 	/**
      * 绂佹淇敼杩欎釜鍊�
@@ -21,12 +23,12 @@
 	/**
 	* 涓婚搴撳垎绫讳富閿�
 	*/
-	private String codeclassifyoid;
+	private String codeClassifyOid;
 
 	/**
 	* 涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
 	*/
-	private String codeclassifyoidName;
+	private String codeClassifyoidName;
 
 	/**
 	 * 鎵�灞炴ā鏉�
@@ -36,12 +38,12 @@
 	/**
 	* 娴佺▼妯℃澘鐢ㄩ��
 	*/
-	private String codeprocessuse;
+	private String codeProcessUse;
 
 	/**
 	 * 娴佺▼妯℃澘鐢ㄩ�斿悕绉�
 	 */
-	private String codeprocessuseText;
+	private String codeProcessUseText;
 
 	/**
 	 * 娴佺▼妯℃澘鐨勭増鏈�
@@ -63,106 +65,4 @@
 	 */
 	private List<CodeClassifyTemplateAttrVO> attrList;
 
-	/**
-	 * 鑾峰彇 涓婚搴撳垎绫讳富閿�
-	 */
-	public String getCodeclassifyoid (){
-		return codeclassifyoid;
-	}
-
-	/**
-	* 璁剧疆 涓婚搴撳垎绫讳富閿�
-	*/
-	public void setCodeclassifyoid (String codeclassifyoid){
-		this.codeclassifyoid = codeclassifyoid;
-	}
-	/**
-	 * 鑾峰彇涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
-	 */
-	public String getCodeclassifyoidName (){
-		return codeclassifyoidName;
-	}
-
-	/**
-	* 璁剧疆涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
-	*/
-	public void setCodeclassifyoidName (String codeclassifyoidName){
-		this.codeclassifyoidName = codeclassifyoidName;
-	}
-	/**
-	 * 鑾峰彇 娴佺▼妯℃澘鐢ㄩ��
-	 */
-	public String getCodeprocessuse (){
-		return codeprocessuse;
-	}
-
-	/**
-	* 璁剧疆 娴佺▼妯℃澘鐢ㄩ��
-	*/
-	public void setCodeprocessuse (String codeprocessuse){
-		this.codeprocessuse = codeprocessuse;
-	}
-
-	public String getCodeprocessuseText() {
-		return codeprocessuseText;
-	}
-
-	public void setCodeprocessuseText(String codeprocessuseText) {
-		this.codeprocessuseText = codeprocessuseText;
-	}
-
-	public String getClassifyTemplateOid() {
-		return classifyTemplateOid;
-	}
-
-	public void setClassifyTemplateOid(String classifyTemplateOid) {
-		this.classifyTemplateOid = classifyTemplateOid;
-	}
-
-	public String getProcessVersion() {
-		return processVersion;
-	}
-
-	public void setProcessVersion(String processVersion) {
-		this.processVersion = processVersion;
-	}
-
-	public List<CodeClassifyTemplateAttrVO> getAttrList() {
-		return attrList;
-	}
-
-	public void setAttrList(List<CodeClassifyTemplateAttrVO> attrList) {
-		this.attrList = attrList;
-	}
-
-	public String getCodeTempAttrOidArr() {
-		return codeTempAttrOidArr;
-	}
-
-	public void setCodeTempAttrOidArr(String codeTempAttrOidArr) {
-		this.codeTempAttrOidArr = codeTempAttrOidArr;
-	}
-
-	public String getCodeTempAttrOidArrName() {
-		return codeTempAttrOidArrName;
-	}
-
-	public void setCodeTempAttrOidArrName(String codeTempAttrOidArrName) {
-		this.codeTempAttrOidArrName = codeTempAttrOidArrName;
-	}
-
-	@Override
-	public String toString() {
-		return "CodeClassifyProcessTempVO{" +
-				"codeclassifyoid='" + codeclassifyoid + '\'' +
-				", codeclassifyoidName='" + codeclassifyoidName + '\'' +
-				", classifyTemplateOid='" + classifyTemplateOid + '\'' +
-				", codeprocessuse='" + codeprocessuse + '\'' +
-				", codeprocessuseText='" + codeprocessuseText + '\'' +
-				", processVersion='" + processVersion + '\'' +
-				", codeTempAttrOidArr='" + codeTempAttrOidArr + '\'' +
-				", codeTempAttrOidArrName='" + codeTempAttrOidArrName + '\'' +
-				", attrList=" + attrList +
-				'}' + super.toString();
-	}
 }
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/CodeTemplatePhaseEntityVO.java
similarity index 90%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseEntityVO.java
index 3a3f7c8..db23730 100644
--- 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/CodeTemplatePhaseEntityVO.java
@@ -1,7 +1,6 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.entity.CodeTempphaseEntity;
 
 /**
  * 妯℃澘闃舵鏄剧ず瀵硅薄
@@ -9,7 +8,7 @@
  * @author weidy
  * @date 2022-01-24
  */
-public class CodeTemplatePhaseVO extends CodeTemplatePhase {
+public class CodeTemplatePhaseEntityVO extends CodeTempphaseEntity {
 
 	/**
      * 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Param.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Param.java
index a72e25a..596b22e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Param.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Param.java
@@ -21,7 +21,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.mp.import com.vci.ubcs.starter.revision.model.TreeQueryObject;.BaseEntity;
 
 /**
  * 瀹炰綋绫�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
index bb25c59..a8e70e9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
@@ -7,13 +7,13 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Map;
-
 public class BaseModel implements Serializable {
 	@JsonSerialize(
 		using = ToStringSerializer.class
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
new file mode 100644
index 0000000..d070f14
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -0,0 +1,79 @@
+package com.vci.ubcs.starter.util;
+
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.apache.poi.ss.formula.functions.T;
+import org.springblade.core.secure.utils.AuthUtil;
+
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
+ *
+ * @author ludc
+ * @date 2023/5/6
+ */
+public class DefaultAttrAssimtUtil {
+
+	/**
+	 * 鏂板鏃跺~鍏呴粯璁ゅ��
+	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
+	 * @param btmName  涓氬姟绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
+	public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
+		BaseModel baseModel = object;
+		try {
+			baseModel.setOid(VciBaseUtil.getPk());
+			baseModel.setCreateTime(new Date());
+			baseModel.setNameOid(VciBaseUtil.getPk());
+			baseModel.setLastModifyTime(new Date());
+			baseModel.setTs(new Date());
+			//鐢ㄦ埛id
+			String userId = AuthUtil.getUserId().toString();
+			baseModel.setBtmname(btmName);
+			baseModel.setCreator(userId);
+			baseModel.setFirstR("1");
+			baseModel.setFirstV("1");
+			baseModel.setLastR("1");
+			baseModel.setLastV("1");
+			baseModel.setRevisionSeq(1);
+			baseModel.setOwner("1");
+			baseModel.setVersionSeq(1);
+			baseModel.setVersionRule("0");
+			baseModel.setVersionValue("1");
+			baseModel.setNameOid(VciBaseUtil.getPk());
+			baseModel.setLastModifier(userId);
+		}catch (VciBaseException e){
+			e.printStackTrace();
+		}
+		return (T)baseModel;
+	}
+
+	/**
+	 * 淇敼鏃跺~鍏呴粯璁ゅ��
+	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
+	 * @return
+	 * @throws VciBaseException
+	 */
+	public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
+		BaseModel baseModel = object;
+		try {
+			baseModel.setLastModifyTime(new Date());
+			baseModel.setTs(new Date());
+			//鐢ㄦ埛id
+			String userId = AuthUtil.getUserId().toString();
+			baseModel.setLastModifier(userId);
+		}catch (VciBaseException e){
+			e.printStackTrace();
+		}
+		return (T)baseModel;
+	}
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtils.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java
similarity index 92%
rename from Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtils.java
rename to Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java
index c26997c..457dbdb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtils.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtil.java
@@ -1,8 +1,6 @@
 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.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import org.springframework.util.ObjectUtils;
@@ -16,7 +14,7 @@
  * @author ludc
  * @date 2023/5/5
  */
-public class MybatisParameterUtils {
+public class MybatisParameterUtil {
 
 	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);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
index c19293a..eacd1a2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
@@ -165,4 +165,5 @@
             return R.data(codeClassifyProcessTempVOS.get(0));
         }
     }
+
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
index 99ca7bb..c1a1c4a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
@@ -19,8 +19,8 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
+import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
 import com.vci.ubcs.code.service.ICodePhaseattrService;
 import com.vci.ubcs.code.vo.CodePhaseattrVO;
 import com.vci.ubcs.code.wrapper.CodePhaseattrWrapper;
@@ -45,13 +45,13 @@
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("ubcs-code/CodePhaseattr")
+@RequestMapping("/CodePhaseattr")
 @Api(value = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴��", tags = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�ф帴鍙�")
 public class CodePhaseattrController extends BladeController {
 
 	private final ICodePhaseattrService CodePhaseattrService;
 
-	private CodePhaseAttrMapper codePhaseAttrMapper;
+	private CodePhaseattrMapper codePhaseAttrMapper;
 
 	/**
 	 * 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� 璇︽儏
@@ -59,8 +59,8 @@
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "璇︽儏", notes = "浼犲叆CodePhaseattr")
-	public R<CodePhaseattrVO> detail(CodePhaseAttr CodePhaseattr) {
-		CodePhaseAttr detail = CodePhaseattrService.getOne(Condition.getQueryWrapper(CodePhaseattr));
+	public R<CodePhaseattrVO> detail(CodePhaseattrEntity codePhaseattr) {
+		CodePhaseattrEntity detail = CodePhaseattrService.getOne(Condition.getQueryWrapper(codePhaseattr));
 		return R.data(CodePhaseattrWrapper.build().entityVO(detail));
 	}
 	/**
@@ -69,8 +69,8 @@
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodePhaseattr")
-	public R<IPage<CodePhaseattrVO>> list(CodePhaseAttr CodePhaseattr, Query query) {
-		IPage<CodePhaseAttr> pages = CodePhaseattrService.page(Condition.getPage(query), Condition.getQueryWrapper(CodePhaseattr));
+	public R<IPage<CodePhaseattrVO>> list(CodePhaseattrEntity codePhaseattr, Query query) {
+		IPage<CodePhaseattrEntity> pages = CodePhaseattrService.page(Condition.getPage(query), Condition.getQueryWrapper(codePhaseattr));
 		return R.data(CodePhaseattrWrapper.build().pageVO(pages));
 	}
 
@@ -91,8 +91,8 @@
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "鏂板", notes = "浼犲叆CodePhaseattr")
-	public R save(@Valid @RequestBody CodePhaseAttr CodePhaseattr) {
-		return R.status(CodePhaseattrService.save(CodePhaseattr));
+	public R save(@Valid @RequestBody CodePhaseattrEntity codePhaseattr) {
+		return R.status(CodePhaseattrService.save(codePhaseattr));
 	}
 
 	/**
@@ -101,8 +101,8 @@
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "淇敼", notes = "浼犲叆CodePhaseattr")
-	public R update(@Valid @RequestBody CodePhaseAttr CodePhaseattr) {
-		return R.status(CodePhaseattrService.updateById(CodePhaseattr));
+	public R update(@Valid @RequestBody CodePhaseattrEntity codePhaseattr) {
+		return R.status(CodePhaseattrService.updateById(codePhaseattr));
 	}
 
 	/**
@@ -111,8 +111,8 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆CodePhaseattr")
-	public R submit(@Valid @RequestBody CodePhaseAttr CodePhaseattr) {
-		return R.status(CodePhaseattrService.saveOrUpdate(CodePhaseattr));
+	public R submit(@Valid @RequestBody CodePhaseattrEntity codePhaseattr) {
+		return R.status(CodePhaseattrService.saveOrUpdate(codePhaseattr));
 	}
 
 	/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
index 720281f..ffa1900 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
@@ -16,32 +16,21 @@
  */
 package com.vci.ubcs.code.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
 import com.vci.ubcs.code.service.ICodeTempphaseService;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
-import com.vci.ubcs.code.wrapper.CodeTempphaseWrapper;
+import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.Collection;
-import java.util.Map;
 
 /**
  * 缂栫爜搴撳畾涔�-妯℃澘闃舵 鎺у埗鍣�
@@ -67,7 +56,7 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridCodeTemplatePhase")
-	public DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO,Query query){
+	public DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query){
 		return codeTemplatePhaseService.gridCodeTemplatePhase(codeTemplatePhaseVO,query);
 	}
 
@@ -77,7 +66,7 @@
 	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
 	 */
 	@PostMapping( "/addSave")
-	public R<CodeTemplatePhaseVO> addSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
+	public R<CodeTemplatePhaseEntityVO> addSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
 		return R.data(codeTemplatePhaseService.addSave(codeTemplatePhaseDTO));
 	}
 
@@ -87,8 +76,8 @@
 	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
 	 */
 	@PutMapping("/editSave")
-	public R<CodeTemplatePhaseVO> editSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
-		CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.editSave(codeTemplatePhaseDTO);
+	public R<CodeTemplatePhaseEntityVO> editSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
+		CodeTemplatePhaseEntityVO codeTemplatePhaseVO = codeTemplatePhaseService.editSave(codeTemplatePhaseDTO);
 		return R.data(codeTemplatePhaseVO);
 	}
 
@@ -108,8 +97,8 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄
 	 */
 	@GetMapping("/getObjectByOid")
-	public R<CodeTemplatePhaseVO> getObjectByOid(String oid){
-		CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
+	public R<CodeTemplatePhaseEntityVO> getObjectByOid(String oid){
+		CodeTemplatePhaseEntityVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
 		return R.data(codeTemplatePhaseVO);
 	}
 
@@ -119,8 +108,8 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄
 	 */
 	@GetMapping("/listDataByOids")
-	public R<Collection<CodeTemplatePhaseVO>> listCodeTemplatePhaseByOids(String oids){
-		Collection<CodeTemplatePhaseVO> voCollection =  codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
+	public R<Collection<CodeTemplatePhaseEntityVO>> listCodeTemplatePhaseByOids(String oids){
+		Collection<CodeTemplatePhaseEntityVO> voCollection =  codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
 		return R.data(voCollection);
 	}
 
@@ -130,7 +119,7 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
 	 */
 	@GetMapping("/refDataGrid")
-	public DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
+	public DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
 		if(baseQueryObject == null){
 			baseQueryObject = new BaseQueryObject();
 		}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java
index d89b166..cd35493 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java
@@ -18,13 +18,12 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
+import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import com.vci.ubcs.code.service.ICodePhaseattrService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -40,15 +39,15 @@
 @AllArgsConstructor
 public class CodePhaseattrClient implements ICodePhaseattrClient {
 
-    private final CodePhaseAttrMapper codePhaseAttrMapper;
+    private final CodePhaseattrMapper codePhaseAttrMapper;
 
     @Override
     @GetMapping(TOP)
-    public BladePage<CodePhaseAttr> top(Integer current, Integer size) {
+    public BladePage<CodePhaseattrEntity> top(Integer current, Integer size) {
         Query query = new Query();
         query.setCurrent(current);
         query.setSize(size);
-        IPage<CodePhaseAttr> page = codePhaseAttrMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
+        IPage<CodePhaseattrEntity> page = codePhaseAttrMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
 		return BladePage.of(page);
     }
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java
index 03b4fd3..d39f37d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java
@@ -18,7 +18,7 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
+import com.vci.ubcs.code.entity.CodeTempphaseEntity;
 import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
@@ -43,11 +43,11 @@
 
     @Override
     @GetMapping(TOP)
-    public BladePage<CodeTemplatePhase> top(Integer current, Integer size) {
+    public BladePage<CodeTempphaseEntity> top(Integer current, Integer size) {
         Query query = new Query();
         query.setCurrent(current);
         query.setSize(size);
-        IPage<CodeTemplatePhase> page = codeTempphaseMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
+        IPage<CodeTempphaseEntity> page = codeTempphaseMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
 
 		return BladePage.of(page);
     }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodePhaseattrClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodePhaseattrClient.java
index fb43ec3..225d4d5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodePhaseattrClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodePhaseattrClient.java
@@ -16,8 +16,7 @@
  */
 package com.vci.ubcs.code.feign;
 
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +44,6 @@
      * @return BladePage
      */
     @GetMapping(TOP)
-    BladePage<CodePhaseAttr> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+    BladePage<CodePhaseattrEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeTempphaseClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeTempphaseClient.java
index 19b4b37..b964c4e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeTempphaseClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeTempphaseClient.java
@@ -16,7 +16,7 @@
  */
 package com.vci.ubcs.code.feign;
 
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
+import com.vci.ubcs.code.entity.CodeTempphaseEntity;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +44,6 @@
      * @return BladePage
      */
     @GetMapping(TOP)
-    BladePage<CodeTemplatePhase> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+    BladePage<CodeTempphaseEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
deleted file mode 100644
index 187b185..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *      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.mapper;
-
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.vo.CodePhaseattrVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- * 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� Mapper 鎺ュ彛
- *
- * @author yuxc
- * @since 2023-04-20
- */
-public interface CodePhaseAttrMapper extends BaseMapper<CodePhaseAttr> {
-
-	/**
-	 * 鑷畾涔夊垎椤�
-	 *
-	 * @param page
-	 * @param CodePhaseattr
-	 * @return
-	 */
-	List<CodePhaseattrVO> selectCodePhaseattrPage(IPage page, CodePhaseattrVO CodePhaseattr);
-
-	List<CodePhaseAttr> selectByPhasea(String oid);
-
-	List<CodePhaseAttr> selectByPhaseaIds(String oids);
-
-	List<CodePhaseAttr> listLinkAttrDOByTemplateAttrDOS(String id,String codeClassifyTemplateOid);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java
index 187b185..e58fd14 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java
@@ -16,7 +16,7 @@
  */
 package com.vci.ubcs.code.mapper;
 
-import com.vci.ubcs.code.entity.CodePhaseAttr;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
 import com.vci.ubcs.code.vo.CodePhaseattrVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,7 +28,7 @@
  * @author yuxc
  * @since 2023-04-20
  */
-public interface CodePhaseAttrMapper extends BaseMapper<CodePhaseAttr> {
+public interface CodePhaseattrMapper extends BaseMapper<CodePhaseattrEntity> {
 
 	/**
 	 * 鑷畾涔夊垎椤�
@@ -39,9 +39,9 @@
 	 */
 	List<CodePhaseattrVO> selectCodePhaseattrPage(IPage page, CodePhaseattrVO CodePhaseattr);
 
-	List<CodePhaseAttr> selectByPhasea(String oid);
+	List<CodePhaseattrEntity> selectByPhasea(String oid);
 
-	List<CodePhaseAttr> selectByPhaseaIds(String oids);
+	List<CodePhaseattrEntity> selectByPhaseaIds(String oids);
 
-	List<CodePhaseAttr> listLinkAttrDOByTemplateAttrDOS(String id,String codeClassifyTemplateOid);
+	List<CodePhaseattrEntity> listLinkAttrDOByTemplateAttrDOS(String id, String codeClassifyTemplateOid);
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java
index fe88200..af90fb6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java
@@ -16,10 +16,10 @@
  */
 package com.vci.ubcs.code.mapper;
 
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
+import com.vci.ubcs.code.entity.CodeTempphaseEntity;
+import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@
  * @author yuxc
  * @since 2023-04-20
  */
-public interface CodeTemplatePhaseMapper extends BaseMapper<CodeTemplatePhase> {
+public interface CodeTemplatePhaseMapper extends BaseMapper<CodeTempphaseEntity> {
 
 	/**
 	 * 鑷畾涔夊垎椤�
@@ -38,7 +38,7 @@
 	 * @param CodeTempphase
 	 * @return
 	 */
-	List<CodeTemplatePhaseVO> selectCodeTempphasePage(IPage page, CodeTemplatePhaseVO CodeTempphase);
+	List<CodeTemplatePhaseEntityVO> selectCodeTempphasePage(IPage page, CodeTemplatePhaseEntityVO CodeTempphase);
 
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyTemplateAttrService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyTemplateAttrService.java
index 0defd89..f68f3db 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyTemplateAttrService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyTemplateAttrService.java
@@ -1,17 +1,13 @@
 package com.vci.ubcs.code.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 
-import java.sql.Wrapper;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java
index 167d9b6..bfe5e4f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java
@@ -18,7 +18,7 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodePhaseAttr;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
 import com.vci.ubcs.code.vo.CodePhaseattrVO;
 
 /**
@@ -27,7 +27,7 @@
  * @author yuxc
  * @since 2023-04-20
  */
-public interface ICodePhaseattrService extends IService<CodePhaseAttr> {
+public interface ICodePhaseattrService extends IService<CodePhaseattrEntity> {
 
 	/**
 	 * 鑷畾涔夊垎椤�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java
index 9653220..0038355 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java
@@ -19,9 +19,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
 import com.vci.ubcs.code.entity.CodeClstempattrEntity;
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
+import com.vci.ubcs.code.entity.CodeTempphaseEntity;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
@@ -38,7 +38,7 @@
  * @author yuxc
  * @since 2023-04-20
  */
-public interface ICodeTempphaseService extends IService<CodeTemplatePhase> {
+public interface ICodeTempphaseService extends IService<CodeTempphaseEntity> {
 
 	/**
 	 * 鏌ヨ鎵�鏈夌殑妯℃澘闃舵
@@ -47,7 +47,7 @@
 	 * @return 鎵ц缁撴灉
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
-	DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO, Query query) throws VciBaseException;
+	DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query) throws VciBaseException;
 
 	/**
 	 * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
@@ -65,19 +65,19 @@
 
 	/**
 	 * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
-	 * @param codeTemplatePhaseDOs 鏁版嵁瀵硅薄鍒楄〃
+	 * @param codeTemplatePhaseEntityDOS 鏁版嵁瀵硅薄鍒楄〃
 	 * @return 鏄剧ず瀵硅薄
 	 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
 	 */
-	List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseDOs) throws VciBaseException;
+	List<CodeTemplatePhaseEntityVO> codeTemplatePhaseDO2VOs(Collection<CodeTempphaseEntity> codeTemplatePhaseEntityDOS) throws VciBaseException;
 
 	/**
 	 * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
-	 * @param  codeTemplatePhaseDO 鏁版嵁瀵硅薄
+	 * @param  codeTemplatePhaseEntityDO 鏁版嵁瀵硅薄
 	 * @return 鏄剧ず瀵硅薄
 	 * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
-	CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseDO) throws VciBaseException;
+	CodeTemplatePhaseEntityVO codeTemplatePhaseDO2VO(CodeTempphaseEntity codeTemplatePhaseEntityDO) throws VciBaseException;
 
 	/**
 	 * 澧炲姞妯℃澘闃舵
@@ -85,7 +85,7 @@
 	 * @return 鎵ц缁撴灉
 	 * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
 	 */
-	CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
+	CodeTemplatePhaseEntityVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
 
 	/**
 	 * 淇敼妯℃澘闃舵
@@ -93,7 +93,7 @@
 	 * @return 鎵ц缁撴灉
 	 * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
 	 */
-	CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
+	CodeTemplatePhaseEntityVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
 
 	/**
 	 * 鍒犻櫎妯℃澘闃舵
@@ -109,7 +109,7 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄
 	 * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
 	 */
-	CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException;
+	CodeTemplatePhaseEntityVO getObjectByOid(String oid) throws VciBaseException;
 
 	/**
 	 * 涓婚敭鎵归噺鑾峰彇妯℃澘闃舵
@@ -117,7 +117,7 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄
 	 * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
 	 */
-	Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;
+	Collection<CodeTemplatePhaseEntityVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;
 
 	/**
 	 * 鍙傜収妯℃澘闃舵鍒楄〃
@@ -126,7 +126,7 @@
 	 * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
-	DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
+	DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
 
 	/**
 	 * 闃舵涓嶅寘鍚殑灞炴��
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
index f8f8a53..dd76b88 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -2,29 +2,24 @@
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.entity.CodeClassify;
 import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
-import com.vci.ubcs.code.mapper.CodeClassifyMapper;
 import com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
 import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
 import com.vci.ubcs.common.utils.PageDO2PageVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
-import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.BeanUtil;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -86,7 +81,7 @@
 		IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
 		//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
 		if (!CollectionUtils.isEmpty(doList.getRecords())) {
-			pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
+			pageList.setRecords(CodeClassifyProcessTempWrapper.build().listVO(doList.getRecords()));
 			//鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
 			pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
 		}
@@ -139,8 +134,8 @@
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public CodeClassifyProcessTempVO addSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException{
-		VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeClassifyProcessTempDTO.getProcessVersion(),"娴佺▼妯℃澘鐨勭増鏈彿",codeClassifyProcessTempDTO.getCodeprocessuse(),"妯℃澘娴佺▼鐨勭敤閫�");
-		if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeprocessuse())){
+		VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeClassifyProcessTempDTO.getProcessVersion(),"娴佺▼妯℃澘鐨勭増鏈彿",codeClassifyProcessTempDTO.getCodeProcessUse(),"妯℃澘娴佺▼鐨勭敤閫�");
+		if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeProcessUse())){
 			throw new VciBaseException("妯℃澘娴佺▼鐢ㄩ�斾笉鑳戒负绌�");
 		}
 		Long count = countProcessTemplate(codeClassifyProcessTempDTO);
@@ -150,10 +145,11 @@
 		//灏咲TO杞崲涓篋O
 		CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp();
 		BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
+		codeClassifyProcessTempDO = DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO,"codeclsflowtemp");
 		codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
 		//鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
 		//鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
-		return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
+		return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
 	}
 
 	/**
@@ -169,8 +165,9 @@
 		//灏咲TO杞崲涓篋O
 		CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
 		revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
+		codeClassifyProcessTempDO = DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
 		codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO);
-		return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
+		return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
 	}
 
 	/**
@@ -185,7 +182,7 @@
 		VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞�",codeClassifyProcessTempDTO.getOid(),"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉跨殑涓婚敭");
 		CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
 		R baseResult = checkIsCanDeleteForDO(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
-		if(!baseResult.isSuccess()) {
+		if(baseResult.isSuccess()) {
 		}else{
 			return baseResult;
 		}
@@ -202,7 +199,7 @@
 	 */
 	@Override
 	public  CodeClassifyProcessTempVO getObjectByOid(String oid) throws VciBaseException{
-		return codeClassifyProcessTempDO2VO(selectByOid(oid));
+		return CodeClassifyProcessTempWrapper.build().entityVO((selectByOid(oid)));
 	}
 
 	/**
@@ -215,7 +212,7 @@
 	public Collection<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(Collection<String> oidCollections) throws VciBaseException{
 		VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
 		List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList = listCodeClassifyProcessTempDOByOidCollections(oidCollections);
-		return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
+		return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempDOList);
 	}
 
 	/**
@@ -252,7 +249,7 @@
 		LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
 			.lambda().eq(CodeClassifyProcessTemp::getClassifyTemplateOid, codeTemplateOid)
 			.eq(CodeClassifyProcessTemp::getCodeProcessUse, processUse);
-		return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempMapper.selectList(wrapper));
+		return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempMapper.selectList(wrapper));
 	}
 
 	/**
@@ -263,7 +260,7 @@
 	@Override
 	public List<CodeClassifyProcessTempVO> selectByWrapper(LambdaQueryWrapper<CodeClassifyProcessTemp> queryWrapper) {
 		List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList= codeClassifyProcessTempMapper.selectList(queryWrapper);
-		return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
+		return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempDOList);
 	}
 
 	/**
@@ -295,7 +292,7 @@
 	private R checkIsCanDeleteForDO(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO, CodeClassifyProcessTemp codeClassifyProcessTempDO) {
 		CodeClassifyProcessTemp tempDO = new CodeClassifyProcessTemp();
 		BeanUtil.convert(codeClassifyProcessTempDTO,tempDO);
-		if (!checkTs(tempDO)) {
+		if (!checkTs(tempDO,codeClassifyProcessTempDO)) {
 			return R.fail(TS_NOT_PROCESS);
 		}
 		if(!checkIsLinked(codeClassifyProcessTempDO.getOid())) {
@@ -310,12 +307,11 @@
 	 * @param tempDO
 	 * @return
 	 */
-	private boolean checkTs(CodeClassifyProcessTemp tempDO){
-		LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
-			.lambda().eq(CodeClassifyProcessTemp::getOid,tempDO.getOid()).select(CodeClassifyProcessTemp::getTs);
-		long dbTs = codeClassifyProcessTempMapper.selectById(wrapper).getTs().getTime();
-		long currentTs = tempDO.getTs().getTime();
-		if(dbTs == currentTs){
+	private boolean checkTs(CodeClassifyProcessTemp tempDO, CodeClassifyProcessTemp codeClassifyProcessTempDO){
+		Date dbTs = codeClassifyProcessTempDO.getTs();
+		Date currentTs = tempDO.getTs();
+		int i = currentTs.compareTo(dbTs);
+		if(i==0){
 			return true;
 		}
 		return false;
@@ -357,7 +353,7 @@
 			throw new VciBaseException("妯℃澘娴佺▼鍚嶇О涓嶈兘涓虹┖");
 		}
 		LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
-			.lambda().eq(CodeClassifyProcessTemp::getCodeProcessUse, codeClassifyProcessTempDTO.getCodeprocessuse())
+			.lambda().eq(CodeClassifyProcessTemp::getCodeProcessUse, codeClassifyProcessTempDTO.getCodeProcessUse())
 			.eq(CodeClassifyProcessTemp::getClassifyTemplateOid, codeClassifyProcessTempDTO.getClassifyTemplateOid())
 			.eq(CodeClassifyProcessTemp::getId, codeClassifyProcessTempDTO.getId());
 		Long count = codeClassifyProcessTempMapper.selectCount(wrapper);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 0a05198..eaf2cf6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -1,17 +1,11 @@
 package com.vci.ubcs.code.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
 import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateButtonMapper;
-import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
 import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
-import com.vci.ubcs.code.service.ICodeTempphaseService;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -21,12 +15,10 @@
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springframework.cglib.beans.BeanMap;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.sql.Wrapper;
 import java.util.*;
 
 /**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index 47ef341..b863b7f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -89,9 +89,9 @@
 	@Autowired(required = false)
 	private CodeClsflowtempMapper codeClsflowtempMapper;
 	@Autowired(required = false)
-	private CodeTempphaseMapper codeTempphaseMapper;
+	private CodeTemplatePhaseMapper codeTempphaseMapper;
 	@Autowired(required = false)
-	private CodeTempbuttonMapper codeTempbuttonMapper;
+	private CodeClassifyTemplateButtonMapper codeTempbuttonMapper;
 	@Autowired(required = false)
 	private CodePhaseattrMapper codePhaseattrMapper;
 	@Autowired(required = false)
@@ -556,11 +556,11 @@
 		List<CodePhaseattrEntity> codePhaseAttrDOList = (ArrayList<CodePhaseattrEntity>)phase_attrMap.get("phaseAttr");//闃舵灞炴��
 
 		//澶嶅埗妯℃澘鎸夐挳
-		List<CodeTempbuttonEntity> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);
+		List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);
 
 		//涓�璧蜂繚瀛樻暟鎹�
 //		WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-		//淇濆瓨妯℃澘
+		//淇濆瓨妯℃澘鈥斺��
 //		BatchCBO batchCBOTemplate = new BatchCBO();
 		//batchCBO淇濆瓨鐨勬椂鍊欐病鏈夎兘澶熻嚜鍔╱pdate婧愭暟鎹殑isLastR
 		//batchCBOTemplate.getCreateCbos().add(clientBusinessObject_template_insert);
@@ -659,7 +659,7 @@
 		List<CodePhaseattrEntity> codePhaseAttrDOList = (ArrayList<CodePhaseattrEntity>)phase_attrMap.get("phaseAttr");//闃舵灞炴��
 
 		//澶嶅埗妯℃澘鎸夐挳
-		List<CodeTempbuttonEntity> codeClassifyTemplateButtonDOList = copyTemplateButton(oldOid,newOid);
+		List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(oldOid,newOid);
 
 //		baseMapper.insert(codeClassifyTemplateDOList);
 		this.saveBatch(codeClassifyTemplateDOList);
@@ -766,7 +766,7 @@
 			String oldoid = codeTemplatePhaseDO.getOid();
 			String newOid = VciBaseUtil.getPk();
 			codeTemplatePhaseDO.setOid(newOid);
-			codeTemplatePhaseDO.setCodeclassifytemplateoid(templateNewOid);
+			codeTemplatePhaseDO.setCodeClassifyTemplateOid(templateNewOid);
 			phaseKeyMap.put(oldoid,newOid);
 			phaseOidList.add(oldoid);
 		}
@@ -781,10 +781,10 @@
 			codePhaseAttrDOList = codePhaseattrMapper.selectByPhaseaIds(VciBaseUtil.toInSql(phaseOidList.toArray(new String[0])));
 		}
 		for (CodePhaseattrEntity codePhaseAttrDO:codePhaseAttrDOList){
-			String oldPhaseoid = codePhaseAttrDO.getCodephaseoid();
+			String oldPhaseoid = codePhaseAttrDO.getCodePhaseOid();
 //			String newOid = VciBaseUtil.getPk();
 			codePhaseAttrDO.setOid(null);
-			codePhaseAttrDO.setCodephaseoid(phaseKeyMap.get(oldPhaseoid));
+			codePhaseAttrDO.setCodePhaseOid(phaseKeyMap.get(oldPhaseoid));
 //			codePhaseattrMapper.insert(codePhaseAttrDO);
 		}
 		Map phaseMap = new HashMap();
@@ -796,15 +796,15 @@
 	/**
 	 * 澶嶅埗妯℃澘鎸夐挳
 	 */
-	public List<CodeTempbuttonEntity> copyTemplateButton(String templateOldOid,String templateNewOid){
+	public List<CodeClassifyTemplateButton> copyTemplateButton(String templateOldOid,String templateNewOid){
 
 		Map<String,Object> condition = new HashMap<>(1);
 		condition.put("classifyTemplateOid",templateOldOid);
 //		VciQueryWrapperForDO buttonWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateButtonDO.class);
 //		buttonWrapper.addQueryMap("classifyTemplateOid",templateOldOid);
-		List<CodeTempbuttonEntity> codeTempbuttonEntities = codeTempbuttonMapper.selectByMap(condition);
+		List<CodeClassifyTemplateButton> codeTempbuttonEntities = codeTempbuttonMapper.selectByMap(condition);
 //		List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = codeClassifyTemplateButtonDaoI.selectByWrapper(buttonWrapper);
-		for (CodeTempbuttonEntity codeClassifyTemplateButtonDO:codeTempbuttonEntities){
+		for (CodeClassifyTemplateButton codeClassifyTemplateButtonDO:codeTempbuttonEntities){
 //			String newOid = VciBaseUtil.getPk();
 			codeClassifyTemplateButtonDO.setOid(null);
 			codeClassifyTemplateButtonDO.setClassifytemplateoid(templateNewOid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
index 06962aa..742dc51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
@@ -18,8 +18,8 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
+import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
 import com.vci.ubcs.code.service.ICodePhaseattrService;
 import com.vci.ubcs.code.vo.CodePhaseattrVO;
 import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@
  * @since 2023-04-20
  */
 @Service
-public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseAttrMapper, CodePhaseAttr> implements ICodePhaseattrService {
+public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseattrMapper, CodePhaseattrEntity> implements ICodePhaseattrService {
 
 	@Override
 	public IPage<CodePhaseattrVO> selectCodePhaseattrPage(IPage<CodePhaseattrVO> page, CodePhaseattrVO CodePhaseattr) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
index 9cdaaf5..392e9e1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
@@ -18,7 +18,6 @@
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
@@ -27,24 +26,21 @@
 import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
 import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
 import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
+import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
 import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
 import com.vci.ubcs.code.mapper.CommonsMapper;
 import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
 import com.vci.ubcs.code.service.ICodePhaseattrService;
-import com.vci.ubcs.code.service.ICodeTempphaseService;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
-import com.vci.ubcs.starter.util.MybatisParameterUtils;
-import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
+import com.vci.ubcs.starter.util.MybatisParameterUtil;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.BeanUtil;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.starter.web.util.WebUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -66,10 +62,10 @@
  * @since 2023-04-20
  */
 @Service
-public class CodeTempphaseServiceImpl extends ServiceImpl<CodeTemplatePhaseMapper, CodeTemplatePhase> implements ICodeTempphaseService {
+public class CodeTempphaseServiceImpl extends ServiceImpl<CodeTemplatePhaseMapper, CodeTempphaseEntity> implements ICodeTempphaseService {
 
 	@Autowired(required = false)
-	private CodePhaseAttrMapper codePhaseAttrMapper;
+	private CodePhaseattrMapper codePhaseAttrMapper;
 
 	@Autowired(required = false)
 	private CodeTemplatePhaseMapper codeTemplatePhaseMapper;
@@ -92,7 +88,6 @@
 	@Autowired
 	private ICodeClassifyTemplateAttrService tempAttrService;
 
-
 	/**
 	 * 鏌ヨ鎵�鏈夌殑妯℃澘闃舵
 	 * @param codeTemplatePhaseVO 鏌ヨ鏉′欢
@@ -101,12 +96,12 @@
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO, Query query) throws VciBaseException {
+	public DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query) throws VciBaseException {
 		query.setDescs("createTime");
 		query.setSize(-1);
 
-		IPage<CodeTemplatePhase> doList = codeTemplatePhaseMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeTemplatePhaseVO));
-		DataGrid<CodeTemplatePhaseVO> dataGrid=new DataGrid<CodeTemplatePhaseVO>();
+		IPage<CodeTempphaseEntity> doList = codeTemplatePhaseMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeTemplatePhaseVO));
+		DataGrid<CodeTemplatePhaseEntityVO> dataGrid=new DataGrid<CodeTemplatePhaseEntityVO>();
 		if (!CollectionUtils.isEmpty(doList.getRecords())) {
 			dataGrid.setData(codeTemplatePhaseDO2VOs(doList.getRecords()));
 			dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeTemplatePhaseMapper.selectCount(Condition.getQueryWrapper(codeTemplatePhaseVO)))));
@@ -116,16 +111,16 @@
 
 	/**
 	 * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
-	 * @param codeTemplatePhaseDOs 鏁版嵁瀵硅薄鍒楄〃
+	 * @param codeTemplatePhaseEntityDOS 鏁版嵁瀵硅薄鍒楄〃
 	 * @return 鏄剧ず瀵硅薄
 	 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseDOs) throws VciBaseException{
-		List<CodeTemplatePhaseVO> voList = new ArrayList<CodeTemplatePhaseVO>();
-		if(!CollectionUtils.isEmpty(codeTemplatePhaseDOs)){
-			for(CodeTemplatePhase s: codeTemplatePhaseDOs){
-				CodeTemplatePhaseVO vo =  codeTemplatePhaseDO2VO(s);
+	public List<CodeTemplatePhaseEntityVO> codeTemplatePhaseDO2VOs(Collection<CodeTempphaseEntity> codeTemplatePhaseEntityDOS) throws VciBaseException{
+		List<CodeTemplatePhaseEntityVO> voList = new ArrayList<CodeTemplatePhaseEntityVO>();
+		if(!CollectionUtils.isEmpty(codeTemplatePhaseEntityDOS)){
+			for(CodeTempphaseEntity s: codeTemplatePhaseEntityDOS){
+				CodeTemplatePhaseEntityVO vo =  codeTemplatePhaseDO2VO(s);
 				if(vo != null){
 					voList.add(vo);
 				}
@@ -136,15 +131,15 @@
 
 	/**
 	 * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
-	 * @param  codeTemplatePhaseDO 鏁版嵁瀵硅薄
+	 * @param  codeTemplatePhaseEntityDO 鏁版嵁瀵硅薄
 	 * @return 鏄剧ず瀵硅薄
 	 * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public  CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseDO) throws VciBaseException{
-		CodeTemplatePhaseVO vo = new CodeTemplatePhaseVO();
-		if(codeTemplatePhaseDO != null){
-			BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDO,vo);
+	public CodeTemplatePhaseEntityVO codeTemplatePhaseDO2VO(CodeTempphaseEntity codeTemplatePhaseEntityDO) throws VciBaseException{
+		CodeTemplatePhaseEntityVO vo = new CodeTemplatePhaseEntityVO();
+		if(codeTemplatePhaseEntityDO != null){
+			BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseEntityDO,vo);
 			//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
 		}
 		return vo;
@@ -161,14 +156,14 @@
 		int updateCount = 0;
 		Map<String,Object> condition = new HashMap<>(1);
 		condition.put("codeclassifytemplateoid",templateOid);
-		List<CodeTemplatePhase> codeTempphaseEntities = baseMapper.selectByMap(condition);
+		List<CodeTempphaseEntity> codeTempphaseEntities = baseMapper.selectByMap(condition);
 		if(!CollectionUtils.isEmpty(codeTempphaseEntities)) {
-			updateCount += baseMapper.deleteBatchIds(codeTempphaseEntities.stream().map(CodeTemplatePhase::getOid).collect(Collectors.toList()));
+			updateCount += baseMapper.deleteBatchIds(codeTempphaseEntities.stream().map(CodeTempphaseEntity::getOid).collect(Collectors.toList()));
 //			batchCBO.copyFromOther(codeTemplatePhaseMapper.batchDeleteByOids(templatePhaseDOS.stream().map(CodeTemplatePhaseDO::getOid).collect(Collectors.toList())));
 //			conditionMap.put("codePhaseOid", QueryOptionConstant.IN + "(select oid from " + getPhaseTable() + " where codeClassifyTemplateOid='" + classifyTemplateOid + "')");
-			List<CodePhaseAttr> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(templateOid);
+			List<CodePhaseattrEntity> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(templateOid);
 			if(!CollectionUtils.isEmpty(phaseAttrDOS)){
-				updateCount += codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseAttr::getOid).collect(Collectors.toList()));
+				updateCount += codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseattrEntity::getOid).collect(Collectors.toList()));
 			}
 		}
 		return updateCount;
@@ -184,7 +179,7 @@
 	public List<CodeClstempattrEntity> codeTemplateAttrModifyTrigger(List<CodeClstempattrEntity> attrDOList){
 		//灞炴�т慨鏀圭殑鏃跺�欙紝闇�瑕佸悓姝ヤ慨鏀瑰搴斿睘鎬х殑鍚嶇О
 //		BatchCBO batchCBO = new BatchCBO();
-		List<CodePhaseAttr> phaseAttrDOS =codePhaseAttrMapper.listLinkAttrDOByTemplateAttrDOS(VciBaseUtil.toInSql(attrDOList.stream()
+		List<CodePhaseattrEntity> phaseAttrDOS =codePhaseAttrMapper.listLinkAttrDOByTemplateAttrDOS(VciBaseUtil.toInSql(attrDOList.stream()
 			.map(CodeClstempattrEntity::getId).collect(Collectors.toList()).toArray(new String[0])),attrDOList.get(0).getClassifytemplateoid());
 		if(!CollectionUtils.isEmpty(phaseAttrDOS)){
 			//璇存槑鏈夊睘鎬�,鎴戜滑鍘绘浛鎹竴涓�
@@ -214,25 +209,25 @@
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
+	public CodeTemplatePhaseEntityVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
 		VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeTemplatePhaseDTO.getAttributes(),"鍖呭惈鐨勫睘鎬�");
 		//灏咲TO杞崲涓篋O
-		CodeTemplatePhase codeTemplatePhaseDO = new CodeTemplatePhase();
-		codeTemplatePhaseDO.setOid(VciBaseUtil.getPk());
-		BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDTO,codeTemplatePhaseDO);
+		CodeTempphaseEntity codeTemplatePhaseEntityDO = new CodeTempphaseEntity();
+		codeTemplatePhaseEntityDO.setOid(VciBaseUtil.getPk());
+		BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
 		//WebUtil.setPersistence(false);
-		boolean resBoolean = codeTemplatePhaseMapper.insert(codeTemplatePhaseDO) > 0;
-		List<CodePhaseAttr> attrDOList = new ArrayList<>();
+		boolean resBoolean = codeTemplatePhaseMapper.insert(codeTemplatePhaseEntityDO) > 0;
+		List<CodePhaseattrEntity> attrDOList = new ArrayList<>();
 		codeTemplatePhaseDTO.getAttributes().stream().forEach(attrDTO->{
-			CodePhaseAttr attrDO = new CodePhaseAttr();
+			CodePhaseattrEntity attrDO = new CodePhaseattrEntity();
 			BeanUtilForVCI.copyPropertiesIgnoreCase(attrDTO,attrDO);
 			attrDO.setOid(VciBaseUtil.getPk());
-			attrDO.setCodePhaseOid(codeTemplatePhaseDO.getOid());
+			attrDO.setCodePhaseOid(codeTemplatePhaseEntityDO.getOid());
 			attrDOList.add(attrDO);
 		});
 		codePhaseattrService.saveBatch(attrDOList);
 		//WebUtil.setPersistence(true);
-		return codeTemplatePhaseDO2VO(codeTemplatePhaseDO);
+		return codeTemplatePhaseDO2VO(codeTemplatePhaseEntityDO);
 	}
 
 	/**
@@ -243,29 +238,29 @@
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
+	public CodeTemplatePhaseEntityVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
 		VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"鏁版嵁瀵硅薄",codeTemplatePhaseDTO.getOid(),"妯℃澘闃舵涓婚敭",codeTemplatePhaseDTO.getAttributes(),"鍖呭惈鐨勫睘鎬�");
 		//灏咲TO杞崲涓篋O
-		CodeTemplatePhase codeTemplatePhaseDO = selectByOid(codeTemplatePhaseDTO.getOid());
-		revisionModelUtil.copyFromDTOIgnore(codeTemplatePhaseDTO,codeTemplatePhaseDO);
+		CodeTempphaseEntity codeTemplatePhaseEntityDO = selectByOid(codeTemplatePhaseDTO.getOid());
+		revisionModelUtil.copyFromDTOIgnore(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
 		//WebUtil.setPersistence(false);
-		codeTemplatePhaseMapper.updateById(codeTemplatePhaseDO);
+		codeTemplatePhaseMapper.updateById(codeTemplatePhaseEntityDO);
 		//鎶婁互鍓嶇殑鍒犻櫎
-		List<CodePhaseAttr> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseDO.getOid());
+		List<CodePhaseattrEntity> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseEntityDO.getOid());
 		if(!CollectionUtils.isEmpty(phaseAttrDOS)){
-			codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseAttr::getOid).collect(Collectors.toList()));
+			codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseattrEntity::getOid).collect(Collectors.toList()));
 		}
-		List<CodePhaseAttr> attrDOList = new ArrayList<>();
+		List<CodePhaseattrEntity> attrDOList = new ArrayList<>();
 		codeTemplatePhaseDTO.getAttributes().stream().forEach(attrDTO->{
-			CodePhaseAttr attrDO = new CodePhaseAttr();
+			CodePhaseattrEntity attrDO = new CodePhaseattrEntity();
 			BeanUtilForVCI.copyPropertiesIgnoreCase(attrDTO,attrDO);
 			attrDO.setOid(VciBaseUtil.getPk());
-			attrDO.setCodePhaseOid(codeTemplatePhaseDO.getOid());
+			attrDO.setCodePhaseOid(codeTemplatePhaseEntityDO.getOid());
 			attrDOList.add(attrDO);
 		});
 		codePhaseattrService.saveBatch(attrDOList);
 		//WebUtil.setPersistence(true);
-		return codeTemplatePhaseDO2VO(codeTemplatePhaseDO);
+		return codeTemplatePhaseDO2VO(codeTemplatePhaseEntityDO);
 	}
 
 	/**
@@ -278,20 +273,20 @@
 	@Transactional(rollbackFor = Exception.class)
 	public R deleteCodeTemplatePhase(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
 		VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"妯℃澘闃舵鏁版嵁瀵硅薄",codeTemplatePhaseDTO.getOid(),"妯℃澘闃舵鐨勪富閿�");
-		CodeTemplatePhase codeTemplatePhaseDO = selectByOid(codeTemplatePhaseDTO.getOid());
-		R baseResult = checkIsCanDeleteForDO(codeTemplatePhaseDTO,codeTemplatePhaseDO);
+		CodeTempphaseEntity codeTemplatePhaseEntityDO = selectByOid(codeTemplatePhaseDTO.getOid());
+		R baseResult = checkIsCanDeleteForDO(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
 		if(!baseResult.isSuccess()) {
 		}else{
 			return baseResult;
 		}
 		//鎵ц鍒犻櫎鎿嶄綔
 		//WebUtil.setPersistence(false);
-		boolean batchCBO = codeTemplatePhaseMapper.deleteById(codeTemplatePhaseDO.getOid())>0;
+		boolean batchCBO = codeTemplatePhaseMapper.deleteById(codeTemplatePhaseEntityDO.getOid())>0;
 		//闇�瑕佸垹闄ゅ睘鎬�
-		List<CodePhaseAttr> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseDO.getOid());
+		List<CodePhaseattrEntity> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseEntityDO.getOid());
 		boolean deleteCBO = false;
 		if(!CollectionUtils.isEmpty(phaseAttrDOS)) {
-			deleteCBO = codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseAttr::getOid).collect(Collectors.toList()))>0;
+			deleteCBO = codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseattrEntity::getOid).collect(Collectors.toList()))>0;
 		}
 		//WebUtil.setPersistence(true);
 		return (batchCBO || deleteCBO)?R.success(DELETE_SUCCESS):R.fail(DELETE_FAIL);
@@ -304,7 +299,7 @@
 	 * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
 	 */
 	@Override
-	public  CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException{
+	public CodeTemplatePhaseEntityVO getObjectByOid(String oid) throws VciBaseException{
 		return codeTemplatePhaseDO2VO(selectByOid(oid));
 	}
 
@@ -315,10 +310,10 @@
 	 * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
 	 */
 	@Override
-	public Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException{
+	public Collection<CodeTemplatePhaseEntityVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException{
 		VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
-		List<CodeTemplatePhase> codeTemplatePhaseDOList = listCodeTemplatePhaseDOByOidCollections(oidCollections);
-		return codeTemplatePhaseDO2VOs(codeTemplatePhaseDOList);
+		List<CodeTempphaseEntity> codeTemplatePhaseEntityDOList = listCodeTemplatePhaseDOByOidCollections(oidCollections);
+		return codeTemplatePhaseDO2VOs(codeTemplatePhaseEntityDOList);
 	}
 
 	/**
@@ -329,11 +324,11 @@
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
+	public DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
 		if(conditionMap == null){
 			conditionMap = new HashMap<String, String>();
 		}
-		CodeTemplatePhaseVO codeTemplatePhaseVO = new CodeTemplatePhaseVO();
+		CodeTemplatePhaseEntityVO codeTemplatePhaseVO = new CodeTemplatePhaseEntityVO();
 		BeanMap beanMap = BeanMap.create(codeTemplatePhaseVO);
 		beanMap.putAll(conditionMap);
 		Query query = new Query();
@@ -368,7 +363,7 @@
 			if(ids.size()<=1000){
 				queryWrapper = Wrappers.<CodeClassifyTemplateAttr>query().lambda().notIn(CodeClassifyTemplateAttr::getId, ids);
 			}else {
-				queryWrapper = MybatisParameterUtils.cutNotInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
+				queryWrapper = MybatisParameterUtil.cutNotInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
 			}
 			//conditionMap.put("id", QueryOptionConstant.NOTIN + ids);
 		}
@@ -392,7 +387,7 @@
 			return new DataGrid<>();
 		}
 		conditionMap.remove("codePhaseOid");
-		CodeTemplatePhase phaseDO = selectByOid(codePhaseOid);
+		CodeTempphaseEntity phaseDO = selectByOid(codePhaseOid);
 		List<String> ids = commonsMapper.selectById("(select id from " + getPhaseAttrTable() + " where codePhaseOid ='" +codePhaseOid + "')");
 		LambdaQueryWrapper<CodeClassifyTemplateAttr> queryWrapper = null;
 		//			Wrappers.<CodeClassifyTemplateAttrVO>query()
@@ -400,7 +395,7 @@
 		if(ids.size()<=1000){
 			queryWrapper = Wrappers.<CodeClassifyTemplateAttr>query().lambda().in(CodeClassifyTemplateAttr::getId, ids);
 		}else {
-			queryWrapper = MybatisParameterUtils.cutInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
+			queryWrapper = MybatisParameterUtil.cutInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
 		}
 		queryWrapper.eq(CodeClassifyTemplateAttr::getClassifyTemplateOid,phaseDO.getCodeClassifyTemplateOid());
 		return tempAttrService.gridCodeClassifyTemplateAttr(queryWrapper,pageHelper);
@@ -419,33 +414,33 @@
 	 * @param oidCollections 涓婚敭鐨勯泦鍚�
 	 * @return 鏁版嵁瀵硅薄鍒楄〃
 	 */
-	private List<CodeTemplatePhase> listCodeTemplatePhaseDOByOidCollections(Collection<String> oidCollections){
-		List<CodeTemplatePhase> codeTemplatePhaseDOList = new ArrayList<CodeTemplatePhase>();
+	private List<CodeTempphaseEntity> listCodeTemplatePhaseDOByOidCollections(Collection<String> oidCollections){
+		List<CodeTempphaseEntity> codeTemplatePhaseEntityDOList = new ArrayList<CodeTempphaseEntity>();
 		if(!CollectionUtils.isEmpty(oidCollections)){
 			Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
 			for(Collection<String> oids: oidCollectionsList){
-				List<CodeTemplatePhase> tempDOList =  codeTemplatePhaseMapper.selectBatchIds(oids);
+				List<CodeTempphaseEntity> tempDOList =  codeTemplatePhaseMapper.selectBatchIds(oids);
 				if(!CollectionUtils.isEmpty(tempDOList)){
-					codeTemplatePhaseDOList.addAll(tempDOList);
+					codeTemplatePhaseEntityDOList.addAll(tempDOList);
 				}
 			}
 		}
-		return  codeTemplatePhaseDOList;
+		return codeTemplatePhaseEntityDOList;
 	}
 
 	/**
 	 * 鏍¢獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
 	 * @param codeTemplatePhaseDTO 鏁版嵁浼犺緭瀵硅薄
-	 * @param codeTemplatePhaseDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
+	 * @param codeTemplatePhaseEntityDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
 	 * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
 	 */
-	private R checkIsCanDeleteForDO(CodeTemplatePhaseDTO codeTemplatePhaseDTO, CodeTemplatePhase codeTemplatePhaseDO) {
-		CodeTemplatePhase tsDO = new CodeTemplatePhase();
+	private R checkIsCanDeleteForDO(CodeTemplatePhaseDTO codeTemplatePhaseDTO, CodeTempphaseEntity codeTemplatePhaseEntityDO) {
+		CodeTempphaseEntity tsDO = new CodeTempphaseEntity();
 		BeanUtil.convert(codeTemplatePhaseDTO,tsDO);
 		if (checkTs(tsDO)) {
 			return R.fail(TS_NOT_PROCESS);
 		}
-		if(!checkIsLinked(codeTemplatePhaseDO.getOid())) {
+		if(!checkIsLinked(codeTemplatePhaseEntityDO.getOid())) {
 			return R.success("succcess");
 		}else{
 			return R.fail(DATA_LINKED_NOT_DELETE);
@@ -457,9 +452,9 @@
 	 * @param tempDO
 	 * @return
 	 */
-	private boolean checkTs(CodeTemplatePhase tempDO){
-		LambdaQueryWrapper<CodeTemplatePhase> wrapper = Wrappers.<CodeTemplatePhase>query()
-			.lambda().eq(CodeTemplatePhase::getOid,tempDO.getOid()).select(CodeTemplatePhase::getTs);
+	private boolean checkTs(CodeTempphaseEntity tempDO){
+		LambdaQueryWrapper<CodeTempphaseEntity> wrapper = Wrappers.<CodeTempphaseEntity>query()
+			.lambda().eq(CodeTempphaseEntity::getOid,tempDO.getOid()).select(CodeTempphaseEntity::getTs);
 		long dbTs = codePhaseAttrMapper.selectById(wrapper).getTs().getTime();
 		long currentTs = tempDO.getTs().getTime();
 		if(dbTs == currentTs){
@@ -483,11 +478,11 @@
 	 * @param codePhaseOid 闃舵鐨勪富閿�
 	 * @return 鍖呭惈灞炴�х殑鏁版嵁瀵硅薄
 	 */
-	private List<CodePhaseAttr> listPhaseAttrDOByPhaseOid(String codePhaseOid){
+	private List<CodePhaseattrEntity> listPhaseAttrDOByPhaseOid(String codePhaseOid){
 		if(StringUtils.isBlank(codePhaseOid)||StringUtils.isEmpty(codePhaseOid)){
 			return null;
 		}
-		List<CodePhaseAttr> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(codePhaseOid);
+		List<CodePhaseattrEntity> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(codePhaseOid);
 		return phaseAttrDOS;
 	}
 
@@ -497,13 +492,13 @@
 	 * @return  鏁版嵁瀵硅薄
 	 * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
 	 */
-	private CodeTemplatePhase selectByOid(String oid) throws VciBaseException{
+	private CodeTempphaseEntity selectByOid(String oid) throws VciBaseException{
 		VciBaseUtil.alertNotNull(oid,"涓婚敭");
-		CodeTemplatePhase codeTemplatePhaseDO = codeTemplatePhaseMapper.selectById(oid.trim());
-		if(codeTemplatePhaseDO == null || StringUtils.isBlank(codeTemplatePhaseDO.getOid())){
+		CodeTempphaseEntity codeTemplatePhaseEntityDO = codeTemplatePhaseMapper.selectById(oid.trim());
+		if(codeTemplatePhaseEntityDO == null || StringUtils.isBlank(codeTemplatePhaseEntityDO.getOid())){
 			throw new VciBaseException(DATA_OID_NOT_EXIST);
 		}
-		return codeTemplatePhaseDO;
+		return codeTemplatePhaseEntityDO;
 	}
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 8908602..6e6559a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -27,6 +27,7 @@
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.starter.web.util.VciDateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -34,7 +35,7 @@
 import java.util.stream.Collectors;
 
 import static com.vci.ubcs.code.constant.MdmEngineConstant.*;
-
+@Service
 public class MdmProductCodeServiceImpl  implements MdmProductCodeService {
 
 	/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java
new file mode 100644
index 0000000..04a9cae
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java
@@ -0,0 +1,31 @@
+package com.vci.ubcs.code.wrapper;
+
+import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
+import com.vci.ubcs.code.entity.CodeClassifyValue;
+import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum;
+import com.vci.ubcs.code.vo.CodeClsflowtempVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+public class CodeClassifyProcessTempWrapper  extends BaseEntityWrapper<CodeClassifyProcessTemp, CodeClassifyProcessTempVO> {
+
+	public static CodeClassifyProcessTempWrapper build() {
+		return new CodeClassifyProcessTempWrapper();
+	}
+
+	@Override
+	public CodeClassifyProcessTempVO entityVO(CodeClassifyProcessTemp codeClassifyProcessTemp) {
+		CodeClassifyProcessTempVO codeClassifyProcessTempVO = Objects.requireNonNull(BeanUtil.copy(codeClassifyProcessTemp, CodeClassifyProcessTempVO.class));
+		codeClassifyProcessTempVO.setCodeProcessUseText(CodeClassifyProcessUseEnum.getTextByValue(codeClassifyProcessTemp.getCodeProcessUse()));
+
+
+		return codeClassifyProcessTempVO;
+	}
+
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyValueWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyValueWrapper.java
index e4194bf..ed7c25c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyValueWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyValueWrapper.java
@@ -32,7 +32,7 @@
  * @author ludc
  * @since 2023-04-03
  */
-public class CodeClassifyValueWrapper extends BaseEntityWrapper<CodeClassifyValue, CodeClassifyValueVO>  {
+public class CodeClassifyValueWrapper extends BaseEntityWrapper<CodeClassifyValue, CodeClassifyValueVO> {
 
 	public static CodeClassifyValueWrapper build() {
 		return new CodeClassifyValueWrapper();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java
index ec3fb90..6092870 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java
@@ -16,7 +16,7 @@
  */
 package com.vci.ubcs.code.wrapper;
 
-import com.vci.ubcs.code.entity.CodePhaseAttr;
+import com.vci.ubcs.code.entity.CodePhaseattrEntity;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import com.vci.ubcs.code.vo.CodePhaseattrVO;
@@ -28,15 +28,15 @@
  * @author yuxc
  * @since 2023-04-20
  */
-public class CodePhaseattrWrapper extends BaseEntityWrapper<CodePhaseAttr, CodePhaseattrVO>  {
+public class CodePhaseattrWrapper extends BaseEntityWrapper<CodePhaseattrEntity, CodePhaseattrVO>  {
 
 	public static CodePhaseattrWrapper build() {
 		return new CodePhaseattrWrapper();
  	}
 
 	@Override
-	public CodePhaseattrVO entityVO(CodePhaseAttr CodePhaseattr) {
-		CodePhaseattrVO CodePhaseattrVO = Objects.requireNonNull(BeanUtil.copy(CodePhaseattr, CodePhaseattrVO.class));
+	public CodePhaseattrVO entityVO(CodePhaseattrEntity codePhaseattr) {
+		CodePhaseattrVO CodePhaseattrVO = Objects.requireNonNull(BeanUtil.copy(codePhaseattr, CodePhaseattrVO.class));
 
 		//User createUser = UserCache.getUser(CodePhaseattr.getCreateUser());
 		//User updateUser = UserCache.getUser(CodePhaseattr.getUpdateUser());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempphaseWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempphaseWrapper.java
index cad28fa..90dbb5f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempphaseWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempphaseWrapper.java
@@ -16,8 +16,8 @@
  */
 package com.vci.ubcs.code.wrapper;
 
-import com.vci.ubcs.code.entity.CodeTemplatePhase;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
+import com.vci.ubcs.code.entity.CodeTempphaseEntity;
+import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
@@ -29,15 +29,15 @@
  * @author yuxc
  * @since 2023-04-20
  */
-public class CodeTempphaseWrapper extends BaseEntityWrapper<CodeTemplatePhase, CodeTemplatePhaseVO>  {
+public class CodeTempphaseWrapper extends BaseEntityWrapper<CodeTempphaseEntity, CodeTemplatePhaseEntityVO>  {
 
 	public static CodeTempphaseWrapper build() {
 		return new CodeTempphaseWrapper();
  	}
 
 	@Override
-	public CodeTemplatePhaseVO entityVO(CodeTemplatePhase CodeTempphase) {
-		CodeTemplatePhaseVO CodeTemplatePhaseVO = Objects.requireNonNull(BeanUtil.copy(CodeTempphase, CodeTemplatePhaseVO.class));
+	public CodeTemplatePhaseEntityVO entityVO(CodeTempphaseEntity CodeTempphase) {
+		CodeTemplatePhaseEntityVO CodeTemplatePhaseVO = Objects.requireNonNull(BeanUtil.copy(CodeTempphase, CodeTemplatePhaseEntityVO.class));
 
 		//User createUser = UserCache.getUser(CodeTempphase.getCreateUser());
 		//User updateUser = UserCache.getUser(CodeTempphase.getUpdateUser());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml
index b9945a7..3363b1e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodePhaseAttrMapper">
+<mapper namespace="com.vci.ubcs.code.mapper.CodePhaseattrMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="CodePhaseattrResultMap" type="com.vci.ubcs.code.entity.CodePhaseAttr">
+    <resultMap id="CodePhaseattrResultMap" type="com.vci.ubcs.code.entity.CodePhaseattrEntity">
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
index db3eb12..5f281e3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="CodeTempphaseResultMap" type="com.vci.ubcs.code.entity.CodeTemplatePhase">
+    <resultMap id="CodeTempphaseResultMap" type="com.vci.ubcs.code.entity.CodeTempphaseEntity">
         <result column="CREATETIME" property="createTime"/>
         <result column="LASTMODIFIER" property="lastModifier"/>
         <result column="LASTMODIFYTIME" property="lastModifyTime"/>
@@ -21,7 +21,7 @@
         <result column="DESCRIPTION" property="description"/>
         <result column="OWNER" property="owner"/>
         <result column="COPYFROMVERSION" property="copyFromVersion"/>
-        <result column="CODECLASSIFYTEMPLATEOID" property="codeclassifytemplateoid"/>
+        <result column="CODECLASSIFYTEMPLATEOID" property="codeClassifyTemplateOid"/>
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml b/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
index 498158c..eebc5d4 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
@@ -15,6 +15,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.plugin.version>3.8.1</maven.plugin.version>
     </properties>
 
     <dependencies>
@@ -50,5 +51,17 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <finalName>${project.name}</finalName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
index e6200a9..16a5701 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
@@ -37,6 +37,7 @@
 @RequestMapping("/attribute")
 @Api(value = "鍏冩暟鎹帶鍒跺櫒", tags = "鍏冩暟鎹帶鍒跺櫒")
 public class AttributeController extends BladeController {
+
 	/**
 	 * 鍏冩暟鎹湇鍔�
 	 */
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
index a2deddc..a9bba71 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -128,7 +128,6 @@
 		return true;
 	}
 
-
 	/**
 	 * 鏍规嵁鑻辨枃鍚嶇О闆嗗悎鎵归噺鑾峰彇灞炴�у璞�
 	 *

--
Gitblit v1.9.3