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/vo/LifeCycleLineEventVO.java | 62 +------------------------------
1 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
index 9db39af..25822d2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.vo;
+import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
import lombok.Data;
import java.util.Date;
@@ -11,70 +12,11 @@
* @date 2023/4/3
*/
@Data
-public class LifeCycleLineEventVO implements java.io.Serializable{
+public class LifeCycleLineEventVO extends LifeCycleLineEvent {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 216430078444875215L;
- /**
- * 涓婚敭
- */
- private String oid;
-
- /**
- * 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
- */
- private String pkLifeCycleLine;
-
- /**
- * 浜嬩欢鐨勫叏璺緞
- */
- private String eventFullName;
-
- /**
- * 浜嬩欢鐨勫悕绉�
- */
- private String eventShowName;
-
- /**
- * 鎺掑簭鍙�
- */
- private Integer orderNum;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
}
--
Gitblit v1.9.3