设备日历查询列表

itdmServer/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -196,7 +196,7 @@ jeecg:
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 在线预览文件服务器地址配置
   file-view-domain: http://fileview.jeecg.com
   # minio文件上传
@@ -296,3 +296,12 @@ third-app:
       # appSecret
       client-secret: ??
       agent-id: ??
+
+
+# 工作流
+activiti:
+  check-process-definitions: false
+  #启用作业执行器
+  async-executor-activate: false
+  #启用异步执行器
+  job-executor-activate: false

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

@@ -0,0 +1,60 @@
+package org.jeecg.modules.itdmGongDan.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.itdmGongDan.convert.GongDanDetailConvert;
+import org.jeecg.modules.itdmGongDan.dto.DeviceCalendarQueryDTO;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarDeviceListVO;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarVO;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@Api(tags = "设备日历")
+@RequestMapping("/deviceCalendar")
+@Slf4j
+public class DeviceCalendarController extends JeecgController<ItdmGongdanDetail, IItdmGongdanDetailService> {
+    @Autowired
+    @SuppressWarnings("all")
+    private IItdmGongdanDetailService itdmGongdanDetailService;
+    @Autowired
+    @SuppressWarnings("all")
+    private IItdmGongdanMasterService iItdmGongdanMasterService;
+
+    @ApiOperation(value="设备日历", notes="设备日历")
+    @GetMapping(value = "/list")
+    public List<DeviceCalendarVO> deviceCalendarLis(DeviceCalendarQueryDTO dto) {
+
+        List<Date> list = itdmGongdanDetailService.workDateList(dto);
+        List<DeviceCalendarVO> list1 = list.stream().map(i->{
+            List<DeviceCalendarDeviceListVO> deviceList = itdmGongdanDetailService.planDeviceList(i);
+            List<DeviceCalendarDeviceListVO> deviceWeituoList = deviceList.stream().map(d->{
+                DeviceCalendarQueryDTO dto1 = new DeviceCalendarQueryDTO();
+                dto1.setJihuaDeviceId(d.getJihuaDeviceId());
+                dto1.setWorkDate(i);
+                List<ItdmWeituoInfo> weituoInfoList = itdmGongdanDetailService.weituoList(dto1);
+                return GongDanDetailConvert.INSTANCE.convertWeituo(d,weituoInfoList);
+            }).collect(Collectors.toList());
+            return GongDanDetailConvert.INSTANCE.convertDeviceCalendarVO(i,deviceWeituoList);
+        }).collect(Collectors.toList());
+        return list1;
+    }
+
+
+
+
+
+
+}

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

@@ -1,13 +1,11 @@
 package org.jeecg.modules.itdmGongDan.convert;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
-import org.jeecg.modules.baogao.entity.ItdmBaogao;
-import org.jeecg.modules.baogao.vo.ItdmBaogaoListVO;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarDeviceListVO;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 import org.mapstruct.Mapper;
@@ -16,6 +14,7 @@ import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -44,4 +43,12 @@ public interface GongDanDetailConvert {
     @Mapping(target ="weituoClient",source ="itdmWeituoInfo.weituoClient")
     @Mapping(target ="weituoNo",source ="itdmWeituoInfo.weituoNo")
     ItdmGongdanDetailListVO toList(ItdmGongdanDetail detail, ItdmGongdanMaster master, ItdmTestPlan itdmTestPlan, ItdmWeituoInfo itdmWeituoInfo);
+
+    /**加上设备列表*/
+    DeviceCalendarVO convertDeviceCalendarVO(Date workDate,List<DeviceCalendarDeviceListVO> deviceList);
+
+    /**加上委托信息列表*/
+    @Mapping(target ="weituoInfoList",source ="weituoInfoList")
+    DeviceCalendarDeviceListVO convertWeituo(DeviceCalendarDeviceListVO vo, List<ItdmWeituoInfo> weituoInfoList);
+
 }

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

@@ -0,0 +1,26 @@
+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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@Accessors(chain = true)
+public class DeviceCalendarQueryDTO {
+
+    /**设备id*/
+    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String jihuaDeviceId;
+    /**任务日期按年月*/
+    @Excel(name = "任务日期按年月", width = 15, format = "yyyy-MM")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM")
+    @DateTimeFormat(pattern="yyyy-MM")
+    @ApiModelProperty(value = "任务日期按年月")
+    private java.util.Date workDate;
+
+}

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

