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/datapush/classify/NodeLibraryDTO.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
index 1f0043b..8a3b967 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
@@ -1,14 +1,20 @@
package com.vci.ubcs.code.dto.datapush.classify;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
import java.util.List;
-//@XStreamAlias("library")
+@XStreamAlias("library")
public class NodeLibraryDTO {
- //@XStreamAsAttribute
+ @XStreamAsAttribute
private String id;
- //@XStreamAsAttribute
+ @XStreamAsAttribute
private String name;
- //@XStreamImplicit
+ @XStreamAsAttribute
+ private String classCode;
+ @XStreamImplicit
private List<NodeClassifyDTO> classify;
public String getId() {
@@ -35,12 +41,21 @@
this.classify = classify;
}
- @Override
- public String toString() {
- return "NodeLibraryDTO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", classify=" + classify +
- '}';
- }
+ public String getClassCode() {
+ return classCode;
+ }
+
+ public void setClassCode(String classCode) {
+ this.classCode = classCode;
+ }
+
+ @Override
+ public String toString() {
+ return "NodeLibraryDTO{" +
+ "id='" + id + '\'' +
+ ", name='" + name + '\'' +
+ ", classCode='" + classCode + '\'' +
+ ", classify=" + classify +
+ '}';
+ }
}
--
Gitblit v1.9.3