委托项目完结，计划排期优化，历史数据导出

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/entity/ItdmAlarm.java

@@ -69,7 +69,7 @@ public class ItdmAlarm implements Serializable {
     @ApiModelProperty(value = "设备编号")
     private java.lang.String deviceNo;
 	/**设备类型*/
-	@Excel(name = "设备类型", width = 15)
+//	@Excel(name = "设备类型", width = 15)
     @ApiModelProperty(value = "设备类型")
     private java.lang.String deviceStatus;
 	/**数据类型*/

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarmTotal/entity/ItdmAlarmTotal.java

@@ -48,7 +48,7 @@ public class ItdmAlarmTotal implements Serializable {
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
-    @Excel(name = "更新日期", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "更新日期", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
@@ -69,7 +69,7 @@ public class ItdmAlarmTotal implements Serializable {
     @ApiModelProperty(value = "报警总数")
     private java.lang.Integer alarmTotal;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmEnvironmentQuyu.java

@@ -37,7 +37,7 @@ public class ItdmEnvironmentQuyu implements Serializable {
     @ApiModelProperty(value = "id")
     private java.lang.Integer id;
 	/**区域名称（1温箱区域2力学区域3霉菌区域）*/
-	@Excel(name = "区域名称（1温箱区域2力学区域3霉菌区域）", width = 15, dicCode = "area_name")
+	@Excel(name = "区域名称", width = 15, dicCode = "area_name")
 	@Dict(dicCode = "area_name")
     @ApiModelProperty(value = "区域名称（1温箱区域2力学区域3霉菌区域）")
     private java.lang.String areaName;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmEnvironmentWater.java

@@ -37,7 +37,7 @@ public class ItdmEnvironmentWater implements Serializable {
     @ApiModelProperty(value = "id")
     private java.lang.Integer id;
 	/**名称（0进水口，1出水口）*/
-	@Excel(name = "名称（0进水口，1出水口）", width = 15, dicCode = "area_name_water")
+	@Excel(name = "名称", width = 15, dicCode = "area_name_water")
 	@Dict(dicCode = "area_name_water")
     @ApiModelProperty(value = "名称（0进水口，1出水口）")
     private java.lang.Integer areaNameWater;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmWenxiang.java

@@ -37,7 +37,7 @@ public class ItdmWenxiang implements Serializable {
     @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
 	/**设备id*/
-	@Excel(name = "设备id", width = 15, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+//	@Excel(name = "设备id", width = 15, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
 	@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
     @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
@@ -62,7 +62,7 @@ public class ItdmWenxiang implements Serializable {
     @ApiModelProperty(value = "温度下限")
     private java.math.BigDecimal temperatureMin;
 	/**温度报警（0正常1报警）*/
-	@Excel(name = "温度报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Excel(name = "温度报警", width = 15, dicCode = "data_status")
 	@Dict(dicCode = "data_status")
     @ApiModelProperty(value = "温度报警（0正常1报警）")
     private java.lang.Integer temperatureAlarm;
@@ -79,7 +79,7 @@ public class ItdmWenxiang implements Serializable {
     @ApiModelProperty(value = "湿度下限")
     private java.math.BigDecimal humidityMin;
 	/**湿度报警（0正常1报警）*/
-	@Excel(name = "湿度报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Excel(name = "湿度报警", width = 15, dicCode = "data_status")
 	@Dict(dicCode = "data_status")
     @ApiModelProperty(value = "湿度报警（0正常1报警）")
     private java.lang.Integer humidityAlarm;
@@ -96,7 +96,7 @@ public class ItdmWenxiang implements Serializable {
     @ApiModelProperty(value = "A相电流下限")
     private java.math.BigDecimal currentAMin;
 	/**A相电流报警（0正常1报警）*/
-	@Excel(name = "A相电流报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Excel(name = "A相电流报警", width = 15, dicCode = "data_status")
 	@Dict(dicCode = "data_status")
     @ApiModelProperty(value = "A相电流报警（0正常1报警）")
     private java.lang.Integer currentAAlarm;
@@ -113,7 +113,7 @@ public class ItdmWenxiang implements Serializable {
     @ApiModelProperty(value = "B相电流下限")
     private java.math.BigDecimal currentBMin;
 	/**B相电流报警（0正常1报警）*/
-	@Excel(name = "B相电流报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Excel(name = "B相电流报警", width = 15, dicCode = "data_status")
 	@Dict(dicCode = "data_status")
     @ApiModelProperty(value = "B相电流报警（0正常1报警）")
     private java.lang.Integer currentBAlarm;
@@ -130,7 +130,7 @@ public class ItdmWenxiang implements Serializable {
     @ApiModelProperty(value = "C相电流下限")
     private java.math.BigDecimal currentCMin;
 	/**C相电流报警（0正常1报警）*/
-	@Excel(name = "C相电流报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Excel(name = "C相电流报警", width = 15, dicCode = "data_status")
 	@Dict(dicCode = "data_status")
     @ApiModelProperty(value = "C相电流报警（0正常1报警）")
     private java.lang.Integer currentCAlarm;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmWenxiangVoltage.java

@@ -49,7 +49,7 @@ public class ItdmWenxiangVoltage implements Serializable {
     @ApiModelProperty(value = "A线电压下限")
     private java.math.BigDecimal voltageAMin;
 	/**A线电压报警（0正常1报警）*/
-	@Excel(name = "A线电压报警（0正常1报警）", width = 15)
+	@Excel(name = "A线电压报警", width = 15)
     @ApiModelProperty(value = "A线电压报警（0正常1报警）")
     private java.lang.Integer voltageAAlarm;
 	/**B线电压*/
@@ -65,7 +65,7 @@ public class ItdmWenxiangVoltage implements Serializable {
     @ApiModelProperty(value = "B线电压下限")
     private java.math.BigDecimal voltageBMin;
 	/**B线电压报警（0正常1报警）*/
-	@Excel(name = "B线电压报警（0正常1报警）", width = 15)
+	@Excel(name = "B线电压报警", width = 15)
     @ApiModelProperty(value = "B线电压报警（0正常1报警）")
     private java.lang.Integer voltageBAlarm;
 	/**C线电压*/
@@ -81,7 +81,7 @@ public class ItdmWenxiangVoltage implements Serializable {
     @ApiModelProperty(value = "C线电压下限")
     private java.math.BigDecimal voltageCMin;
 	/**C线电压报警（0正常1报警）*/
-	@Excel(name = "C线电压报警（0正常1报警）", width = 15)
+	@Excel(name = "C线电压报警", width = 15)
     @ApiModelProperty(value = "C线电压报警（0正常1报警）")
     private java.lang.Integer voltageCAlarm;
 	/**创建时间*/

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmJCXMSHJHController.java

@@ -7,6 +7,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.itdmGongDan.convert.ItdmJHYQueryConvert;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -105,9 +107,21 @@ public class ItdmJCXMSHJHController {
      */
     @ApiOperation(value="计划员查询列表", notes="通过委托id查询，得到委托单的检测项目、试验计划部分信息")
     @GetMapping(value = "/JHYList")
-    public Result<List<ItdmJHYQueryListVO>> JHYList3(@RequestParam("weituoNo") String weituoNo) {
+    public Result<List<ItdmJHYQueryListVO>> JHYList3(@RequestParam(required = false,name = "weituoNo") String weituoNo) {
         List<ItdmJHYQueryListVO> list = iItdmJCXMSHJHService.getAll3(weituoNo);
-        return Result.OK(list);
+        List<ItdmJHYQueryListVO> totalList = new ArrayList<>();
+        int i =1;
+        for (ItdmJHYQueryListVO vo: list){
+            vo.setIzShiji("计划"); //非实绩
+            totalList.add(vo);
+
+            Date shijiStartDate = vo.getShijiStartDate();
+            Date shijiEndDate = vo.getShijiEndDate();
+            String izShiji ="实绩";  //实绩
+            ItdmJHYQueryListVO shijiVO = ItdmJHYQueryConvert.INSTANCE.convert(vo,shijiStartDate,shijiEndDate,i++,izShiji);
+            totalList.add(shijiVO);
+        }
+        return Result.OK(totalList);
     }
 
     /**
@@ -117,7 +131,11 @@ public class ItdmJCXMSHJHController {
     @ApiOperation(value="计划员新增或修改试验计划", notes="计划员新增或修改试验计划——直接left join")
     @PostMapping(value = "/JHYAddOrUpdate")
     public Result<String> JHYaddAndUpdate(@RequestBody List<ItdmJHYQueryListVO> list) {
-        return Result.OK(iItdmJCXMSHJHService.JHYAddAndUpdate(list));
+        List<ItdmJHYQueryListVO> list1 = new ArrayList<>();
+        for(ItdmJHYQueryListVO vo: list){
+            if(vo.getIzShiji().equals("计划")) list1.add(vo);
+        }
+        return Result.OK(iItdmJCXMSHJHService.JHYAddAndUpdate(list1));
     }
 
     /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/convert/ItdmJHYQueryConvert.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.itdmGongDan.convert;
+
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryShijiListVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface ItdmJHYQueryConvert {
+
+    ItdmJHYQueryConvert INSTANCE = Mappers.getMapper(ItdmJHYQueryConvert.class);
+
+    @Mapping(target ="id",source ="i")
+    @Mapping(target ="jihuaStartDate",source ="shijiStartDate")
+    @Mapping(target ="jihuaEndDate",source ="shijiEndDate")
+    @Mapping(target ="izShiji",source ="izShiji")
+    ItdmJHYQueryListVO convert(ItdmJHYQueryListVO vo, Date shijiStartDate,Date shijiEndDate,Integer i,String izShiji);
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmJCXMSHJHMapper.java

@@ -87,6 +87,22 @@ public interface ItdmJCXMSHJHMapper {
     List<ItdmJHYQueryListVO> getAll3(@Param("weituoId") String weituoId);
 
     /**
+     * 计划员查询列表
+     */
+    @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
+            "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
+            "d.sample_name, e.device_name, " +
+            "i.shenhe_status " +
+            "from itdm_weituo_yangpin_extend a " +
+            "left join itdm_test_plan b on a.id = b.test_items_id " +
+            "left join itdm_weituo_yangpin d on a.yangpin_id = d.id " +
+            "left join itdm_device e on b.shebei_id = e.id " +
+            "left join itdm_weituo_info i on a.weituo_id = i.id " +
+            "where a.weituo_id in (select id from itdm_weituo_info where itdm_weituo_info.complete_status = 0 " +
+            "and itdm_weituo_info.shenhe_status = '1' )")
+    List<ItdmJHYQueryListVO> getAllWithoutWeituoId();
+
+    /**
      * 计划员查询列表(测试)
      */
     @Select("select a.weituo_id, a.yangpin_id, a.test_items, a.id as testItemsId, " +

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -19,6 +19,7 @@ import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
 import org.jeecg.modules.itdmGongDan.vo.ItdmJCXMAndSYJHVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ShijiDate;
 import org.jeecg.modules.weituo.mapper.ItdmWeituoInfoMapper;
 import org.jeecg.modules.weituo.mapper.ItdmWeituoYangpinMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -357,7 +358,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 columnMap.put("task_role","计划员");
                 columnMap.put("weituo_id",vo.getWeituoId());
                 List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
-                if(taskList!=null) {
+                if(!taskList.isEmpty()) {
                     ItdmTask itdmTask1 = taskList.get(0);
                     itdmTask1.setTaskStatus(1);
                     taskMapper.updateById(itdmTask1);
@@ -459,11 +460,26 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
      * 计划员查询列表
      */
     public List<ItdmJHYQueryListVO> getAll3(String weituoNo){
-        String weituoId = itdmWeituoInfoMapper.selectByWeituoNo(weituoNo);
-        List<ItdmJHYQueryListVO> list = itdmJCXMSHJHMapper.getAll3(weituoId);
-        List<ItdmJHYQueryListVO> list1 = list.stream().map(i->
-                ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo)).collect(Collectors.toList());
-        return list1;
+        if(weituoNo!=null){
+            String weituoId = itdmWeituoInfoMapper.selectByWeituoNo(weituoNo);
+            List<ItdmJHYQueryListVO> list = itdmJCXMSHJHMapper.getAll3(weituoId);
+            List<ItdmJHYQueryListVO> list1 = list.stream().map(i -> {
+                String testPlanId = i.getTestPlanId();
+                ShijiDate shijiDate = itdmGongdanMasterMapper.getShijiDateByTestPlanId(testPlanId);
+                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo,shijiDate);
+            }).collect(Collectors.toList());
+            return list1;
+        }else {
+            List<ItdmJHYQueryListVO> list = itdmJCXMSHJHMapper.getAllWithoutWeituoId();
+            List<ItdmJHYQueryListVO> list1 = list.stream().map(i -> {
+                String weituoNo1 = itdmWeituoInfoMapper.selectById(i.getWeituoId()).getWeituoNo();
+                String testPlanId = i.getTestPlanId();
+                ShijiDate shijiDate = itdmGongdanMasterMapper.getShijiDateByTestPlanId(testPlanId);
+                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo1,shijiDate);
+            }).collect(Collectors.toList());
+            return list1;
+        }
+
     }
 
     /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryListVO.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.itdmGongDan.vo;
 
 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;
@@ -14,6 +16,8 @@ import java.util.Date;
 /**
  * 计划员查询返回的列表对象(完整版，包括各种名称)
  * */
+@Data
+@Accessors(chain = true)
 public class ItdmJHYQueryListVO {
 
     /**委托id*/
@@ -102,166 +106,23 @@ public class ItdmJHYQueryListVO {
     @ApiModelProperty(value = "试验计划id")
     private String id;
 
+    /**实绩开始日期*/
+    @Excel(name = "实绩开始日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩开始日期")
+    private java.util.Date shijiStartDate;
+    /**实绩结束日期*/
+    @Excel(name = "实绩结束日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩结束日期")
+    private java.util.Date shijiEndDate;
 
+    /**是否为实绩，1为实绩，0非实绩*/
+    @ApiModelProperty(value = "是否为实绩，1为实绩，0非实绩")
+    private java.lang.String izShiji;
 
-    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 getStatusC() {
-        return statusC;
-    }
-
-    public void setStatusC(String statusC) {
-        this.statusC = statusC;
-    }
-    public String[] getChuanganqiArray() {
-        return chuanganqiArray;
-    }
-
-    public void setChuanganqiArray(String[] chuanganqiArray) {
-        this.chuanganqiArray = chuanganqiArray;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 
     /**测试*/
     public static ItdmJHYQueryListVO toItdmJHYQueryListVO(ItdmJCXMAndSYJHVO itdmVO, String weituoNo, String sampleName, String deviceName){
@@ -290,8 +151,9 @@ public class ItdmJHYQueryListVO {
     }
 
     /**填入委托编号，计算持续时间，状态转化——计划员查询列表对象*/
-    public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo){
+    public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo, ShijiDate shijiDate){
         vo.setId(vo.getTestItemsId());//用来放检测项目id
+        vo.setWeituoNo(weituoNo);
         if(vo.getJihuaEndDate()!=null && vo.getTestItemsId()!=null){
             int days = (int) ((vo.getJihuaEndDate().getTime() - vo.getJihuaStartDate().getTime()) / (1000*3600*24));
             vo.setLastTime(days+1);
@@ -304,13 +166,16 @@ public class ItdmJHYQueryListVO {
             if(vo.getStatus()==0) vo.setStatusC("未确认");
             else if(vo.getStatus()==1) vo.setStatusC("已确认");
             else if(vo.getStatus()==2) vo.setStatusC("完成");
-            vo.setWeituoNo(weituoNo);
         }
 
         if(vo.getChuanganqi()!=null && !vo.getChuanganqi().equals("")){
             String[] arr = vo.getChuanganqi().split(",");
             vo.setChuanganqiArray(arr);
         }
+        if(shijiDate!=null){
+            vo.setShijiStartDate(shijiDate.getShijiStartDate());
+            vo.setShijiEndDate(shijiDate.getShijiEndDate());
+        }
         return vo;
     }
 
@@ -367,7 +232,4 @@ public class ItdmJHYQueryListVO {
 
         return m;
     }
-
-
-
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryShijiListVO.java

@@ -0,0 +1,118 @@
+package org.jeecg.modules.itdmGongDan.vo;
+
+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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@Accessors(chain = true)
+public class ItdmJHYQueryShijiListVO {
+
+    /**委托id*/
+    @Excel(name = "委托id", width = 15)
+    @ApiModelProperty(value = "委托id")
+    private String weituoId;
+    /**样品id*/
+    @Excel(name = "样品id", width = 15)
+    @ApiModelProperty(value = "样品id")
+    private String yangpinId;
+    /**检测项目id*/
+    @Excel(name = "检测项目id", width = 15)
+    @ApiModelProperty(value = "检测项目id")
+    private java.lang.String testItemsId;
+    /**检测项目*/
+    @Excel(name = "检测项目", width = 15)
+    @ApiModelProperty(value = "检测项目")
+    private String testItems;
+    /**试验计划id*/
+    @Excel(name = "试验计划id", width = 15)
+    @ApiModelProperty(value = "试验计划id")
+    private String testPlanId;
+    /**设备id*/
+    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String shebeiId;
+    /**项目经理*/
+    @Excel(name = "项目经理", width = 15)
+    @ApiModelProperty(value = "项目经理")
+    private java.lang.String pm;
+    /**计划开始日期*/
+    @Excel(name = "计划开始日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划开始日期")
+    private java.util.Date jihuaStartDate;
+    /**计划结束日期*/
+    @Excel(name = "计划结束日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划结束日期")
+    private java.util.Date jihuaEndDate;
+    /**状态*/
+    @Excel(name = "状态", width = 15, dicCode = "test_plan_status")
+    @Dict(dicCode = "test_plan_status")
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer status;
+    /**报告编号*/
+    @Excel(name = "报告编号", width = 15)
+    @ApiModelProperty(value = "报告编号")
+    private java.lang.String reportNo;
+    /**传感器id*/
+    @Excel(name = "传感器id", width = 20)
+    @ApiModelProperty(value = "传感器id")
+    private java.lang.String chuanganqi;
+    /**委托编号*/
+    @Excel(name = "委托编号", width = 15)
+    @ApiModelProperty(value = "委托编号")
+    private String weituoNo;
+    /**样品名称*/
+    @Excel(name = "样品名称", width = 15)
+    @ApiModelProperty(value = "样品名称")
+    private java.lang.String sampleName;
+    /**设备名称*/
+    @Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String deviceName;
+    /**父id*/
+    @Excel(name = "父id", width = 20)
+    @ApiModelProperty(value = "父id")
+    private java.lang.String parent;
+    /**持续时间*/
+    @Excel(name = "持续时间", width = 20)
+    @ApiModelProperty(value = "持续时间")
+    private java.lang.Integer lastTime;
+    /**status转化*/
+    @Excel(name = "status转化", width = 15)
+    @ApiModelProperty(value = "status转化")
+    private java.lang.String statusC;
+    /**传感器数组*/
+    @Excel(name = "传感器数组", width = 15)
+    @ApiModelProperty(value = "传感器数组")
+    private java.lang.String[] chuanganqiArray;
+    /**前端用的到，用来放试验计划id*/
+    @Excel(name = "试验计划id", width = 15)
+    @ApiModelProperty(value = "试验计划id")
+    private String id;
+
+    /**实绩开始日期*/
+    @Excel(name = "实绩开始日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩开始日期")
+    private java.util.Date shijiStartDate;
+    /**实绩结束日期*/
+    @Excel(name = "实绩结束日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩结束日期")
+    private java.util.Date shijiEndDate;
+
+    /**是否为实绩，1为实绩，0非实绩*/
+    @ApiModelProperty(value = "是否为实绩，1为实绩，0非实绩")
+    private java.lang.Integer izShiji;
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ShijiDate.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.itdmGongDan.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@Accessors(chain = true)
+public class ShijiDate {
+
+    /**实绩开始日期*/
+    @Excel(name = "实绩开始日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩开始日期")
+    private java.util.Date shijiStartDate;
+    /**实绩结束日期*/
+    @Excel(name = "实绩结束日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩结束日期")
+    private java.util.Date shijiEndDate;
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/controller/ItdmWeituoInfoController.java

@@ -34,7 +34,7 @@ import java.util.*;
  * @Date:   2023-05-17
  * @Version: V1.0
  */
-@Api(tags=".............委托信息")
+@Api(tags="委托信息")
 @RestController
 @RequestMapping("/weituo/itdmWeituoInfo")
 @Slf4j
@@ -45,7 +45,18 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 	private IItdmTaskService taskService;
 
 
-	@ApiOperation(value=".................分页查询已审核通过的列表", notes="分页查询已审核通过的列表")
+	/**
+	 *  判断委托完成
+	 */
+	@AutoLog(value = "判断委托完成")
+	@ApiOperation(value="判断委托完成", notes="判断委托完成")
+	@RequestMapping(value = "/edit1", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit1(@RequestBody ItdmWeituoInfo itdmWeituoInfo) {
+		itdmWeituoInfoService.updateById(itdmWeituoInfo);
+		return Result.OK("编辑成功!");
+	}
+
+	@ApiOperation(value="分页查询已审核通过的列表", notes="分页查询已审核通过的列表")
 	@GetMapping(value = "/SHTGlist")
 	public Result<IPage<ItdmWeituoInfo>> querySHTGPageList(ItdmWeituoInfo itdmWeituoInfo,
 													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -58,7 +69,6 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 		return Result.OK(pageList);
 	}
 
-
 	/**根据委托单位查询委托信息列表*/
 	@ApiOperation(value="根据委托单位查询委托信息列表", notes="根据委托单位查询委托信息列表")
 	@GetMapping(value = "/weituoNoList")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/entity/ItdmWeituoInfo.java

@@ -108,4 +108,10 @@ public class ItdmWeituoInfo implements Serializable {
 	@Excel(name = "试验条件文件地址", width = 15)
     @ApiModelProperty(value = "试验条件文件地址")
     private String tiaojianFile;
+    /**委托是否完结（0未完结，1已完结）*/
+    @Dict(dicCode = "complete_status")
+    @Excel(name = "委托是否完结", width = 15)
+    @ApiModelProperty(value = "委托是否完结")
+    private String completeStatus;
+
 }