From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml index 70353ff..dc355db 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml @@ -268,4 +268,52 @@ where temTb.intake_id is null </select> + + + + <select id="topXClientAtCertainDay" resultType="com.dy.pipIrrGlobal.voSpecial.VoTopXClient"> + select mTb.id as id, mTb.client_id as clientId, + scTb.name as clientName, scTb.clientNum as clientNum, scTb.address as clientAddress, + mTb.amount as amount + from rm_client_amount_day mTb + left join se_client scTb on scTb.id = mTb.client_id + <where> + <if test = "idStart != null"> + mTb.id <![CDATA[>=]]> #{idStart, javaType=LONG, jdbcType=BIGINT} + </if> + <if test = "idEnd != null"> + and mTb.id <![CDATA[<=]]> #{idEnd, javaType=LONG, jdbcType=BIGINT} + </if> + </where> + order by mTb.amount DESC + <trim prefix="limit " > + <if test="count != null"> + 0, #{count,javaType=Integer, jdbcType=INTEGER} + </if> + </trim> + </select> + + + <select id="topXIntakeAtCertainDay" resultType="com.dy.pipIrrGlobal.voSpecial.VoTopXIntake"> + select mTb.id as id, mTb.intake_id as intakeId, + piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat, + mTb.amount as amount + from rm_intake_amount_day mTb + left join pr_intake piTb on piTb.id = mTb.intake_id + <where> + <if test = "idStart != null"> + mTb.id <![CDATA[>=]]> #{idStart, javaType=LONG, jdbcType=BIGINT} + </if> + <if test = "idEnd != null"> + and mTb.id <![CDATA[<=]]> #{idEnd, javaType=LONG, jdbcType=BIGINT} + </if> + </where> + order by mTb.amount DESC + <trim prefix="limit " > + <if test="count != null"> + 0, #{count,javaType=Integer, jdbcType=INTEGER} + </if> + </trim> + </select> + </mapper> \ No newline at end of file -- Gitblit v1.8.0