diff --git a/sgtjzhzxsp-business/src/main/java/com/bhne/mapper/ZhWarningInfoMapper.java b/sgtjzhzxsp-business/src/main/java/com/bhne/mapper/ZhWarningInfoMapper.java index c36b5a05..ed97911a 100644 --- a/sgtjzhzxsp-business/src/main/java/com/bhne/mapper/ZhWarningInfoMapper.java +++ b/sgtjzhzxsp-business/src/main/java/com/bhne/mapper/ZhWarningInfoMapper.java @@ -21,6 +21,8 @@ public interface ZhWarningInfoMapper extends BaseMapper { List getWarningInfoTotal(@Param("userId") Long userId,@Param("type")String type); - List getWarningByOrgTotal(@Param("warningConfigId")String warningConfigId); + List getWarningQqsxByOrgTotal(@Param("warningConfigId")String warningConfigId); + + List getWarningCqgjByOrgTotal(@Param("warningConfigId")String warningConfigId); } \ No newline at end of file diff --git a/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhWarningInfoServiceImpl.java b/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhWarningInfoServiceImpl.java index 9049fd6d..41ae0522 100644 --- a/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhWarningInfoServiceImpl.java +++ b/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhWarningInfoServiceImpl.java @@ -304,7 +304,14 @@ public class ZhWarningInfoServiceImpl extends ServiceImpl getWarningByOrgTotal(String warningConfigId){ - return zhWarningInfoMapper.getWarningByOrgTotal(warningConfigId); + List list = new ArrayList<>(); + //1和2是前期手续 3和4是超期告警 + if(warningConfigId.equals("1") || warningConfigId.equals("2")){ + list = zhWarningInfoMapper.getWarningQqsxByOrgTotal(warningConfigId); + }else if(warningConfigId.equals("3") || warningConfigId.equals("4")){ + list = zhWarningInfoMapper.getWarningCqgjByOrgTotal(warningConfigId); + } + return list; } @Override diff --git a/sgtjzhzxsp-business/src/main/resources/mapper/zh/ZhWarningInfoMapper.xml b/sgtjzhzxsp-business/src/main/resources/mapper/zh/ZhWarningInfoMapper.xml index f0dfc72b..f812c06c 100644 --- a/sgtjzhzxsp-business/src/main/resources/mapper/zh/ZhWarningInfoMapper.xml +++ b/sgtjzhzxsp-business/src/main/resources/mapper/zh/ZhWarningInfoMapper.xml @@ -307,7 +307,7 @@ - SELECT count( zwi.id ) AS sum, zec1.code_value AS buildOrg @@ -324,4 +324,21 @@ ORDER BY zec1.display_order ASC + + \ No newline at end of file