From e5748ecbc12ea91d702e61af9a19667d19d19510 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 29 五月 2023 17:55:16 +0800 Subject: [PATCH] 动态表格组件更新 --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java index 1d75ce0..0600175 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java @@ -4,6 +4,7 @@ // package com.vci.ubcs.code.vo.pagemodel; +import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.data.annotation.Transient; import java.io.Serializable; import java.util.Date; @@ -26,19 +27,22 @@ private String lastModifier; private Date lastModifyTime; private String revisionRule; - private int revisionSeq; + private Integer revisionSeq; private String revisionValue; private String versionRule; - private int versionSeq; + private Integer versionSeq; private String versionValue; private String lcStatus; private String lcStatusText; + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss.SSS" + ) private Date ts; private String owner; - private String checkInBy; - private Date checkInTime; - private String checkOutBy; - private Date checkOutTime; +// private String checkInBy; +// private Date checkInTime; +// private String checkOutBy; +// private Date checkOutTime; private String copyFromVersion; private Integer secretGrade; private String secretGradeText; @@ -177,11 +181,11 @@ this.versionRule = versionRule; } - public int getRevisionSeq() { + public Integer getRevisionSeq() { return this.revisionSeq; } - public void setRevisionSeq(int revisionSeq) { + public void setRevisionSeq(Integer revisionSeq) { this.revisionSeq = revisionSeq; } @@ -193,11 +197,11 @@ this.revisionValue = revisionValue; } - public int getVersionSeq() { + public Integer getVersionSeq() { return this.versionSeq; } - public void setVersionSeq(int versionSeq) { + public void setVersionSeq(Integer versionSeq) { this.versionSeq = versionSeq; } @@ -233,7 +237,7 @@ this.owner = owner; } - public String getCheckInBy() { + /*public String getCheckInBy() { return this.checkInBy; } @@ -263,7 +267,7 @@ public void setCheckOutTime(Date checkOutTime) { this.checkOutTime = checkOutTime; - } + }*/ public String getCopyFromVersion() { return this.copyFromVersion; @@ -323,6 +327,6 @@ @Override public String toString() { - return "BaseModelVO{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", checkInBy='" + this.checkInBy + '\'' + ", checkInTime=" + this.checkInTime + ", checkOutBy='" + this.checkOutBy + '\'' + ", checkOutTime=" + this.checkOutTime + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}'; + return "BaseModelVO{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", checkInBy='" + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}'; } } -- Gitblit v1.9.3