wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

修复bug

pull/5/head
zhangqihang 2024-02-28 13:45:01 +08:00
parent f90c019094
commit 2c3cc96696
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -1537,6 +1537,8 @@ public class AppHiddenController extends BaseController {
List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片 List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
pd2.put("TYPE", 22); pd2.put("TYPE", 22);
List<PageData> pImgs = imgFilesService.listAll(pd2);// 计划图片 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 * 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("hImgs", hImgs);
map.put("rImgs", rImgs); map.put("rImgs", rImgs);
map.put("pImgs", pImgs); map.put("pImgs", pImgs);
map.put("yImgs", yImgs);
map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"), "102"));// 隐患视频 map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"), "102"));// 隐患视频
// map.put("cImgs", cImgs); // map.put("cImgs", cImgs);
map.put("sImgs", sImgs); map.put("sImgs", sImgs);

2
src/main/java/com/zcloud/controller/hidden/HiddenController.java
View File

@ -925,7 +925,7 @@ public class HiddenController extends BaseController {
pd2.put("TYPE", 4); pd2.put("TYPE", 4);
List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片 List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
pd2.put("TYPE", 50); 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);//验收图片 * pd2.put("TYPE",5); List<PageData> cImgs = imgFilesService.listAll(pd2);//验收图片
*/ // 查询整改方案 */ // 查询整改方案

2
src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
View File

@ -4179,7 +4179,7 @@
and f.STATE = #{pd.STATE} and f.STATE = #{pd.STATE}
</if> </if>
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 100" > <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>
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 99" > <!-- BI页面未整改点进来之后 状态搜索框不搜索数据 数据显示未整改和已过期状态--> <if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 99" > <!-- BI页面未整改点进来之后 状态搜索框不搜索数据 数据显示未整改和已过期状态-->
and f.STATE in ('1','-1') and f.STATE in ('1','-1')