From 40eb98bcf3028ca1de391ac140f44920eddd9e8b Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 10:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 208 ++++++++++++++-------------------------------------
1 files changed, 57 insertions(+), 151 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index 04b7896..f7803b0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -10,6 +10,8 @@
import lombok.EqualsAndHashCode;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
/**
* software_test_order
@@ -25,8 +27,6 @@
@ApiModelProperty(value = "椤圭洰ID")
private Long projectId;
- @ApiModelProperty(value = "鏈烘瀯ID")
- private Long agencyId;
@ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
private String code;
@@ -40,8 +40,11 @@
@ApiModelProperty(value = "娴嬭瘯渚濇嵁")
private String testBasis;
- @ApiModelProperty(value = "娴嬭瘯绫诲瀷")
- private String testType;
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷1")
+ private String testType1;
+
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷2")
+ private String testType2;
@ApiModelProperty(value = "娴嬭瘯鏍囧噯")
private String testStandard;
@@ -101,6 +104,18 @@
@ApiModelProperty(value = "浼犵湡")
private String fax;
+ @ApiModelProperty(value = "濮旀墭鏂圭瀛�")
+ private String entrustSign;
+
+ @ApiModelProperty(value = "濮旀墭鏂圭瀛楁棩鏈�")
+ private String entrustSignDate;
+
+ @ApiModelProperty(value = "鎵挎墭鏂圭瀛�")
+ private String contractSign;
+
+ @ApiModelProperty(value = "鎵挎墭鏂圭瀛楁棩鏈�")
+ private String contractSignDate;
+
@TableField(exist = false)
@ApiModelProperty(value = "濮旀墭鍗曚綅鍚嶇О")
private String entrustUnitName;
@@ -138,8 +153,8 @@
private String softwareName;
@TableField(exist = false)
- @ApiModelProperty(value = "椤圭洰鏍囪瘑")
- private String identity;
+ @ApiModelProperty(value = "杞欢鏍囪瘑")
+ private String softwareIdentity;
@TableField(exist = false)
@ApiModelProperty(value = "瀵嗙骇")
@@ -149,7 +164,6 @@
@ApiModelProperty(value = "鍏抽敭绛夌骇")
private Integer criticalLevel;
- @TableField(exist = false)
@ApiModelProperty(value = "娴嬭瘯绾у埆")
private Integer testLevel;
@@ -194,156 +208,48 @@
@ApiModelProperty(value = "鏄惁琚祴浠�")
private String isMeasured;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷1绗�1鍒�")
+ List<HashMap<String, Object>> testType11;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷1绗�2鍒�")
+ List<HashMap<String, Object>> testType12;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷2绗�1鍒�")
+ List<HashMap<String, Object>> testType21;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷2绗�2鍒�")
+ List<HashMap<String, Object>> testType22;
- public String getEntrustUnitName() {
- return entrustUnitName;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏抽敭绛夌骇瀛楃涓�")
+ String criticalLevelStr;
- public void setEntrustUnitName(String entrustUnitName) {
- this.entrustUnitName = entrustUnitName;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "杞欢绫诲瀷瀛楃涓�")
+ String sortwareTypeStr;
- public String getEntrustUnitAddress() {
- return entrustUnitAddress;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯渚濇嵁瀛楃涓�")
+ String testBasisStr;
- public void setEntrustUnitAddress(String entrustUnitAddress) {
- this.entrustUnitAddress = entrustUnitAddress;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯鐩稿叧鏍囧噯瀛楃涓�")
+ String testStandardStr;
- public String getEntrustUnitContact() {
- return entrustUnitContact;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯绾у埆瀛楃涓�")
+ String testLevelStr;
- public void setEntrustUnitContact(String entrustUnitContact) {
- this.entrustUnitContact = entrustUnitContact;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏朵粬瑕佹眰瀛楃涓�")
+ String otherRequireStr;
- public String getEntrustUnitContWay() {
- return entrustUnitContWay;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╁搧鎬ц川瀛楃涓�")
+ String articleNatureStr;
- public void setEntrustUnitContWay(String entrustUnitContWay) {
- this.entrustUnitContWay = entrustUnitContWay;
- }
-
- public String getDevelopUnitName() {
- return developUnitName;
- }
-
- public void setDevelopUnitName(String developUnitName) {
- this.developUnitName = developUnitName;
- }
-
- public String getDevelopUnitAddress() {
- return developUnitAddress;
- }
-
- public void setDevelopUnitAddress(String developUnitAddress) {
- this.developUnitAddress = developUnitAddress;
- }
-
- public String getDevelopUnitContact() {
- return developUnitContact;
- }
-
- public void setDevelopUnitContact(String developUnitContact) {
- this.developUnitContact = developUnitContact;
- }
-
- public String getDevelopUnitContWay() {
- return developUnitContWay;
- }
-
- public void setDevelopUnitContWay(String developUnitContWay) {
- this.developUnitContWay = developUnitContWay;
- }
-
- public String getSoftwareName() {
- return softwareName;
- }
-
- public void setSoftwareName(String softwareName) {
- this.softwareName = softwareName;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getIdentity() {
- return identity;
- }
-
- public void setIdentity(String identity) {
- this.identity = identity;
- }
-
- public Integer getSecretClass() {
- return secretClass;
- }
-
- public void setSecretClass(Integer secretClass) {
- this.secretClass = secretClass;
- }
-
- public Integer getCriticalLevel() {
- return criticalLevel;
- }
-
- public void setCriticalLevel(Integer criticalLevel) {
- this.criticalLevel = criticalLevel;
- }
-
- public Integer getTestLevel() {
- return testLevel;
- }
-
- public void setTestLevel(Integer testLevel) {
- this.testLevel = testLevel;
- }
-
- public String getSoftwareType() {
- return softwareType;
- }
-
- public void setSoftwareType(String softwareType) {
- this.softwareType = softwareType;
- }
-
- public String getProjectLeader() {
- return projectLeader;
- }
-
- public void setProjectLeader(String projectLeader) {
- this.projectLeader = projectLeader;
- }
-
- public String getProjectTesters() {
- return projectTesters;
- }
-
- public void setProjectTesters(String projectTesters) {
- this.projectTesters = projectTesters;
- }
-
- public String getProjectReviewer() {
- return projectReviewer;
- }
-
- public void setProjectReviewer(String projectReviewer) {
- this.projectReviewer = projectReviewer;
- }
-
- public Integer getIsContract() {
- return isContract;
- }
-
- public void setIsContract(Integer isContract) {
- this.isContract = isContract;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏍峰搧鐘舵�佸瓧绗︿覆")
+ String sampleStatusStr;
}
--
Gitblit v1.9.1