From a4f932c6ca705feb3bee3b7d7bbe0ee5c0c85515 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 29 十二月 2023 09:41:11 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 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 ee3f3dc..18678cf 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 @@ -27,7 +27,6 @@ @ApiModelProperty(value = "椤圭洰ID") private Long projectId; - @ApiModelProperty(value = "濮旀墭鍗曠紪鍙�") private String code; @@ -40,6 +39,9 @@ @ApiModelProperty(value = "娴嬭瘯渚濇嵁") private String testBasis; + @ApiModelProperty(value = "娴嬭瘯渚濇嵁鍏朵粬锛�") + private String otherBasis; + @ApiModelProperty(value = "娴嬭瘯绫诲瀷1") private String testType1; @@ -48,6 +50,9 @@ @ApiModelProperty(value = "娴嬭瘯鏍囧噯") private String testStandard; + + @ApiModelProperty(value = "娴嬭瘯鏍囧噯鍏朵粬") + private String otherStandard; @ApiModelProperty(value = "寮�濮嬫棩鏈�") @JsonFormat(pattern = "yyyy-MM-dd") @@ -63,6 +68,9 @@ @ApiModelProperty(value = "鍏朵粬瑕佹眰") private String otherRequire; + @ApiModelProperty(value = "鍏朵粬瑕佹眰鍏朵粬") + private String requireOther; + @ApiModelProperty(value = "娴嬭瘯鏃ユ湡") @JsonFormat(pattern = "yyyy-MM-dd") private Date testDate; @@ -72,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; @@ -108,13 +119,15 @@ private String entrustSign; @ApiModelProperty(value = "濮旀墭鏂圭瀛楁棩鏈�") - private String entrustSignDate; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date entrustSignDate; @ApiModelProperty(value = "鎵挎墭鏂圭瀛�") private String contractSign; @ApiModelProperty(value = "鎵挎墭鏂圭瀛楁棩鏈�") - private String contractSignDate; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date contractSignDate; @TableField(exist = false) @ApiModelProperty(value = "濮旀墭鍗曚綅鍚嶇О") @@ -164,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 = "杞欢绫诲瀷") @@ -225,10 +240,6 @@ @TableField(exist = false) @ApiModelProperty(value = "鍏抽敭绛夌骇瀛楃涓�") String criticalLevelStr; - - @TableField(exist = false) - @ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆") - String isMeasuredStr; @TableField(exist = false) @ApiModelProperty(value = "杞欢绫诲瀷瀛楃涓�") -- Gitblit v1.9.1