Commit ffad92cf authored by 麻笑宇's avatar 麻笑宇

安全追溯单位隐患情况下钻和卡片不一致修改

parent e82f96e2
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
tzs_safety_problem_tracing tzs_safety_problem_tracing
WHERE WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%' ) governing_body_org_code LIKE concat ( #{orgCode}, '%' )
AND problem_level IS NOT NULL
<if test="now != null and now != ''"> <if test="now != null and now != ''">
AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now} AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
</if> </if>
...@@ -372,6 +373,7 @@ ...@@ -372,6 +373,7 @@
from tzs_safety_problem_tracing spt from tzs_safety_problem_tracing spt
<where> <where>
spt.is_delete = false spt.is_delete = false
AND spt.problem_level IS NOT NULL
<if test="problemModel.problemNum != null and problemModel.problemNum != ''"> <if test="problemModel.problemNum != null and problemModel.problemNum != ''">
and spt.problem_num = LIKE CONCAT('%', #{problemModel.problemNum}, '%') and spt.problem_num = LIKE CONCAT('%', #{problemModel.problemNum}, '%')
</if> </if>
......
...@@ -308,8 +308,8 @@ public class AQZSDPStatisticsController { ...@@ -308,8 +308,8 @@ public class AQZSDPStatisticsController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/page/dp") @PostMapping(value = "/page/dp")
@ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题-大屏使用", notes = "分页查询安全追溯问题-大屏使用") @ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题-大屏使用", notes = "分页查询安全追溯问题-大屏使用")
public ResponseModel<Page<SafetyProblemTracingDto>> getProblemRecords(@RequestParam(value = "current") int current, public ResponseModel<Page<SafetyProblemTracingDto>> getProblemRecords(@RequestParam(value = "current",defaultValue = "1") int current,
@RequestParam(value = "size") int size, @RequestParam(value = "size",defaultValue = "20") int size,
@RequestBody(required = false) SafetyProblemTracingDto problemModel) { @RequestBody(required = false) SafetyProblemTracingDto problemModel) {
Page<SafetyProblemTracingDto> page = new Page<>(); Page<SafetyProblemTracingDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment