1、取水口用水日统计表中增加金额、次数字段； 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指...

liurunyu

2025-01-07 a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml

@@ -287,8 +287,10 @@
    <select id="getLargeFlowIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoCumulativeFlow">
        SELECT inta.id                                  AS intakeId,
               inta.name                                AS intakeNum,
               inta.lng           AS lng,
               inta.lat           AS lat,
               blo.name                                 AS blockName,
               CAST(hou.total_amount AS DECIMAL(10, 2)) AS cumulativeFlow,
               hou.total_amount   AS cumulativeFlow,
               hou.dt                                   AS getDate
        FROM pr_intake inta
                 INNER JOIN rm_on_hour_report_last hou ON hou.intake_id = inta.id
@@ -317,9 +319,10 @@
    <select id="getSmallFlowIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoCumulativeFlow">
        SELECT inta.id   AS intakeId,
               inta.name AS intakeNum,
               inta.lng  AS lng,
               inta.lat  AS lat,
               blo.name  AS blockName,
        <!--    FORMAT(hou.total_amount,2) AS cumulativeFlow,-->
        CAST(hou.total_amount AS DECIMAL(10, 2)) AS cumulativeFlow,
               hou.total_amount AS cumulativeFlow,
        hou.dt                                   AS getDate
        FROM pr_intake inta
                 INNER JOIN rm_on_hour_report_last hou ON hou.intake_id = inta.id