From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java | 56 +++++++-------------------------------------------------
1 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
index 994d025..1d5e08a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
@@ -1,17 +1,19 @@
package com.vci.ubcs.code.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
import java.util.List;
/**
* 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
*
- * @author weidy
+ * @author ludc
* @date 2022-01-24
*/
-public class CodeTemplatePhaseDTO extends BaseModelVO {
+@Data
+public class CodeTemplatePhaseDTO extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -21,60 +23,16 @@
/**
* 鎵�灞炵紪鐮佽鍒�
*/
- private String codeclassifytemplateoid;
+ private String codeClassifyTemplateOid;
/**
* 鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
*/
- private String codeclassifytemplateoidName;
+ private String codeClassifyTemplateOidName;
/**
* 鍖呭惈鐨勫睘鎬�
*/
private List<CodePhaseAttrDTO> attributes;
- /**
- * 鑾峰彇 鎵�灞炵紪鐮佽鍒�
- */
- public String getCodeclassifytemplateoid (){
- return codeclassifytemplateoid;
- }
-
- /**
- * 璁剧疆 鎵�灞炵紪鐮佽鍒�
- */
- public void setCodeclassifytemplateoid (String codeclassifytemplateoid){
- this.codeclassifytemplateoid = codeclassifytemplateoid;
- }
-
- /**
- * 鑾峰彇鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
- */
- public String getCodeclassifytemplateoidName (){
- return codeclassifytemplateoidName;
- }
-
- /**
- * 璁剧疆鎵�灞炵紪鐮佽鍒欐樉绀烘枃鏈�
- */
- public void setCodeclassifytemplateoidName (String codeclassifytemplateoidName){
- this.codeclassifytemplateoidName = codeclassifytemplateoidName;
- }
-
- public List<CodePhaseAttrDTO> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(List<CodePhaseAttrDTO> attributes) {
- this.attributes = attributes;
- }
-
- @Override
- public String toString() {
- return "CodeTemplatePhaseDTO{" +
- "codeclassifytemplateoid='" + codeclassifytemplateoid + '\'' +
- ", codeclassifytemplateoidName='" + codeclassifytemplateoidName + '\'' +
- ", attributes=" + attributes +
- "} " + super.toString();
- }
}
--
Gitblit v1.9.3