获取设备点检详细信息

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/controller/CmmsSpotcheckController.java

@@ -1,42 +1,27 @@
 package org.jeecg.modules.cmmsSpotcheck.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
-import org.jeecg.modules.cmmsSpotcheck.service.ICmmsSpotcheckService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.cmmsSpotcheck.entity.CmmsSpotcheck;
+import org.jeecg.modules.cmmsSpotcheck.service.ICmmsSpotcheckService;
+import org.jeecg.modules.cmmsSpotcheck.vo.CmmsSpotcheckQueryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: 设备点检
  * @Author: jeecg-boot
  * @Date:   2024-01-18
@@ -49,7 +34,27 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmmsSpotcheckService> {
 	@Autowired
 	private ICmmsSpotcheckService cmmsSpotcheckService;
-	
+
+	 /**
+	  * 获取设备点检详细信息（修改设备点检时）
+	  * @param spotcheckid 设备点检ID
+	  */
+	 @ApiOperation("获取设备点检详细信息——修改设备点检时")
+	 @GetMapping(value = "getInfoBySpotcheckid/{spotcheckid}")
+	 public Result<CmmsSpotcheckQueryVO> getInfoBySpotcheckid(@PathVariable("spotcheckid") String spotcheckid) {
+		 return Result.OK(cmmsSpotcheckService.selectCmmsSpotcheckBySpotcheckid(spotcheckid));
+	 }
+
+	 /**
+	  * 依据设备ID获取点击内容(新增设备点检时)
+	  * @param equipmentid 设备ID
+	  */
+	 @ApiOperation("依据设备ID获取点击内容——新增设备点检时")
+	 @GetMapping(value = "/getInfoByEquipmentid/{equipmentid}")
+	 public Result<CmmsSpotcheckQueryVO> getInfoByEquipmentid(@PathVariable("equipmentid") String equipmentid) {
+		 return Result.OK(cmmsSpotcheckService.selectInfoByEquipmentid(equipmentid));
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +76,7 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 		IPage<CmmsSpotcheck> pageList = cmmsSpotcheckService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +91,7 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 		cmmsSpotcheckService.save(cmmsSpotcheck);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +106,7 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 		cmmsSpotcheckService.updateById(cmmsSpotcheck);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +121,7 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 		cmmsSpotcheckService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +136,7 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 		this.cmmsSpotcheckService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/mapper/CmmsSpotcheckMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsSpotcheck.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsSpotcheckMapper extends BaseMapper<CmmsSpotcheck> {
 
+    @Select("select * from ems_cmms_spotcheck a " +
+            "where a.id = #{spotcheckid}")
+    public CmmsSpotcheck selectCmmsSpotcheckBySpotcheckid(String spotcheckid);
+
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/service/ICmmsSpotcheckService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsSpotcheck.service;
 
 import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsSpotcheck.vo.CmmsSpotcheckQueryVO;
 
 /**
  * @Description: 设备点检
@@ -11,4 +12,18 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsSpotcheckService extends IService<CmmsSpotcheck> {
 
+    /**
+     * 获取设备点检详细信息（修改设备点检时）
+     * @param spotcheckid 设备点检ID
+     */
+    public CmmsSpotcheckQueryVO selectCmmsSpotcheckBySpotcheckid(String spotcheckid);
+
+    /**
+     * 依据设备ID获取点击内容(新增设备点检时)
+     *
+     * @param equipmentid 设备ID
+     * @return 点检内容
+     */
+    public CmmsSpotcheckQueryVO selectInfoByEquipmentid(String equipmentid);
+
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/service/impl/CmmsSpotcheckServiceImpl.java

@@ -3,10 +3,27 @@ package org.jeecg.modules.cmmsSpotcheck.service.impl;
 import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
 import org.jeecg.modules.cmmsSpotcheck.mapper.CmmsSpotcheckMapper;
 import org.jeecg.modules.cmmsSpotcheck.service.ICmmsSpotcheckService;
+import org.jeecg.modules.cmmsSpotcheck.vo.CmmsSpotcheckQueryVO;
+import org.jeecg.modules.cmmsSpotcheckContent.convert.CmmsSpotcheckContentConvert;
+import org.jeecg.modules.cmmsSpotcheckContent.entity.CmmsSpotcheckContent;
+import org.jeecg.modules.cmmsSpotcheckContent.mapper.CmmsSpotcheckContentMapper;
+import org.jeecg.modules.cmmsSpotcheckContent.vo.CmmsSpotcheckContentQueryVO;
+import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
+import org.jeecg.modules.cmmsSpotcheckContentItem.mapper.CmmsSpotcheckContentItemMapper;
+import org.jeecg.modules.cmmsSpotcheckItem.entity.CmmsSpotcheckItem;
+import org.jeecg.modules.cmmsSpotcheckItem.mapper.CmmsSpotcheckItemMapper;
+import org.jeecg.modules.cmmsSpotcheckTitem.convert.CmmsSpotcheckTitemConvert;
+import org.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
+import org.jeecg.modules.cmmsSpotcheckTitem.mapper.CmmsSpotcheckTitemMapper;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.*;
+
 /**
  * @Description: 设备点检
  * @Author: jeecg-boot
@@ -16,4 +33,93 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, CmmsSpotcheck> implements ICmmsSpotcheckService {
 
+    @Autowired
+    private CmmsSpotcheckContentMapper contentMapper;
+    @Autowired
+    private CmmsSpotcheckContentItemMapper contentItemMapper;
+    @Autowired
+    private ISysUploadFileService fileService;
+    @Autowired
+    private CmmsSpotcheckItemMapper itemMapper;
+    @Autowired
+    private CmmsSpotcheckMapper cmmsSpotcheckMapper;
+    @Autowired
+    private CmmsSpotcheckTitemMapper titemMapper;
+
+    /**
+     * 获取设备点检详细信息（修改设备点检时）
+     * @param spotcheckid 设备点检ID
+     */
+    public CmmsSpotcheckQueryVO selectCmmsSpotcheckBySpotcheckid(String spotcheckid)
+    {
+        /** 设备点检-点检项信息 */
+        List<CmmsSpotcheckTitem> titemList = new ArrayList<>();
+        /** 图片 */
+        List<SysUploadFile> files = new ArrayList<>();
+
+        CmmsSpotcheck cmmsSpotcheck = cmmsSpotcheckMapper.selectCmmsSpotcheckBySpotcheckid(spotcheckid);
+
+        if (cmmsSpotcheck != null) {
+            Map<String, Object> titemMap = new HashMap<>();
+            titemMap.put("spotcheckid",spotcheckid);
+            titemList = titemMapper.selectByMap(titemMap);
+
+            /** 该点检内容id对应的图片集合 */
+            SysUploadFile sysUploadFile = new SysUploadFile();
+            sysUploadFile.setRelid(spotcheckid);
+            files = fileService.selectFileList(sysUploadFile);
+        }
+
+        CmmsSpotcheckQueryVO vo = CmmsSpotcheckContentConvert.INSTANCE.convertSpotcheckQueryVO(cmmsSpotcheck,titemList, files);
+        return vo;
+    }
+
+
+    /**
+     * 依据设备ID获取点击内容
+     *
+     * @param equipmentid 设备ID
+     * @return 点检内容
+     */
+    public CmmsSpotcheckQueryVO selectInfoByEquipmentid(String equipmentid){
+        /** 设备点检-点检项信息 */
+        List<CmmsSpotcheckTitem> titemList = new ArrayList<>();
+        /** 图片 */
+        List<SysUploadFile> files = new ArrayList<>();
+
+        /**查当前选择的设备类型对应唯一可使用的点检内容*/
+        CmmsSpotcheckContent content = contentMapper.selectInfoByEquipmentid(equipmentid);
+
+        if (content != null) {
+            /** 该点检内容id对应的 点检内容-点检项 集合 */
+            Map<String, Object> contentItemMap = new HashMap<>();
+            contentItemMap.put("spotcheckcontid",content.getId());
+            List<CmmsSpotcheckContentItem> contentItemList = contentItemMapper.selectByMap(contentItemMap);
+
+            /**组设备点检-点检项集合*/
+            if(contentItemList!=null && contentItemList.size()>0){
+                for(CmmsSpotcheckContentItem contentItem: contentItemList){
+                    Map<String, Object> itemMap = new HashMap<>();
+                    itemMap.put("id",contentItem.getSpotcheckitemid());
+                    List<CmmsSpotcheckItem> itemList = itemMapper.selectByMap(itemMap);
+                    CmmsSpotcheckItem item = new CmmsSpotcheckItem();
+                    if(itemList!=null && itemList.size()>0) item = itemList.get(0);
+                    CmmsSpotcheckTitem titem = CmmsSpotcheckTitemConvert.INSTANCE.convert(item,contentItem,content);
+                    titemList.add(titem);
+                }
+            }
+
+            /** 该点检内容id对应的图片集合 */
+            SysUploadFile sysUploadFile = new SysUploadFile();
+            sysUploadFile.setRelid(content.getId());
+            files = fileService.selectFileList(sysUploadFile);
+
+        }
+
+        Date date = new Date();
+        CmmsSpotcheckQueryVO vo = CmmsSpotcheckContentConvert.INSTANCE.convertSpotcheckQueryVO(content,titemList, files, date);
+        return vo;
+
+    }
+
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/vo/CmmsSpotcheckQueryVO.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.cmmsSpotcheck.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.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
+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;
+
+
+/**
+ * 设备点检VO
+ * */
+@Data
+public class CmmsSpotcheckQueryVO  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 = "所属点检内容编号")
+    private java.lang.String contentcode;
+    /**所属点检内容名称*/
+    @Excel(name = "所属点检内容名称", width = 15)
+    @ApiModelProperty(value = "所属点检内容名称")
+    private java.lang.String contentname;
+    /**设备ID*/
+    @Excel(name = "设备ID", width = 15, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @ApiModelProperty(value = "设备ID")
+    private java.lang.String equipmentid;
+    /**所属点检内容ID*/
+    @Excel(name = "所属点检内容ID", width = 15, dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @Dict(dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @ApiModelProperty(value = "所属点检内容ID")
+    private java.lang.String spotcheckcontid;
+    /**点检时间*/
+    @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 spotcheckdate;
+    /**点检结果*/
+    @Excel(name = "点检结果", width = 15, dicCode = "spotcheck_result")
+    @Dict(dicCode = "spotcheck_result")
+    @ApiModelProperty(value = "点检结果")
+    private java.lang.String result;
+    /**点检描述*/
+    @Excel(name = "点检描述", width = 15)
+    @ApiModelProperty(value = "点检描述")
+    private java.lang.String description;
+
+    /** 设备点检-点检项信息 */
+    private List<CmmsSpotcheckTitem> cmmsSpotcheckTitemList;
+
+    /** 图片 */
+    private List<SysUploadFile> files;
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/convert/CmmsSpotcheckContentConvert.java

@@ -1,15 +1,21 @@
 package org.jeecg.modules.cmmsSpotcheckContent.convert;
 
 
+import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
+import org.jeecg.modules.cmmsSpotcheck.vo.CmmsSpotcheckQueryVO;
 import org.jeecg.modules.cmmsSpotcheckContent.dto.CmmsSpotcheckContentAddDTO;
 import org.jeecg.modules.cmmsSpotcheckContent.entity.CmmsSpotcheckContent;
 import org.jeecg.modules.cmmsSpotcheckContent.vo.CmmsSpotcheckContentQueryVO;
 import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
+import org.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 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.List;
 import java.util.stream.Collectors;
 
@@ -22,4 +28,14 @@ public interface CmmsSpotcheckContentConvert {
 
     CmmsSpotcheckContentQueryVO convertVo(CmmsSpotcheckContent cmmsSpotcheckContent, List<CmmsSpotcheckContentItem> spotcheckContentItemList);
 
+    @Mapping(target = "cmmsSpotcheckTitemList",source = "titemList")
+    @Mapping(target = "files",source = "files")
+    @Mapping(target = "spotcheckcontid",source = "content.id")
+    @Mapping(target = "spotcheckdate",source = "date")
+    CmmsSpotcheckQueryVO convertSpotcheckQueryVO(CmmsSpotcheckContent content, List<CmmsSpotcheckTitem> titemList, List<SysUploadFile> files, Date date);
+
+
+    @Mapping(target = "cmmsSpotcheckTitemList",source = "titemList")
+    @Mapping(target = "files",source = "files")
+    CmmsSpotcheckQueryVO convertSpotcheckQueryVO(CmmsSpotcheck cmmsSpotcheck, List<CmmsSpotcheckTitem> titemList, List<SysUploadFile> files);
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/mapper/CmmsSpotcheckContentMapper.java

@@ -15,6 +15,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsSpotcheckContentMapper extends BaseMapper<CmmsSpotcheckContent> {
 
+
+    /**
+     * 查当前选择的设备对应唯一正在使用的点检内容
+     *
+     * @param equipmentid 设备ID
+     * @return 点检内容
+     */
+    @Select("select * from ems_cmms_spotcheck_content a " +
+            "        left join ems_tpm_equipment as e on a.equipmentid = e.id " +
+            "        where a.equipmentid = #{equipmentid} and status=0 " +
+            "        order by a.id desc " +
+            "        limit 1")
+    public CmmsSpotcheckContent selectInfoByEquipmentid(String equipmentid);
+
     /**
      * 根据设备id修改该设备所有点检内容状态
      * 启用：0、禁用:1

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckTitem/convert/CmmsSpotcheckTitemConvert.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.cmmsSpotcheckTitem.convert;
+
+import org.jeecg.modules.cmmsSpotcheckContent.entity.CmmsSpotcheckContent;
+import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
+import org.jeecg.modules.cmmsSpotcheckItem.entity.CmmsSpotcheckItem;
+import org.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
+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.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsSpotcheckTitemConvert {
+
+    CmmsSpotcheckTitemConvert INSTANCE = Mappers.getMapper(CmmsSpotcheckTitemConvert.class);
+
+    @Mapping(target="id", ignore = true)
+    @Mapping(target="spotcheckid", ignore = true)
+    @Mapping(target="contitemtid", source = "contentItem.id")
+    @Mapping(target="spotcheckcontid", source = "contentItem.spotcheckcontid")
+    @Mapping(target="spotcheckitemid", source = "contentItem.spotcheckitemid")
+    @Mapping(target="itemcode", source = "item.itemcode")
+    @Mapping(target="itemname", source = "item.itemname")
+    @Mapping(target="equipmenttreeid", source = "item.equipmenttreeid")
+    @Mapping(target="conditions", source = "item.conditions")
+    @Mapping(target="tag", source = "item.tag")
+    @Mapping(target="itemtype", source = "item.itemtype")
+    @Mapping(target="createBy", ignore = true)
+    @Mapping(target="createTime", ignore = true)
+    @Mapping(target="updateBy", ignore = true)
+    @Mapping(target="updateTime", ignore = true)
+    @Mapping(target="sysOrgCode", ignore = true)
+    CmmsSpotcheckTitem convert(CmmsSpotcheckItem item, CmmsSpotcheckContentItem contentItem, CmmsSpotcheckContent content);
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckTitem/vo/CmmsSpotcheckTitemQueryVO.java

@@ -0,0 +1,103 @@
+package org.jeecg.modules.cmmsSpotcheckTitem.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 CmmsSpotcheckTitemQueryVO 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, dictTable = "ems_cmms_spotcheck", dicText = "contentname", dicCode = "id")
+    @Dict(dictTable = "ems_cmms_spotcheck", dicText = "contentname", dicCode = "id")
+    @ApiModelProperty(value = "设备点检ID")
+    private java.lang.String spotcheckid;
+    /**所属点检内容-点检项ID*/
+    @Excel(name = "所属点检内容-点检项ID", width = 15)
+    @ApiModelProperty(value = "所属点检内容-点检项ID")
+    private java.lang.String contitemtid;
+    /**所属点检内容ID*/
+    @Excel(name = "所属点检内容ID", width = 15)
+    @ApiModelProperty(value = "所属点检内容ID")
+    private java.lang.String spotcheckcontid;
+    /**所属点检项ID*/
+    @Excel(name = "所属点检项ID", width = 15)
+    @ApiModelProperty(value = "所属点检项ID")
+    private java.lang.String spotcheckitemid;
+    /**点检项编号*/
+    @Excel(name = "点检项编号", width = 15)
+    @ApiModelProperty(value = "点检项编号")
+    private java.lang.String itemcode;
+    /**名称*/
+    @Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String itemname;
+    /**设备类型id*/
+    @Excel(name = "设备类型id", width = 15, dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "设备类型id")
+    private java.lang.String equipmenttreeid;
+    /**点检项分类*/
+    @Excel(name = "点检项分类", width = 15, dicCode = "spotcheck_item_type")
+    @Dict(dicCode = "spotcheck_item_type")
+    @ApiModelProperty(value = "点检项分类")
+    private java.lang.String itemtype;
+    /**标准*/
+    @Excel(name = "标准", width = 15)
+    @ApiModelProperty(value = "标准")
+    private java.lang.String conditions;
+    /**标签(多个用逗号隔开)*/
+    @Excel(name = "标签(多个用逗号隔开)", width = 15)
+    @ApiModelProperty(value = "标签(多个用逗号隔开)")
+    private java.lang.String tag;
+    /**点检结果：0正常，1异常，2不适用*/
+    @Excel(name = "点检结果：0正常，1异常，2不适用", width = 15)
+    @ApiModelProperty(value = "点检结果：0正常，1异常，2不适用")
+    private java.lang.String iresult;
+    /**问题标签*/
+    @Excel(name = "问题标签", width = 15)
+    @ApiModelProperty(value = "问题标签")
+    private java.lang.String itag;
+    /**点检备注*/
+    @Excel(name = "点检备注", width = 15)
+    @ApiModelProperty(value = "点检备注")
+    private java.lang.String iremark;
+    /**反馈状态：0未反馈，1已反馈*/
+    @Excel(name = "反馈状态：0未反馈，1已反馈", width = 15)
+    @ApiModelProperty(value = "反馈状态：0未反馈，1已反馈")
+    private java.lang.String istatus;
+    /**反馈时间*/
+    @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 itime;
+    /**参考值*/
+    @Excel(name = "参考值", width = 15)
+    @ApiModelProperty(value = "参考值")
+    private java.lang.String refervalue;
+    /**是否有附件：有/无*/
+    @Excel(name = "是否有附件：有/无", width = 15)
+    @ApiModelProperty(value = "是否有附件：有/无")
+    private java.lang.String ifile;
+    /**处理人*/
+    @Excel(name = "处理人", width = 15)
+    @ApiModelProperty(value = "处理人")
+    private java.lang.String handleuser;
+    /**异常状态：0待处理、1已确认、2已报修*/
+    @Excel(name = "异常状态：0待处理、1已确认、2已报修", width = 15)
+    @ApiModelProperty(value = "异常状态：0待处理、1已确认、2已报修")
+    private java.lang.String unusualstatus;
+}