From b81e59b6ef96ac100109f7662365ff3bec805a2d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 11 十二月 2024 17:01:43 +0800 Subject: [PATCH] pipIrr-web-temp增加删除日统计水量(漏损、取水口、农户) --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml | 49 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml index df62638..f025aee 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml @@ -133,15 +133,15 @@ FROM pr_intake_controller <where> <if test = "intakeId != null and intakeId > 0"> - AND intakeId = ${intakeId} + AND intakeId = #{intakeId,jdbcType=BIGINT} </if> <if test = "controllerId != null and controllerId > 0"> - AND controllerId = ${controllerId} + AND controllerId = #{controllerId,jdbcType=BIGINT} </if> <if test = "operateType != null and operateType > 0"> - AND operateType = ${operateType} + AND operateType = #{operateType,jdbcType=BIGINT} </if> </where> </select> @@ -150,18 +150,19 @@ <select id="getBindsByIntakeId" resultType="java.util.Map"> SELECT user.name AS userName, - con.code AS controllerCode, + <!--con.code AS controllerCode,--> + con.rtuAddr, (CASE - WHEN ic.operateType = 1 THEN "缁戝畾" - WHEN ic.operateType = 2 THEN "瑙g粦" + WHEN ic.operateType = 1 THEN '缁戝畾' + WHEN ic.operateType = 2 THEN '瑙g粦' END) AS operateType, ic.operateDt FROM pr_intake inta INNER JOIN pr_intake_controller ic ON inta.id= ic.intakeId INNER JOIN ba_user user ON ic.operator = user.id INNER JOIN pr_controller con ON ic.controllerId = con.id - <if test = "intakeId != null and intakeId > 0"> - AND inta.id = ${intakeId} + <if test = "intakeId != null"> + AND inta.id = #{intakeId,jdbcType=BIGINT} </if> ORDER BY ic.operateDt DESC </select> @@ -170,8 +171,8 @@ <select id="getBindsByControllerId" resultType="java.util.Map"> SELECT (CASE - WHEN ic.operateType = 1 THEN "缁戝畾" - WHEN ic.operateType = 2 THEN "瑙g粦" + WHEN ic.operateType = 1 THEN '缁戝畾' + WHEN ic.operateType = 2 THEN '瑙g粦' END) AS operateType, inta.name AS intakeName, user.name AS userName, @@ -180,9 +181,33 @@ INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id INNER JOIN pr_intake inta ON ic.intakeId = inta.id INNER JOIN ba_user user ON ic.operator = user.id - <if test = "controllerId != null and controllerId > 0"> - AND con.id = ${controllerId} + <if test = "controllerId != null"> + AND con.id = #{controllerId,jdbcType=BIGINT} </if> ORDER BY ic.operateDt DESC </select> + + + <!--鏍规嵁鍙栨按鍙g紪鍙蜂慨鏀圭粦瀹氳褰曞垪琛�--> + <update id="updateByIntakeSelective"> + update pr_intake_controller + <set> + <if test="controllerid != null"> + controllerId = #{controllerid,jdbcType=BIGINT}, + </if> + <if test="operatetype != null"> + operateType = #{operatetype,jdbcType=TINYINT}, + </if> + <if test="remarks != null"> + remarks = #{remarks,jdbcType=VARCHAR}, + </if> + <if test="operator != null"> + `operator` = #{operator,jdbcType=BIGINT}, + </if> + <if test="operatedt != null"> + operateDt = #{operatedt,jdbcType=TIMESTAMP}, + </if> + </set> + where intakeId = #{intakeid,jdbcType=BIGINT} + </update> </mapper> \ No newline at end of file -- Gitblit v1.8.0