fix

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/dto/ItdmXMJLQueryListDTO.java

@@ -1,17 +1,22 @@
 package org.jeecg.modules.itdmGongDan.dto;
 
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-public class ItdmXMJLQueryListDTO {
+@Data
+@Accessors(chain = true)
+public class ItdmXMJLAddOrUpdateDTO {
+
     /**委托id*/
     @Excel(name = "委托id", width = 15)
     @ApiModelProperty(value = "委托id")
@@ -45,7 +50,7 @@ public class ItdmXMJLQueryListDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "计划开始日期")
-    private Date jihuaStartDate;
+    private java.util.Date jihuaStartDate;
     /**计划结束日期*/
     @Excel(name = "计划结束日期", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -107,8 +112,8 @@ public class ItdmXMJLQueryListDTO {
     private java.lang.String statusC;
     /**实绩开始日期*/
     @Excel(name = "实绩开始日期", width = 15, format = "yyyy-MM-dd")
-//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-ddTHH:mm:SSSZ")
-    @DateTimeFormat(pattern="yyyy-MM-ddTHH:mm:SSSZ")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实绩开始日期")
     private java.util.Date shijiStartDate;
     /**试验计划id或工单master的id*/
@@ -125,221 +130,12 @@ public class ItdmXMJLQueryListDTO {
     private java.lang.String[] shiiyanTypeArray;
 
 
-    public String getWeituoId() {
-        return weituoId;
-    }
-
-    public void setWeituoId(String weituoId) {
-        this.weituoId = weituoId;
-    }
-
-    public String getYangpinId() {
-        return yangpinId;
-    }
-
-    public void setYangpinId(String yangpinId) {
-        this.yangpinId = yangpinId;
-    }
-
-    public String getTestItems() {
-        return testItems;
-    }
-
-    public void setTestItems(String testItems) {
-        this.testItems = testItems;
-    }
-
-    public String getShebeiId() {
-        return shebeiId;
-    }
-
-    public void setShebeiId(String shebeiId) {
-        this.shebeiId = shebeiId;
-    }
-
-    public String getPm() {
-        return pm;
-    }
-
-    public void setPm(String pm) {
-        this.pm = pm;
-    }
-
-    public String getWeituoNo() {
-        return weituoNo;
-    }
-
-    public void setWeituoNo(String weituoNo) {
-        this.weituoNo = weituoNo;
-    }
-
-    public String getSampleName() {
-        return sampleName;
-    }
-
-    public void setSampleName(String sampleName) {
-        this.sampleName = sampleName;
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public Date getJihuaStartDate() {
-        return jihuaStartDate;
-    }
-
-    public void setJihuaStartDate(Date jihuaStartDate) {
-        this.jihuaStartDate = jihuaStartDate;
-    }
-
-    public Date getJihuaEndDate() {
-        return jihuaEndDate;
-    }
-
-    public void setJihuaEndDate(Date jihuaEndDate) {
-        this.jihuaEndDate = jihuaEndDate;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getReportNo() {
-        return reportNo;
-    }
-
-    public void setReportNo(String reportNo) {
-        this.reportNo = reportNo;
-    }
-
-    public String getChuanganqi() {
-        return chuanganqi;
-    }
-
-    public void setChuanganqi(String chuanganqi) {
-        this.chuanganqi = chuanganqi;
-    }
-
-    public String getParent() {
-        return parent;
-    }
-
-    public void setParent(String parent) {
-        this.parent = parent;
-    }
-
-    public String getTestPlanId() {
-        return testPlanId;
-    }
-
-    public void setTestPlanId(String testPlanId) {
-        this.testPlanId = testPlanId;
-    }
-
-    public String getTestItemsId() {
-        return testItemsId;
-    }
-
-    public void setTestItemsId(String testItemsId) {
-        this.testItemsId = testItemsId;
-    }
-
-    public Integer getLastTime() {
-        return lastTime;
-    }
-
-    public void setLastTime(Integer lastTime) {
-        this.lastTime = lastTime;
-    }
-
-
-    public String getShiiyanType() {
-        return shiiyanType;
-    }
-
-    public void setShiiyanType(String shiiyanType) {
-        this.shiiyanType = shiiyanType;
-    }
-
-    public String getWorker() {
-        return worker;
-    }
-
-    public void setWorker(String worker) {
-        this.worker = worker;
-    }
-
-    public Integer getYangpinCount() {
-        return yangpinCount;
-    }
-
-    public void setYangpinCount(Integer yangpinCount) {
-        this.yangpinCount = yangpinCount;
-    }
-
-    public String getNeirong() {
-        return neirong;
-    }
-
-    public void setNeirong(String neirong) {
-        this.neirong = neirong;
-    }
-
-    public String getStatusC() {
-        return statusC;
-    }
-
-    public void setStatusC(String statusC) {
-        this.statusC = statusC;
-    }
-    public Date getShijiStartDate() {
-        return shijiStartDate;
-    }
-
-    public void setShijiStartDate(Date shijiStartDate) {
-        this.shijiStartDate = shijiStartDate;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String[] getChuanganqiArray() {
-        return chuanganqiArray;
-    }
-
-    public void setChuanganqiArray(String[] chuanganqiArray) {
-        this.chuanganqiArray = chuanganqiArray;
-    }
-
-    public String[] getShiiyanTypeArray() {
-        return shiiyanTypeArray;
-    }
-
-    public void setShiiyanTypeArray(String[] shiiyanTypeArray) {
-        this.shiiyanTypeArray = shiiyanTypeArray;
-    }
-
-
     /**
      * 将二级对象转化为工单master，用于新增或修改
      * */
-    public static ItdmGongdanMaster toItdmGongdanMaster(ItdmXMJLQueryListVO vo){
+    public static ItdmGongdanMaster toItdmGongdanMaster(ItdmXMJLAddOrUpdateDTO vo){
         ItdmGongdanMaster m = new ItdmGongdanMaster();
-        m.setId(vo.getId());//如果用于新增，为空
+//        m.setId(vo.getId());//如果用于新增，为空
         m.setJihuaShiyanId(vo.getTestPlanId());
         m.setTestItemsId(vo.getTestItemsId());
         m.setWeituoYangpinId(vo.getYangpinId());
@@ -375,7 +171,7 @@ public class ItdmXMJLQueryListDTO {
     }
 
     /**转化成试验计划对象——项目经理修改试验计划*/
-    public static ItdmTestPlan toItdmTestPlan(ItdmXMJLQueryListVO vo){
+    public static ItdmTestPlan toItdmTestPlan(ItdmXMJLAddOrUpdateDTO vo){
         ItdmTestPlan itdmTestPlan = new ItdmTestPlan();
         itdmTestPlan.setId(vo.getTestPlanId());
         itdmTestPlan.setWeituoId(vo.getWeituoId());
@@ -403,4 +199,6 @@ public class ItdmXMJLQueryListDTO {
 
         return  itdmTestPlan;
     }
+
+
 }