fix依据设备ID获取点击内容(（新增设备点检时）)

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

@@ -18,6 +18,8 @@ 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.jeecg.modules.tpmEquipment.entity.TpmEquipment;
+import org.jeecg.modules.tpmEquipment.mapper.TpmEquipmentMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,6 +54,9 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
     @Autowired
     @SuppressWarnings("all")
     private CmmsSpotcheckTitemMapper titemMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private TpmEquipmentMapper tpmEquipmentMapper;
 
     /**
      * 获取设备点检详细信息（修改设备点检时）
@@ -97,6 +102,9 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
         /**查当前选择的设备类型对应唯一可使用的点检内容*/
         CmmsSpotcheckContent content = contentMapper.selectInfoByEquipmentid(equipmentid);
 
+        /**设备相关信息*/
+        TpmEquipment equipment = tpmEquipmentMapper.selectById(equipmentid);
+
         if (content != null) {
             /** 该点检内容id对应的 点检内容-点检项 集合 */
             LambdaQueryWrapper<CmmsSpotcheckContentItem> contentItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -119,7 +127,7 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
         }
 
         Date date = new Date();
-        CmmsSpotcheckQueryVO vo = CmmsSpotcheckContentConvert.INSTANCE.convertSpotcheckQueryVO(content,titemList, files, date);
+        CmmsSpotcheckQueryVO vo = CmmsSpotcheckContentConvert.INSTANCE.convertSpotcheckQueryVO1(equipment.getEquipmentname(), equipment.getEquipmentcode() ,content,titemList, files, date);
         return vo;
 
     }

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

@@ -73,4 +73,14 @@ public class CmmsSpotcheckQueryVO  implements Serializable {
     /** 图片 */
     private List<SysUploadFile> files;
 
+
+    /**设备名称*/
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String equipmentname;
+    /**设备编号*/
+    @ApiModelProperty(value = "设备编号")
+    private java.lang.String equipmentcode;
+
+
+
 }

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

@@ -6,7 +6,6 @@ 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.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
 import org.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
@@ -36,7 +35,7 @@ public interface CmmsSpotcheckContentConvert {
     @Mapping(target = "spotcheckcontid",source = "content.id")
     @Mapping(target = "spotcheckdate",source = "date")
     @Mapping(target = "createBy",ignore = true)
-    CmmsSpotcheckQueryVO convertSpotcheckQueryVO(CmmsSpotcheckContent content, List<CmmsSpotcheckTitem> titemList, List<SysUploadFile> files, Date date);
+    CmmsSpotcheckQueryVO convertSpotcheckQueryVO1(String equipmentname, String equipmentcode, CmmsSpotcheckContent content, List<CmmsSpotcheckTitem> titemList, List<SysUploadFile> files, Date date);
 
 
     @Mapping(target = "cmmsSpotcheckTitemList",source = "titemList")