From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 242 +++++++++++++++++++-----------------------------
1 files changed, 96 insertions(+), 146 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 85cb239..db3d983 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,6 +27,9 @@
@ApiModelProperty(value = "椤圭洰ID")
private Long projectId;
+ @ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
+ private String code;
+
@ApiModelProperty(value = "杩愯鐜")
private String optEnviron;
@@ -34,11 +39,20 @@
@ApiModelProperty(value = "娴嬭瘯渚濇嵁")
private String testBasis;
- @ApiModelProperty(value = "娴嬭瘯绫诲瀷")
- private String testType;
+ @ApiModelProperty(value = "娴嬭瘯渚濇嵁鍏朵粬锛�")
+ private String otherBasis;
+
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷1")
+ private String testType1;
+
+ @ApiModelProperty(value = "娴嬭瘯绫诲瀷2")
+ private String testType2;
@ApiModelProperty(value = "娴嬭瘯鏍囧噯")
private String testStandard;
+
+ @ApiModelProperty(value = "娴嬭瘯鏍囧噯鍏朵粬")
+ private String otherStandard;
@ApiModelProperty(value = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -54,6 +68,9 @@
@ApiModelProperty(value = "鍏朵粬瑕佹眰")
private String otherRequire;
+ @ApiModelProperty(value = "鍏朵粬瑕佹眰鍏朵粬")
+ private String requireOther;
+
@ApiModelProperty(value = "娴嬭瘯鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date testDate;
@@ -63,10 +80,13 @@
private Date deliveryDate;
@ApiModelProperty(value = "妫�娴嬭垂鐢�")
- private Integer testCost;
+ private String testCost;
@ApiModelProperty(value = "鐗╁搧鎬ц川")
private String articleNature;
+
+ @ApiModelProperty(value = "鐗╁搧鎬ц川鍏朵粬")
+ private String otherNature;
@ApiModelProperty(value = "鏍峰搧鐘舵��")
private String sampleStatus;
@@ -94,6 +114,20 @@
@ApiModelProperty(value = "浼犵湡")
private String fax;
+
+ @ApiModelProperty(value = "濮旀墭鏂圭瀛�")
+ private String entrustSign;
+
+ @ApiModelProperty(value = "濮旀墭鏂圭瀛楁棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date entrustSignDate;
+
+ @ApiModelProperty(value = "鎵挎墭鏂圭瀛�")
+ private String contractSign;
+
+ @ApiModelProperty(value = "鎵挎墭鏂圭瀛楁棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date contractSignDate;
@TableField(exist = false)
@ApiModelProperty(value = "濮旀墭鍗曚綅鍚嶇О")
@@ -132,12 +166,8 @@
private String softwareName;
@TableField(exist = false)
- @ApiModelProperty(value = "椤圭洰缂栧彿")
- private String code;
-
- @TableField(exist = false)
- @ApiModelProperty(value = "椤圭洰鏍囪瘑")
- private String identity;
+ @ApiModelProperty(value = "杞欢鏍囪瘑")
+ private String softwareIdentity;
@TableField(exist = false)
@ApiModelProperty(value = "瀵嗙骇")
@@ -147,9 +177,11 @@
@ApiModelProperty(value = "鍏抽敭绛夌骇")
private Integer criticalLevel;
- @TableField(exist = false)
@ApiModelProperty(value = "娴嬭瘯绾у埆")
private Integer testLevel;
+
+ @ApiModelProperty(value = "骞翠唤")
+ private String year;
@TableField(exist = false)
@ApiModelProperty(value = "杞欢绫诲瀷")
@@ -171,155 +203,73 @@
@ApiModelProperty(value = "鏄惁绛剧讲鍚堝悓")
private Integer isContract;
- public String getEntrustUnitName() {
- return entrustUnitName;
- }
- public void setEntrustUnitName(String entrustUnitName) {
- this.entrustUnitName = entrustUnitName;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer num;
- public String getEntrustUnitAddress() {
- return entrustUnitAddress;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "濮旀墭鍗旾D")
+ private Long orderId;
- public void setEntrustUnitAddress(String entrustUnitAddress) {
- this.entrustUnitAddress = entrustUnitAddress;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍚嶇О")
+ private String name;
- public String getEntrustUnitContact() {
- return entrustUnitContact;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
+ private String identify;
- public void setEntrustUnitContact(String entrustUnitContact) {
- this.entrustUnitContact = entrustUnitContact;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏄惁琚祴浠�")
+ private String isMeasured;
- public String getEntrustUnitContWay() {
- return entrustUnitContWay;
- }
+ @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 void setEntrustUnitContWay(String entrustUnitContWay) {
- this.entrustUnitContWay = entrustUnitContWay;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏抽敭绛夌骇瀛楃涓�")
+ String criticalLevelStr;
- public String getDevelopUnitName() {
- return developUnitName;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "杞欢绫诲瀷瀛楃涓�")
+ String sortwareTypeStr;
- public void setDevelopUnitName(String developUnitName) {
- this.developUnitName = developUnitName;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯渚濇嵁瀛楃涓�")
+ String testBasisStr;
- public String getDevelopUnitAddress() {
- return developUnitAddress;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯鐩稿叧鏍囧噯瀛楃涓�")
+ String testStandardStr;
- public void setDevelopUnitAddress(String developUnitAddress) {
- this.developUnitAddress = developUnitAddress;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯绾у埆瀛楃涓�")
+ String testLevelStr;
- public String getDevelopUnitContact() {
- return developUnitContact;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏朵粬瑕佹眰瀛楃涓�")
+ String otherRequireStr;
- public void setDevelopUnitContact(String developUnitContact) {
- this.developUnitContact = developUnitContact;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╁搧鎬ц川瀛楃涓�")
+ String articleNatureStr;
- public String getDevelopUnitContWay() {
- return developUnitContWay;
- }
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏍峰搧鐘舵�佸瓧绗︿覆")
+ String sampleStatusStr;
- 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 secretClassStr;
}
--
Gitblit v1.9.1