@@ -0,0 +1,25 @@
+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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@Accessors(chain = true)
+public class DeviceCalendarQueryWeituoDTO {
+
+    /**设备id*/
+    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String jihuaDeviceId;
+    /**任务日期按年月*/
+    @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 workDate;
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/entity/ItdmGongdanDetail.java

@@ -1,22 +1,19 @@
 package org.jeecg.modules.itdmGongDan.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 工单detail
@@ -105,4 +102,12 @@ public class ItdmGongdanDetail implements Serializable {
     @ApiModelProperty(value = "传感器id")
     @Dict(dictTable = "itdm_chuanganqi", dicText = "xuliehao", dicCode = "id")
     private java.lang.String chuanganqi;
+
+
+
+    /**计划设备id*/
+    @Excel(name = "计划设备id", width = 15)
+    @ApiModelProperty(value = "计划设备id")
+    @Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+    private java.lang.String jihuaDeviceId;
 }

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

@@ -2,10 +2,15 @@ package org.jeecg.modules.itdmGongDan.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.itdmGongDan.dto.DeviceCalendarQueryDTO;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarDeviceListVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,6 +21,17 @@ import java.util.List;
  */
 public interface ItdmGongdanDetailMapper extends BaseMapper<ItdmGongdanDetail> {
 
+    /**查询该月该设备计划工作日期*/
+    List<Date> workDateList(DeviceCalendarQueryDTO dto);
+
+    /**查询该工作日期计划的所有设备（去重）*/
+    List<DeviceCalendarDeviceListVO> planDeviceList(Date workDate);
+
+    /**查询该工作日期，该设备对应的委托列表（去重）*/
+    List<ItdmWeituoInfo> weituoList(DeviceCalendarQueryDTO dto);
+
+
+
     List<ItdmGongdanDetailListVO> getDetailList (Page<ItdmGongdanDetailListVO> page, String woId);
 
     Page<ItdmGongdanDetail> getDetailListByWoIdList(Page<ItdmGongdanDetail> page,@Param("list") List<String> list);

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

@@ -76,4 +76,34 @@ left join itdm_test_plan t on m.jihua_shiyan_id = t.id
     </select>
 
 
+    <!--    查询该月该设备计划工作日期-->
+    <select id="workDateList" parameterType="org.jeecg.modules.itdmGongDan.dto.DeviceCalendarQueryDTO"  resultType="java.util.Date">
+        select distinct work_date from itdm_gongdan_detail
+        <where>
+            <if test="workDate != null "> and YEAR(work_date) = YEAR(#{workDate}) and MONTH(work_date) = MONTH(#{workDate})</if>
+            <if test="jihuaDeviceId != null and jihuaDeviceId != ''"> and jihua_device_id = #{jihuaDeviceId}</if>
+        </where>
+    </select>
+
+    <!--    查询该工作日期计划的所有设备（去重去空）-->
+    <select id="planDeviceList" parameterType="java.util.Date"  resultType="org.jeecg.modules.itdmGongDan.vo.DeviceCalendarDeviceListVO">
+        select distinct igd.jihua_device_id, d.device_name  from itdm_gongdan_detail igd
+        left join itdm_device d on igd.jihua_device_id = d.id
+        where work_date = #{workDate} and jihua_device_id is not null and jihua_device_id != ''
+    </select>
+
+    <!--    查询该工作日期、设备对应的委托列表-->
+    <select id="weituoList" parameterType="org.jeecg.modules.itdmGongDan.dto.DeviceCalendarQueryDTO"  resultType="org.jeecg.modules.itdmGongDan.vo.DeviceDateToWeituoInfoVO">
+        select w.weituo_no, w.weituo_client from itdm_weituo_info w
+where w.id in (
+    select distinct t.weituo_id from itdm_test_plan t where t.id in (
+        select distinct m.jihua_shiyan_id from itdm_gongdan_master m where m.id in (
+            select distinct d.wo_id from itdm_gongdan_detail d
+            where d.jihua_device_id = #{jihuaDeviceId} and d.work_date = #{workDate}
+            )
+        )
+    )
+    </select>
+
+
 </mapper>

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

@@ -2,10 +2,14 @@ package org.jeecg.modules.itdmGongDan.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmGongDan.dto.DeviceCalendarQueryDTO;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarDeviceListVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,6 +20,18 @@ import java.util.List;
  */
 public interface IItdmGongdanDetailService extends IService<ItdmGongdanDetail> {
 
+    /**查询该月该设备计划工作日期*/
+    public List<Date> workDateList(DeviceCalendarQueryDTO dto);
+
+    /**查询该工作日期计划的所有设备（去重）*/
+    public List<DeviceCalendarDeviceListVO> planDeviceList(Date workDate);
+
+    /**查询该工作日期，该设备对应的委托列表（去重）*/
+    public List<ItdmWeituoInfo> weituoList(DeviceCalendarQueryDTO dto);
+
+
+
+
     public Page<ItdmGongdanDetailListVO> getDetailList(Page<ItdmGongdanDetailListVO> page, String woId);
 
     public Page<ItdmGongdanDetail> getDetailListByWoIdList(Page<ItdmGongdanDetail> page,@Param("list") List<String> list);

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

@@ -2,15 +2,19 @@ package org.jeecg.modules.itdmGongDan.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmGongDan.dto.DeviceCalendarQueryDTO;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.vo.DeviceCalendarDeviceListVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +30,24 @@ public class ItdmGongdanDetailServiceImpl extends ServiceImpl<ItdmGongdanDetailM
     @SuppressWarnings("all")
     private ItdmGongdanDetailMapper itdmGongdanDetailMapper;
 
+    /**查询该月该设备计划工作日期*/
+    public List<Date> workDateList(DeviceCalendarQueryDTO dto){
+        return itdmGongdanDetailMapper.workDateList(dto);
+    }
+
+    /**查询该工作日期计划的所有设备（去重）*/
+    public List<DeviceCalendarDeviceListVO> planDeviceList(Date workDate){
+        return itdmGongdanDetailMapper.planDeviceList(workDate);
+    }
+
+    /**查询该工作日期，该设备对应的委托列表（去重）*/
+    public List<ItdmWeituoInfo> weituoList(DeviceCalendarQueryDTO dto){
+        return itdmGongdanDetailMapper.weituoList(dto);
+    }
+
+
+
+
     public Page<ItdmGongdanDetailListVO> getDetailList(Page<ItdmGongdanDetailListVO> page, String woId) {
         return page.setRecords(itdmGongdanDetailMapper.getDetailList(page, woId));
     }

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

@@ -140,6 +140,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     detail.setStartTime("00:00");
                     detail.setEndTime("23:59");
                     detail.setChuanganqi(dto.getChuanganqi());
+                    detail.setJihuaDeviceId(itdmGongdanMaster.getShebeiId());
                     itdmGongdanDetailMapper.insert(detail);//新增对应日期的工单detail
                 }
 
@@ -192,6 +193,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                         detail.setStartTime("00:00");
                         detail.setEndTime("23:59");
                         detail.setChuanganqi(dto.getChuanganqi());
+                        detail.setJihuaDeviceId(itdmGongdanMaster.getShebeiId());
                         itdmGongdanDetailMapper.insert(detail);//新增对应日期的工单detail
                     }
 
@@ -267,6 +269,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     detail.setStartTime("00:00");
                     detail.setEndTime("23:59");
                     detail.setChuanganqi(vo.getChuanganqi());
+                    detail.setJihuaDeviceId(master.getShebeiId());
                     itdmGongdanDetailMapper.insert(detail);
                 }
                 //新增该pm的项目经理拆解工单的task
@@ -363,6 +366,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     detail.setStartTime("00:00");
                     detail.setEndTime("23:59");
                     detail.setChuanganqi(vo.getChuanganqi());
+                    detail.setJihuaDeviceId(master.getShebeiId());
                     itdmGongdanDetailMapper.insert(detail);
                 }
             }else if(vo.getStatus() != 0){

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

@@ -0,0 +1,29 @@
+package org.jeecg.modules.itdmGongDan.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DeviceCalendarDeviceListVO implements Serializable {
+
+    /**计划设备id*/
+    @Excel(name = "计划设备id", width = 15)
+    @ApiModelProperty(value = "计划设备id")
+    private java.lang.String jihuaDeviceId;
+
+    /**计划设备名称*/
+    @Excel(name = "计划设备名称", width = 15)
+    @ApiModelProperty(value = "计划设备名称")
+    private java.lang.String deviceName;
+
+    /**委托列表*/
+    @ApiModelProperty(value = "委托列表")
+    private List<ItdmWeituoInfo> weituoInfoList;
+}

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

@@ -0,0 +1,28 @@
+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;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DeviceCalendarVO implements Serializable {
+
+    /**任务日期*/
+    @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 workDate;
+
+    /**设备列表*/
+    @ApiModelProperty(value = "设备列表")
+    private List<DeviceCalendarDeviceListVO> deviceList;
+}

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

@@ -0,0 +1,22 @@
+package org.jeecg.modules.itdmGongDan.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class DeviceDateToWeituoInfoVO implements Serializable {
+
+    /**委托编号*/
+    @Excel(name = "委托编号", width = 15)
+    @ApiModelProperty(value = "委托编号")
+    private String weituoNo;
+    /**委托单位名称*/
+    @Excel(name = "委托单位名称", width = 15)
+    @ApiModelProperty(value = "委托单位名称")
+    private String weituoClient;
+}

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

@@ -3,15 +3,17 @@ 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;
 
-import java.util.Date;
-
 /**
  * 检测项目和试验计划
  * */
+@Data
+@Accessors(chain = true)
 public class ItdmJCXMAndSYJHVO {
 
     /**委托id*/
@@ -68,99 +70,99 @@ public class ItdmJCXMAndSYJHVO {
     @ApiModelProperty(value = "传感器id")
     private java.lang.String chuanganqi;
 
-    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 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 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 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 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 getTestPlanId() {
+//        return testPlanId;
+//    }
+//
+//    public void setTestPlanId(String testPlanId) {
+//        this.testPlanId = testPlanId;
+//    }
+//
+//    public String getTestItemsId() {
+//        return testItemsId;
+//    }
+//
+//    public void setTestItemsId(String testItemsId) {
+//        this.testItemsId = testItemsId;
+//    }
 }