From 4a33b783168846bd71eb849e1a922ae864237fbe Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 19 九月 2024 13:51:43 +0800 Subject: [PATCH] 2024-09-19 朱宝民 获取收据列表接口增加查询条件和返回值 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml index cb816f9..e852f5b 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml @@ -1054,4 +1054,63 @@ </if> </trim> </select> + + <!--鑾峰彇姘村崱娑堣垂璁板綍鏁伴噺锛岀鐞嗗钩鍙颁娇鐢�--> + <select id="getExpendsCount" resultType="java.lang.Long"> + SELECT COUNT(*) AS recordCount + FROM rm_open_close_valve_history och + INNER JOIN se_client cli ON cli.id = och.client_id + INNER JOIN pr_intake inta ON inta.id = och.intake_id + <where> + AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + + <if test = "clientNum != null and clientNum > 0"> + AND cli.clientNum like CONCAT('%',#{clientNum},'%') + </if> + + <if test = "cardNum != null and cardNum !=''"> + AND och.cl_ic_card_no like CONCAT('%',#{cardNum},'%') + </if> + </where> + </select> + + <!--鑾峰彇姘村崱娑堣垂璁板綍锛岀鐞嗗钩鍙颁娇鐢�--> + <select id="getExpends" resultType="com.dy.pipIrrGlobal.voRm.VoExpend"> + SELECT + cli.name AS clientName, + cli.clientNum, + och.cl_ic_card_no AS cardNum, + inta.name AS intakeName, + och.rtu_addr AS rtuAddr, + och.cl_this_money AS moneyAmount, + och.cl_this_amount AS waterAmount, + och.cl_this_time AS duration, + och.cl_dt AS operateTime + FROM rm_open_close_valve_history och + INNER JOIN se_client cli ON cli.id = och.client_id + INNER JOIN pr_intake inta ON inta.id = och.intake_id + <where> + AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + + <if test = "clientNum != null and clientNum > 0"> + AND cli.clientNum like CONCAT('%',#{clientNum},'%') + </if> + + <if test = "cardNum != null and cardNum !=''"> + AND och.cl_ic_card_no like CONCAT('%',#{cardNum},'%') + </if> + </where> + ORDER BY och.cl_dt DESC + <trim prefix="limit " > + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0