diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 453d016..705b456 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -69,7 +69,7 @@ public class HighDangerController { Page page = new Page<>(pageNum, pageSize); // 将要查询的状态和部门id查询数据库,获得隐患排查表 - List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,"%" + search + "%"); + List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,search); // 待办 /*if("20".equals(highDangerBaseVO.getStatus())){ diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index 95b43e8..df566f1 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -122,13 +122,15 @@ LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status WHERE hdb.handle_dept = #{cdepartmentid} - - AND hdb.status (0,99) + + AND hdb.status in ('0','99') - + AND hdb.status = #{status} - AND hdb.name like #{search} + + AND hdb.name like concat(concat('%',#{search}),'%') + -- ORDER BY hdb.PC_END_TIME::timestamp DESC ORDER BY CASE