fix送检工单反馈

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/controller/CmmsSubmissionController.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.cmmsOrderNode.convert.CmmsOrderNodeConvert;
@@ -25,6 +24,7 @@ import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -257,9 +257,9 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 		List<CmmsOrderNode> list = cmmsOrderNodeService.selectCmmsOrderNodeList(node);
 		List<CmmsOrderNodeSubmissionVO> voList = CmmsOrderNodeConvert.INSTANCE.toVOList(list);
 
-		LambdaQueryWrapper<CmmsSubmissionEquipment> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(CmmsSubmissionEquipment::getCmmsSubmissionId,id);
-		List<CmmsSubmissionEquipment> submissionEquipmentList = submissionEquipmentService.list(wrapper);
+		CmmsSubmissionEquipment cmmsSubmissionEquipment = new CmmsSubmissionEquipment();
+		cmmsSubmissionEquipment.setCmmsSubmissionId(id);
+		List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList = submissionEquipmentService.voListByCmmsSubmissionId(cmmsSubmissionEquipment);
 
 		SysUploadFile file = new SysUploadFile();
 		file.setRelid(id);

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/convert/CmmsSubmissionConvert.java

@@ -7,6 +7,7 @@ import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
@@ -30,7 +31,7 @@ public interface CmmsSubmissionConvert {
     /**详情*/
     CmmsSubmissionXQVO toXQVO(CmmsSubmission cmmsSubmission,
                               List<CmmsOrderNodeSubmissionVO> orderNodeSubmissionVOList,
-                              List<CmmsSubmissionEquipment> submissionEquipmentList,
+                              List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList,
                               List<SysUploadFile> uploadFileList);
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionXQVO.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.cmmsOrderNode.vo.CmmsOrderNodeSubmissionVO;
-import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -68,9 +68,12 @@ public class CmmsSubmissionXQVO implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 
-    List<CmmsSubmissionEquipment> submissionEquipmentList;
+    /**送检工单设备集合*/
+    List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList;
 
+    /**送检工单操作日志集合*/
     List<CmmsOrderNodeSubmissionVO> orderNodeSubmissionVOList;
 
+    /**送检工单上传图片集合*/
     List<SysUploadFile> uploadFileList;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/controller/CmmsSubmissionEquipmentController.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.cmmsSubmissionEquipment.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,10 +10,11 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.dto.CmmsSubmissionEditDTO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
@@ -52,7 +52,20 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 	private ISysUploadFileService sysUploadFileService;
 
 	/**
-	 * 根据送检工单id查送检工单设备列表
+	 * 根据送检工单id查送检工单设备列表——包括设备名称
+	 */
+	//@AutoLog(value = "根据送检工单id查送检工单设备列表——包括设备名称")
+	@ApiOperation(value="根据送检工单id查送检工单设备列表——包括设备名称", notes="根据送检工单id查送检工单设备列表——包括设备名称")
+	@GetMapping(value = "/voListByCmmsSubmissionId")
+	public Result<List<CmmsSubmissionEquipmentXQVO>> voListByCmmsSubmissionId(CmmsSubmissionEquipment cmmsSubmissionEquipment) {
+		List<CmmsSubmissionEquipmentXQVO> list = cmmsSubmissionEquipmentService.voListByCmmsSubmissionId(cmmsSubmissionEquipment);
+		return Result.OK(list);
+	}
+
+
+
+	/**
+	 * 根据送检工单id查送检工单设备列表——仅设备id、名称
 	 */
 	//@AutoLog(value = "送检工单设备表-分页列表查询")
 	@ApiOperation(value="根据送检工单id查设备列表", notes="根据送检工单id查设备列表")
@@ -66,25 +79,25 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 	/**
 	 *  反馈——编辑
 	 *
-	 * @param cmmsSubmissionXQVO
+	 * @param dto
 	 * @return
 	 */
 	@AutoLog(value = "送检工单设备表-反馈——编辑")
 	@ApiOperation(value="送检工单设备表-反馈——编辑", notes="送检工单设备表-反馈——编辑")
 	//@RequiresPermissions("org.jeecg.modules:cmms_submission_equipment:edit")
 	@RequestMapping(value = "/fk", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> fk(@RequestBody CmmsSubmissionXQVO cmmsSubmissionXQVO) {
+	public Result<String> fk(@RequestBody CmmsSubmissionEditDTO dto) {
 
 		/**上传的图片*/
-		sysUploadFileService.deleteFileByRelId(cmmsSubmissionXQVO.getId());
-		List<SysUploadFile> uploadFileList = cmmsSubmissionXQVO.getUploadFileList();
+		sysUploadFileService.deleteFileByRelId(dto.getId());
+		List<SysUploadFile> uploadFileList = dto.getUploadFileList();
 		if(uploadFileList!=null && uploadFileList.size()>0){
-			uploadFileList.stream().map(i->i.setRelid(cmmsSubmissionXQVO.getId())).collect(Collectors.toList());
+			uploadFileList.stream().map(i->i.setRelid(dto.getId())).collect(Collectors.toList());
 			sysUploadFileService.saveBatch(uploadFileList);
 		}
 
 		/**批量修改送检工单设备*/
-		List<CmmsSubmissionEquipment> list = cmmsSubmissionXQVO.getSubmissionEquipmentList();
+		List<CmmsSubmissionEquipment> list = dto.getSubmissionEquipmentList();
 		for (CmmsSubmissionEquipment cmmsSubmissionEquipment:list){
 			TpmEquipment equipment = equipmentService.getById(cmmsSubmissionEquipment.getEquipmentid());
 			if(equipment!=null){

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/convert/CmmsSubmissionEquipmentConvert.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsSubmissionEquipment.convert;
+
+import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsSubmissionEquipmentConvert {
+
+    CmmsSubmissionEquipmentConvert INSTANCE = Mappers.getMapper(CmmsSubmissionEquipmentConvert.class);
+
+    CmmsSubmissionEquipment convert(CmmsSubmissionEquipmentQueryVO vo);
+
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/dto/CmmsSubmissionEditDTO.java

@@ -0,0 +1,78 @@
+package org.jeecg.modules.cmmsSubmissionEquipment.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.cmmsOrderNode.vo.CmmsOrderNodeSubmissionVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CmmsSubmissionEditDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**送检负责人*/
+    @Excel(name = "送检负责人", width = 15)
+    @ApiModelProperty(value = "送检负责人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String verificatePerson;
+    /**检定方式*/
+    @Excel(name = "检定方式", width = 15, dicCode = "verificate_method")
+    @Dict(dicCode = "verificate_method")
+    @ApiModelProperty(value = "检定方式")
+    private java.lang.String verificateMethod;
+    /**检定单位id*/
+    @Excel(name = "检定单位id", width = 15, dictTable = "base_client", dicText = "client_name", dicCode = "id")
+    @Dict(dictTable = "base_client", dicText = "client_name", dicCode = "id")
+    @ApiModelProperty(value = "检定单位id")
+    private java.lang.String verificateClientId;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**送检工单状态（0未开始1送检中1已完成）*/
+    @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
+    @Dict(dicCode = "submission_gdstatus")
+    @ApiModelProperty(value = "送检工单状态（0未开始1送检中1已完成）")
+    private java.lang.String submissionGdstatus;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+    /**送检工单设备集合*/
+    List<CmmsSubmissionEquipment> submissionEquipmentList;
+
+    /**送检工单操作日志集合*/
+    List<CmmsOrderNodeSubmissionVO> orderNodeSubmissionVOList;
+
+    /**送检工单上传图片集合*/
+    List<SysUploadFile> uploadFileList;
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/mapper/CmmsSubmissionEquipmentMapper.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.cmmsSubmissionEquipment.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
+
+import java.util.List;
 
 /**
  * @Description: 送检工单设备表
@@ -16,6 +16,9 @@ import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQuery
  */
 public interface CmmsSubmissionEquipmentMapper extends BaseMapper<CmmsSubmissionEquipment> {
 
+    /**根据送检工单id查送检工单设备列表——包括设备名称*/
+    List<CmmsSubmissionEquipmentXQVO> voListByCmmsSubmissionId(CmmsSubmissionEquipment cmmsSubmissionEquipment);
+
     /**根据送检工单id查询送检工单设备集合*/
     @Select("select s.id,s.equipmentid,e.equipmentname from cmms_submission_equipment s " +
             "left join tpm_equipment e on e.id = s.equipmentid " +

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/mapper/xml/CmmsSubmissionEquipmentMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsSubmissionEquipment.mapper.CmmsSubmissionEquipmentMapper">
 
-</mapper>
+<!--    根据送检工单id查送检工单设备列表——包括设备名称-->
+    <select id="voListByCmmsSubmissionId" resultType="org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO" parameterType="org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment">
+        select s.id, s.cmms_submission_id, s.equipmentid, s.submission_date, s.submission_result, s.submission_effective_date,
+               s.team_confirm, s.remark, s.submission_status, s.submission_return_date, s.create_by, s.create_time, s.update_by,
+               s.update_time, s.sys_org_code ,
+               e.equipmentname from cmms_submission_equipment s
+                   left join tpm_equipment e on e.id = s.equipmentid
+        <where>
+            <if test="cmmsSubmissionId != null  and cmmsSubmissionId != ''" > s.cmms_submission_id = #{cmmsSubmissionId}</if>
+            <if test="equipmentid != null  and equipmentid != ''" >  and s.equipmentid = #{equipmentid}</if>
+            <if test="submissionResult != null  and submissionResult != ''" >  and s.submission_result = #{submissionResult}</if>
+            <if test="submissionStatus != null  and submissionStatus != ''" >  and s.submissionStatus = #{submissionStatus}</if>
+        </where>
+    </select>
+
+</mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/service/ICmmsSubmissionEquipmentService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsSubmissionEquipment.service;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 
 import java.util.List;
 
@@ -14,6 +15,9 @@ import java.util.List;
  */
 public interface ICmmsSubmissionEquipmentService extends IService<CmmsSubmissionEquipment> {
 
+    /**根据送检工单id查送检工单设备列表——包括设备名称*/
+    List<CmmsSubmissionEquipmentXQVO> voListByCmmsSubmissionId(CmmsSubmissionEquipment cmmsSubmissionEquipment);
+
     /**根据送检工单id查询送检工单设备集合*/
     List<CmmsSubmissionEquipmentQueryVO> listByCmmsSubmissionId(String cmmsSubmissionId);
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/service/impl/CmmsSubmissionEquipmentServiceImpl.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.cmmsSubmissionEquipment.service.impl;
 
-import org.apache.ibatis.annotations.Select;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.mapper.CmmsSubmissionEquipmentMapper;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import java.util.List;
 
 /**
@@ -25,6 +24,11 @@ public class CmmsSubmissionEquipmentServiceImpl extends ServiceImpl<CmmsSubmissi
     @SuppressWarnings("all")
     private CmmsSubmissionEquipmentMapper submissionEquipmentMapper;
 
+    /**根据送检工单id查送检工单设备列表——包括设备名称*/
+    public List<CmmsSubmissionEquipmentXQVO> voListByCmmsSubmissionId(CmmsSubmissionEquipment cmmsSubmissionEquipment){
+        return submissionEquipmentMapper.voListByCmmsSubmissionId(cmmsSubmissionEquipment);
+    }
+
     /**根据送检工单id查询送检工单设备集合*/
     public List<CmmsSubmissionEquipmentQueryVO> listByCmmsSubmissionId(String cmmsSubmissionId){
         return submissionEquipmentMapper.listByCmmsSubmissionId(cmmsSubmissionId);

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/vo/CmmsSubmissionEquipmentXQVO.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.cmmsSubmissionEquipment.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+public class CmmsSubmissionEquipmentXQVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**送检工单id*/
+    @Excel(name = "送检工单id", width = 15)
+    @ApiModelProperty(value = "送检工单id")
+    private java.lang.String cmmsSubmissionId;
+    /**设备id*/
+    @Excel(name = "设备id", width = 15)
+    @Dict(dictTable = "tpm_equipment", dicCode = "id", dicText = "equipmentname")
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String equipmentid;
+    /**检定日期*/
+    @Excel(name = "检定日期", width = 20, format = "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 = "检定日期")
+    private java.util.Date submissionDate;
+    /**检定结果 (0限用、1合格、2禁用)*/
+    @Excel(name = "检定结果", width = 15, dicCode = "device_verification_result")
+    @Dict(dicCode = "device_verification_result")
+    @ApiModelProperty(value = "检定结果")
+    private java.lang.String submissionResult;
+    /**有效日期*/
+    @Excel(name = "有效日期", width = 20, format = "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 = "有效日期")
+    private java.util.Date submissionEffectiveDate;
+    /**班组确认*/
+    @Excel(name = "班组确认", width = 15)
+    @ApiModelProperty(value = "班组确认")
+    private java.lang.String teamConfirm;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**送检状态 0送检中、1已返回*/
+    @Excel(name = "送检状态", width = 15, dicCode = "submission_status")
+    @Dict(dicCode = "submission_status")
+    @ApiModelProperty(value = "送检状态")
+    private java.lang.String submissionStatus;
+    /**送回日期*/
+    @Excel(name = "送回日期", width = 20, format = "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 = "送回日期")
+    private java.util.Date submissionReturnDate;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+
+    /**送检工单设备名称*/
+    @Excel(name = "送检工单设备名称", width = 15)
+    @ApiModelProperty(value = "送检工单设备名称")
+    private java.lang.String equipmentname;
+}