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 09:01:16 +08:00
parent b16405202a
commit 4c65e0c6c3
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,6 +924,8 @@ public class HiddenController extends BaseController {
List<PageData> hImgs = imgFilesService.listAll(pd2);// 隐患图片
pd2.put("TYPE", 4);
List<PageData> rImgs = imgFilesService.listAll(pd2);// 整改图片
pd2.put("TYPE", 50);
List<PageData> yImgs = imgFilesService.listAll(pd2);// 整改图片
/*
* pd2.put("TYPE",5); List<PageData> cImgs = imgFilesService.listAll(pd2);//验收图片
*/ // 查询整改方案
@ -958,6 +960,7 @@ public class HiddenController extends BaseController {
map.put("hs", hs);
map.put("hImgs", hImgs);
map.put("rImgs", rImgs);
map.put("yImgs", yImgs);
// map.put("cImgs", cImgs);
map.put("sImgs", sImgs);
map.put("pImgs", pImgs);

12
src/main/java/com/zcloud/entity/hotWorkApplication/NodeApp.java
View File

@ -121,6 +121,8 @@ public class NodeApp {
buffer.append("\n");
if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
buffer.append(inspector.getString("INSPECTION_USER_NAME"));
buffer.append("\n");
buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
// buffer.append("(");
// buffer.append(")");
}else {
@ -132,11 +134,11 @@ public class NodeApp {
this.title = buffer.toString();
buffer.setLength(0);
for (PageData inspector : inspectors) {
if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
}
}
// for (PageData inspector : inspectors) {
// if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){
// buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME"));
// }
// }
if (buffer.length() > 0) {
this.desc = buffer.toString();

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

@ -433,6 +433,9 @@
<select id="findById" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>,
f.FINAL_CHECK,
f.FINAL_CHECKTIME,
f.FINAL_CHECKDESCR,
f.POSITIONDESC,
cr.NAME CREATORNAME,
re.NAME RECTIFICATIONORNAME,
@ -451,6 +454,7 @@
hregion.HIDDENREGION as hregionName,
od.DEPARTMENT_ID as confirmDept,
fc.NAME FINAL_CHECKOR_NAME,
fcd.NAME FINAL_CHECKOR_NDEPTNAME,
isa.INSPECTION_ASSESS_ID,
siu.NAME as acceptName,
isa.ASSESS_SCORE,
@ -473,6 +477,7 @@
left join sys_user su on su.USER_ID = f.CONFIRM_USER
left join oa_department od on od.DEPARTMENT_ID = su.DEPARTMENT_ID
LEFT JOIN sys_user fc ON fc.USER_ID = f.FINAL_CHECKOR
left join oa_department fcd on fcd.DEPARTMENT_ID = fc.DEPARTMENT_ID
LEFT JOIN sys_user siu ON siu.USER_ID = f.CHECKOR
LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_ASSESS isa ON isa.HIDDEN_ID = f.HIDDEN_ID and isa.ISDELETE = '0'
where
@ -4170,9 +4175,12 @@
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
and f.CREATTIME &lt;= #{pd.ENDTIME}
</if>
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0 and pd.STATE != 99" >
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0 and pd.STATE != 99 and pd.STATE != 100" >
and f.STATE = #{pd.STATE}
</if>
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 100" >
and f.STATE != '100'
</if>
<if test="pd.STATE != null and pd.STATE !='' and pd.STATE == 99" > <!-- BI页面未整改点进来之后 状态搜索框不搜索数据 数据显示未整改和已过期状态-->
and f.STATE in ('1','-1')
</if>
@ -4360,7 +4368,7 @@
</choose>
</otherwise>
</choose>
<if test="pd.STATE != null and pd.STATE != '' and pd.STATE != 99"><!-- 关键词检索 -->
<if test="pd.STATE != null and pd.STATE != '' and pd.STATE != 99 and pd.STATE != 100"><!-- 关键词检索 -->
and
f.STATE = #{pd.STATE}
</if>