Merge remote-tracking branch 'origin/master'

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

@@ -35,16 +35,22 @@ import java.util.*;
 public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, CmmsSpotcheck> implements ICmmsSpotcheckService {
 
     @Autowired
+    @SuppressWarnings("all")
     private CmmsSpotcheckContentMapper contentMapper;
     @Autowired
+    @SuppressWarnings("all")
     private CmmsSpotcheckContentItemMapper contentItemMapper;
     @Autowired
+    @SuppressWarnings("all")
     private ISysUploadFileService fileService;
     @Autowired
+    @SuppressWarnings("all")
     private CmmsSpotcheckItemMapper itemMapper;
     @Autowired
+    @SuppressWarnings("all")
     private CmmsSpotcheckMapper cmmsSpotcheckMapper;
     @Autowired
+    @SuppressWarnings("all")
     private CmmsSpotcheckTitemMapper titemMapper;
 
     /**
@@ -110,11 +116,6 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
                 }
             }
 
-            /** 该点检内容id对应的图片集合 */
-            SysUploadFile sysUploadFile = new SysUploadFile();
-            sysUploadFile.setRelid(content.getId());
-            files = fileService.selectFileList(sysUploadFile);
-
         }
 
         Date date = new Date();

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckTitem/entity/CmmsSpotcheckTitem.java

@@ -80,8 +80,9 @@ public class CmmsSpotcheckTitem implements Serializable {
     @ApiModelProperty(value = "标签(多个用逗号隔开)")
     private java.lang.String tag;
 	/**点检结果：0正常，1异常，2不适用*/
-	@Excel(name = "点检结果：0正常，1异常，2不适用", width = 15)
+	@Excel(name = "点检结果：0正常，1异常，2不适用", width = 15, dicCode = "spotcheck_iresult")
     @ApiModelProperty(value = "点检结果：0正常，1异常，2不适用")
+    @Dict(dicCode = "spotcheck_iresult")
     private java.lang.String iresult;
 	/**问题标签*/
 	@Excel(name = "问题标签", width = 15)