admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2023-11-27 18:31:03 +08:00
parent 6e1c8d0256
commit bbb62e8ffc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java
View File

@ -227,5 +227,8 @@ public class HiddenDangerInspectRecord implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "是否是超期未关闭，0否，1是") @ApiModelProperty(value = "是否是超期未关闭，0否，1是")
private Integer overdueType; private Integer overdueType;
@TableField(exist = false)
@ApiModelProperty(value = "检查-隐患检查区域名称（责任区域名称）")
private String hiddenDangerInspectRegionName;
} }

5
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
View File

@ -56,7 +56,9 @@
(case (case
when a.change_limit_time < now() and (status = 2 or status = 3) when a.change_limit_time < now() and (status = 2 or status = 3)
then 1 then 1
else 0 end) overdue_type else 0 end) overdue_type,
ir.id as hiddenDangerInspectRegionId,
ir.region_name as hiddenDangerInspectRegionName
from hidden_danger_inspection_record a from hidden_danger_inspection_record a
LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn
LEFT JOIN system_user d ON a.create_user = d.user_id LEFT JOIN system_user d ON a.create_user = d.user_id
@ -65,6 +67,7 @@
LEFT JOIN inspect_type t ON a.inspect_type_id = t.id LEFT JOIN inspect_type t ON a.inspect_type_id = t.id
LEFT JOIN worker_info wk ON wk.id = d.worker_id LEFT JOIN worker_info wk ON wk.id = d.worker_id
LEFT JOIN enterprise_info en ON en.id = wk.enterprise_id LEFT JOIN enterprise_info en ON en.id = wk.enterprise_id
left join hidden_danger_inspect_region ir on ir.id=a.hidden_danger_inspect_region_id
WHERE a.project_sn = #{param.projectSn} WHERE a.project_sn = #{param.projectSn}
<if test="param.createUser != null and param.createUser != ''"> <if test="param.createUser != null and param.createUser != ''">
and a.create_user = #{param.createUser} and a.create_user = #{param.createUser}