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-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
index bebe70c..8dfa209 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
@@ -1,7 +1,10 @@
package com.vci.ubcs.omd.entity;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -23,10 +26,6 @@
*/
private static final long serialVersionUID = 1476717511843047292L;
- /**
- * 涓婚敭
- */
- private String oid;
/**
* 鐢熷懡鍛ㄦ湡缂栧彿
@@ -53,43 +52,39 @@
*/
private String startStatusName;
- /**
- * 绫荤殑鍏ㄨ矾寰�
- */
- private String classFullName;
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmName;
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
+ /**
+ * 涓婚敭
+ */
+ @TableId
+ private String oid;
- /**
- * 鍒涘缓浜�
- */
- private String creator;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String creator;
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
+ /**
+ * 鏈�鍚庝慨鏀逛汉
+ */
+ private String lastModifier;
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
+ /**
+ * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
+ */
+ private Date lastModifyTime;
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
+ /**
+ * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
+ */
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ private Date ts;
}
--
Gitblit v1.9.3