From b11b45122d2b6903e8970e8d55712f7a6a657e22 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 一月 2024 00:01:10 +0800
Subject: [PATCH] defaultReferDataGrid接口修改，实现兼容高级查询sql拼接；修改流水处理接口，增加流水处理跳出判断
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
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 c8c9754..e8923b1 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
@@ -14,16 +14,17 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
public class BaseModel implements Serializable {
@JsonSerialize(
using = ToStringSerializer.class
)
@ApiModelProperty("涓婚敭id")
- @TableId(value = "OID",type = IdType.ASSIGN_UUID)
+ @TableId(value = "OID",type = IdType.ASSIGN_ID)
private String oid;
- @TableField(value = "ID")
+ @TableField(value = "id")
private String id;
private String name;
@@ -52,6 +53,7 @@
private String firstV;
private String creator;
+
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@@ -61,6 +63,7 @@
private Date createTime;
private String lastModifier;
+
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@@ -94,6 +97,9 @@
)
private Date ts;
+ /**
+ * 鎵�鏈夎��
+ */
private String owner;
private String copyFromVersion;
@@ -108,7 +114,7 @@
private String secretGradeText;
@TableField(exist = false)
- private Map<String, String> data;
+ private Map<String, String> data = new HashMap<>();
public BaseModel() {
}
--
Gitblit v1.9.3