From 2c3cc9669665219a192ee81c15403cd0f9b0281e Mon Sep 17 00:00:00 2001
From: zhangqihang <zhangqihang>
Date: Wed, 28 Feb 2024 13:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/controller/app/AppHiddenController.java    | 3 +++
 .../java/com/zcloud/controller/hidden/HiddenController.java    | 2 +-
 src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
         pd2.put("TYPE", 22);
         List<PageData> pImgs = imgFilesService.listAll(pd2);// 计划图片
+        pd2.put("TYPE", 50);
+        List<PageData> yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片
         /*
          * pd2.put("TYPE",5); List<PageData> 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<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
 		pd2.put("TYPE", 50);
-		List<PageData> yImgs = imgFilesService.listAll(pd2);// 整改图片
+		List<PageData> yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片
 		/*
 		 * pd2.put("TYPE",5); List<PageData> 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}
 		</if>
 		<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 100" >
-			and f.STATE != '100'
+			and f.STATE != '100' and f.STATE != '101'
 		</if>
 		<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 99" > <!-- BI页面未整改点进来之后 状态搜索框不搜索数据 数据显示未整改和已过期状态-->
 			and f.STATE in ('1','-1')