From 80e22bcc7af8aebed7443965655542fbe4966708 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 09 四月 2025 15:11:55 +0800 Subject: [PATCH] 灌溉计划删除,所有命令发布都失败依然允许终止 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml index 207ef22..44de0f1 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml @@ -168,4 +168,25 @@ <select id="getTerminateCommandIds" resultType="java.lang.Long"> SELECT command_id AS commandId FROM ir_intake_operate WHERE operate_type = 1 AND plan_id = #{planId} </select> + + <!--鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙e垪琛紙寮�闃�鎴愬姛鐨勶級--> + <select id="getToTerminateIntakes" resultType="com.dy.pipIrrGlobal.voIr.VoToTerminateIntakes"> + SELECT + command_id AS commandId, + intake_id AS intakeId, + start_time AS startTime + FROM ir_intake_operate + WHERE operate_type = 1 AND command_result = 1 AND plan_id = #{planId} + </select> + + <!--鏍规嵁璁″垝ID鍙婄杞粍ID鑾峰彇鍙栨按鍙e彂甯冨彂甯冪粨鏋�--> + <select id="getIntakeResult" resultType="com.dy.pipIrrGlobal.voIr.VoIntakeResult"> + SELECT + IF(io.command_result = 1, 0, 1) AS code, + (SELECT name FROM pr_intake WHERE id = io.intake_id) AS intakeName, + io.failure_factors AS result + FROM ir_intake_operate io + inner JOIN ir_group_intake gi ON gi.intake_id = io.intake_id + WHERE io.plan_id = #{planId} AND gi.group_id = #{groupId}; + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0