diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 85548f9..e21ca7a 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -1537,6 +1537,8 @@ public class AppHiddenController extends BaseController { List rImgs = imgFilesService.listAll(pd2);// 整改图片 pd2.put("TYPE", 22); List pImgs = imgFilesService.listAll(pd2);// 计划图片 + pd2.put("TYPE", 50); + List yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片 /* * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 d770367816c34f53bf22177da3965f6c */ // 查询整改方案 @@ -1583,6 +1585,7 @@ public class AppHiddenController extends BaseController { map.put("hImgs", hImgs); map.put("rImgs", rImgs); map.put("pImgs", pImgs); + map.put("yImgs", yImgs); map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"), "102"));// 隐患视频 // map.put("cImgs", cImgs); map.put("sImgs", sImgs); diff --git a/src/main/java/com/zcloud/controller/hidden/HiddenController.java b/src/main/java/com/zcloud/controller/hidden/HiddenController.java index 1fdbedf..dade7f9 100644 --- a/src/main/java/com/zcloud/controller/hidden/HiddenController.java +++ b/src/main/java/com/zcloud/controller/hidden/HiddenController.java @@ -925,7 +925,7 @@ public class HiddenController extends BaseController { pd2.put("TYPE", 4); List rImgs = imgFilesService.listAll(pd2);// 整改图片 pd2.put("TYPE", 50); - List yImgs = imgFilesService.listAll(pd2);// 整改图片 + List yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片 /* * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 */ // 查询整改方案 diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml index 5e04288..11d654e 100644 --- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml @@ -4179,7 +4179,7 @@ and f.STATE = #{pd.STATE} - and f.STATE != '100' + and f.STATE != '100' and f.STATE != '101' and f.STATE in ('1','-1')