From 54f35ae7866dac5c497372b68d03309c7eae9424 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 02 八月 2023 18:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java | 185 +++++++++++++++++++++------------------------
1 files changed, 86 insertions(+), 99 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
similarity index 60%
copy from Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java
copy to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
index 0098f1f..8c14eab 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
@@ -1,17 +1,12 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by FernFlower decompiler)
-//
-package com.vci.ubcs.code.webservice.vo;
+package com.vci.ubcs.codeapply.object;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.Transient;
-import java.io.Serializable;
import java.util.Date;
import java.util.Map;
-public class BaseModelVO implements Serializable {
+public class BaseModel {
private String oid;
private String id;
private String name;
@@ -35,12 +30,9 @@
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 String checkInBy;
// private Date checkInTime;
// private String checkOutBy;
// private Date checkOutTime;
@@ -48,14 +40,10 @@
private Integer secretGrade;
private String secretGradeText;
private String lctid;
- @Transient
private Map<String, String> data;
- public BaseModelVO() {
- }
-
public String getOid() {
- return this.oid;
+ return oid;
}
public void setOid(String oid) {
@@ -63,7 +51,7 @@
}
public String getId() {
- return this.id;
+ return id;
}
public void setId(String id) {
@@ -71,7 +59,7 @@
}
public String getName() {
- return this.name;
+ return name;
}
public void setName(String name) {
@@ -79,7 +67,7 @@
}
public String getDescription() {
- return this.description;
+ return description;
}
public void setDescription(String description) {
@@ -87,7 +75,7 @@
}
public String getRevisionOid() {
- return this.revisionOid;
+ return revisionOid;
}
public void setRevisionOid(String revisionOid) {
@@ -95,7 +83,7 @@
}
public String getNameOid() {
- return this.nameOid;
+ return nameOid;
}
public void setNameOid(String nameOid) {
@@ -103,7 +91,7 @@
}
public String getBtmname() {
- return this.btmname;
+ return btmname;
}
public void setBtmname(String btmname) {
@@ -111,7 +99,7 @@
}
public String getLastR() {
- return this.lastR;
+ return lastR;
}
public void setLastR(String lastR) {
@@ -119,7 +107,7 @@
}
public String getFirstR() {
- return this.firstR;
+ return firstR;
}
public void setFirstR(String firstR) {
@@ -127,7 +115,7 @@
}
public String getLastV() {
- return this.lastV;
+ return lastV;
}
public void setLastV(String lastV) {
@@ -135,7 +123,7 @@
}
public String getFirstV() {
- return this.firstV;
+ return firstV;
}
public void setFirstV(String firstV) {
@@ -143,15 +131,23 @@
}
public String getCreator() {
- return this.creator;
+ return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
public String getLastModifier() {
- return this.lastModifier;
+ return lastModifier;
}
public void setLastModifier(String lastModifier) {
@@ -159,7 +155,7 @@
}
public Date getLastModifyTime() {
- return this.lastModifyTime;
+ return lastModifyTime;
}
public void setLastModifyTime(Date lastModifyTime) {
@@ -167,23 +163,15 @@
}
public String getRevisionRule() {
- return this.revisionRule;
+ return revisionRule;
}
public void setRevisionRule(String revisionRule) {
this.revisionRule = revisionRule;
}
- public String getVersionRule() {
- return this.versionRule;
- }
-
- public void setVersionRule(String versionRule) {
- this.versionRule = versionRule;
- }
-
public Integer getRevisionSeq() {
- return this.revisionSeq;
+ return revisionSeq;
}
public void setRevisionSeq(Integer revisionSeq) {
@@ -191,15 +179,23 @@
}
public String getRevisionValue() {
- return this.revisionValue;
+ return revisionValue;
}
public void setRevisionValue(String revisionValue) {
this.revisionValue = revisionValue;
}
+ public String getVersionRule() {
+ return versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
+ }
+
public Integer getVersionSeq() {
- return this.versionSeq;
+ return versionSeq;
}
public void setVersionSeq(Integer versionSeq) {
@@ -207,7 +203,7 @@
}
public String getVersionValue() {
- return this.versionValue;
+ return versionValue;
}
public void setVersionValue(String versionValue) {
@@ -215,15 +211,23 @@
}
public String getLcStatus() {
- return this.lcStatus;
+ return lcStatus;
}
public void setLcStatus(String lcStatus) {
this.lcStatus = lcStatus;
}
+ public String getLcStatusText() {
+ return lcStatusText;
+ }
+
+ public void setLcStatusText(String lcStatusText) {
+ this.lcStatusText = lcStatusText;
+ }
+
public Date getTs() {
- return this.ts;
+ return ts;
}
public void setTs(Date ts) {
@@ -231,71 +235,23 @@
}
public String getOwner() {
- return this.owner;
+ return owner;
}
public void setOwner(String owner) {
this.owner = owner;
}
- /*public String getCheckInBy() {
- return this.checkInBy;
- }
-
- public void setCheckInBy(String checkInBy) {
- this.checkInBy = checkInBy;
- }
-
- public Date getCheckInTime() {
- return this.checkInTime;
- }
-
- public void setCheckInTime(Date checkInTime) {
- this.checkInTime = checkInTime;
- }
-
- public String getCheckOutBy() {
- return this.checkOutBy;
- }
-
- public void setCheckOutBy(String checkOutBy) {
- this.checkOutBy = checkOutBy;
- }
-
- public Date getCheckOutTime() {
- return this.checkOutTime;
- }
-
- public void setCheckOutTime(Date checkOutTime) {
- this.checkOutTime = checkOutTime;
- }*/
-
public String getCopyFromVersion() {
- return this.copyFromVersion;
+ return copyFromVersion;
}
public void setCopyFromVersion(String copyFromVersion) {
this.copyFromVersion = copyFromVersion;
}
- public String getLcStatusText() {
- return this.lcStatusText;
- }
-
- public void setLcStatusText(String lcStatusText) {
- this.lcStatusText = lcStatusText;
- }
-
- public Date getCreateTime() {
- return this.createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
public Integer getSecretGrade() {
- return this.secretGrade;
+ return secretGrade;
}
public void setSecretGrade(Integer secretGrade) {
@@ -303,7 +259,7 @@
}
public String getSecretGradeText() {
- return this.secretGradeText;
+ return secretGradeText;
}
public void setSecretGradeText(String secretGradeText) {
@@ -311,7 +267,7 @@
}
public String getLctid() {
- return this.lctid;
+ return lctid;
}
public void setLctid(String lctid) {
@@ -319,7 +275,7 @@
}
public Map<String, String> getData() {
- return this.data;
+ return data;
}
public void setData(Map<String, String> data) {
@@ -328,6 +284,37 @@
@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='" + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}';
+ return "BaseModel{" +
+ "oid='" + oid + '\'' +
+ ", id='" + id + '\'' +
+ ", name='" + name + '\'' +
+ ", description='" + description + '\'' +
+ ", revisionOid='" + revisionOid + '\'' +
+ ", nameOid='" + nameOid + '\'' +
+ ", btmname='" + btmname + '\'' +
+ ", lastR='" + lastR + '\'' +
+ ", firstR='" + firstR + '\'' +
+ ", lastV='" + lastV + '\'' +
+ ", firstV='" + firstV + '\'' +
+ ", creator='" + creator + '\'' +
+ ", createTime=" + createTime +
+ ", lastModifier='" + lastModifier + '\'' +
+ ", lastModifyTime=" + lastModifyTime +
+ ", revisionRule='" + revisionRule + '\'' +
+ ", revisionSeq=" + revisionSeq +
+ ", revisionValue='" + revisionValue + '\'' +
+ ", versionRule='" + versionRule + '\'' +
+ ", versionSeq=" + versionSeq +
+ ", versionValue='" + versionValue + '\'' +
+ ", lcStatus='" + lcStatus + '\'' +
+ ", lcStatusText='" + lcStatusText + '\'' +
+ ", ts=" + ts +
+ ", owner='" + owner + '\'' +
+ ", copyFromVersion='" + copyFromVersion + '\'' +
+ ", secretGrade=" + secretGrade +
+ ", secretGradeText='" + secretGradeText + '\'' +
+ ", lctid='" + lctid + '\'' +
+ ", data=" + data +
+ '}';
}
}
--
Gitblit v1.9.3