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

安全修改排序方式

Browse Source
This commit is contained in:
guoshengxiong 2024-06-12 14:19:06 +08:00
parent 4f89f0254d
commit 2d69ba4740
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
View File

@ -93,6 +93,7 @@ public class XzSecurityQualityInspectionRecordController {
@ApiImplicitParam(name = "isOverdueRectification", value = "是否超期未整改1是", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "isOverdueRectification", value = "是否超期未整改1是", paramType = "body", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "type", value = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "type", value = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路", paramType = "body", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "orderBy", value = "1整改时间倒序（默认）2按照每条记录的状态的时间倒序", paramType = "body", required = false, dataType = "Integer"),
}) })
@PostMapping(value = {"/list", "/page"}) @PostMapping(value = {"/list", "/page"})
public Result<XzSecurityRecordVo> queryPageList(@RequestBody Map<String, Object> map) { public Result<XzSecurityRecordVo> queryPageList(@RequestBody Map<String, Object> map) {

7
src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
View File

@ -265,6 +265,8 @@
LEFT join subdivision_project subsection on subsection.id = t.subsection_id LEFT join subdivision_project subsection on subsection.id = t.subsection_id
LEFT join subdivision_project subentry on subentry.id = t.subentry_id LEFT join subdivision_project subentry on subentry.id = t.subentry_id
LEFT join dangerous_engineering_record der on der.id = t.engineering_id LEFT join dangerous_engineering_record der on der.id = t.engineering_id
LEFT JOIN (SELECT quality_id,MAX(rectify_time) as rectify_time FROM xz_security_quality_rectify_record GROUP BY
quality_id) r ON r.quality_id = t.id
WHERE t.project_sn = #{param.projectSn} WHERE t.project_sn = #{param.projectSn}
<if test="param.type != null and param.type != ''"> <if test="param.type != null and param.type != ''">
and t.type = #{param.type} and t.type = #{param.type}
@ -372,7 +374,12 @@
<if test="param.engineeringId != null and param.engineeringId != ''"> <if test="param.engineeringId != null and param.engineeringId != ''">
and t.engineering_id = #{param.engineeringId} and t.engineering_id = #{param.engineeringId}
</if> </if>
<if test="param.orderBy == null or param.orderBy == '1'.toString()">
order by t.inspect_time desc, t.id desc order by t.inspect_time desc, t.id desc
</if>
<if test="param.orderBy == '2'.toString()">
ORDER BY IFNULL(r.rectify_time,t.create_time) desc
</if>
</select> </select>
<select id="selectQualityInspectionRecordPageTotal" <select id="selectQualityInspectionRecordPageTotal"
resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo"> resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">