修改接口

master
游胜振 1 year ago
parent 48c6bc0f7e
commit 00cd63c231
  1. 4
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
  2. 5
      hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@ -72,10 +72,10 @@ public class HighDangerController {
List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,"%" + search + "%"); List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,"%" + search + "%");
// 待办 // 待办
if("20".equals(highDangerBaseVO.getStatus())){ /*if("20".equals(highDangerBaseVO.getStatus())){
List<HighDangerBase> statusCount = highDangerMapper.getHigDangerDealt("99",cdepartmentid,page,"%" + search + "%"); List<HighDangerBase> statusCount = highDangerMapper.getHigDangerDealt("99",cdepartmentid,page,"%" + search + "%");
statusCounts.addAll(statusCount); statusCounts.addAll(statusCount);
} }*/
for (HighDangerBase base : statusCounts) { for (HighDangerBase base : statusCounts) {
Date nowDate = new Date(); Date nowDate = new Date();

@ -122,7 +122,10 @@
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601'
AND et.enumvalue = hdb.status AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid} WHERE hdb.handle_dept = #{cdepartmentid}
<if test="status != null and status != ''"> <if test="status != null and status != '' and status == '0'">
AND hdb.status (0,99)
</if>
<if test="status != null and status != '' and status == '0'">
AND hdb.status = #{status} AND hdb.status = #{status}
</if> </if>
AND hdb.name like #{search} AND hdb.name like #{search}

Loading…
Cancel
Save