From 2b4fc2b16efdc887b71855b0b4d5b5680453d088 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 29 十一月 2024 11:15:52 +0800 Subject: [PATCH] 1、实现强制停止RTU远程升级任务功能; 2、业务系统与通信中间件web通信模块优化,使变得更通用与简单。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml index 0172422..91c9588 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml @@ -302,9 +302,33 @@ </select> <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛璁板綍鏁�--> - <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long"> - SELECT - COUNT(*) AS recordCount +<!-- <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">--> + <select id="getRecordCount" resultType="com.dy.pipIrrGlobal.voSe.VoClient"> +<!-- SELECT--> +<!-- COUNT(*) AS recordCount--> + SELECT DISTINCT + cli.countyId, + dis_con.name AS countryName, + cli.townId, + dis_town.name AS townName, + cli.villageId, + dis_village.name AS villageName, + cli.blockId, + blo.name AS blockName, + cli.divideId, + divi.name AS divideName, + cli.typeId, + wat.typeName AS waterTypeName, + cli.id AS clientId, + cli.name, + cli.clientNum, + cli.phone, + cli.idCard, + cli.area, + (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id)+(SELECT COUNT(*) FROM se_virtual_card WHERE client_id = cli.id) AS cardCount, + cli.address, + cli.remarks, + cli.operateDt FROM se_client cli LEFT JOIN ba_district dis_con ON cli.countyId = dis_con.id LEFT JOIN ba_district dis_town ON cli.townId = dis_town.id @@ -351,7 +375,7 @@ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁--> <select id="getClients" resultType="com.dy.pipIrrGlobal.voSe.VoClient"> - SELECT + SELECT DISTINCT cli.countyId, dis_con.name AS countryName, cli.townId, -- Gitblit v1.8.0