pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -715,10 +715,14 @@ <select id="getLargeWaterConsumptionClientsCount" resultType="java.lang.Long"> SELECT COUNT(*) AS recordCount FROM se_client cli WHERE (SELECT SUM(his.cl_this_amount) <where> <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and waterConsumption != null"> (SELECT SUM(his.cl_this_amount) FROM rm_open_close_valve_history his WHERE his.client_id = cli.id AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterConsumption} </if> </where> </select> <!--获取指定时间段内用水量超过指定值的农户--> @@ -730,10 +734,14 @@ cli.phone, cli.idCard FROM se_client cli WHERE (SELECT SUM(his.cl_this_amount) <where> <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and waterConsumption != null"> (SELECT SUM(his.cl_this_amount) FROM rm_open_close_valve_history his WHERE his.client_id = cli.id AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterConsumption} </if> </where> ORDER BY cli.id <trim prefix="limit "> <if test="start != null and count != null"> @@ -746,10 +754,14 @@ <select id="getLargeAmountSpentClientsCount" resultType="java.lang.Long"> SELECT COUNT(*) AS recordCount FROM se_client cli WHERE (SELECT SUM(his.cl_this_money) <where> <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and amountSpent != null"> (SELECT SUM(his.cl_this_money) FROM rm_open_close_valve_history his WHERE his.client_id = cli.id AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{amountSpent} </if> </where> </select> <!--获取指定时间段内消费金额超过指定值的农户--> <select id="getLargeAmountSpentClients" resultType="com.dy.pipIrrGlobal.voSt.VoClient"> @@ -760,10 +772,14 @@ cli.phone, cli.idCard FROM se_client cli WHERE (SELECT SUM(his.cl_this_money) <where> <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and amountSpent != null"> (SELECT SUM(his.cl_this_money) FROM rm_open_close_valve_history his WHERE his.client_id = cli.id AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{amountSpent} </if> </where> ORDER BY cli.id <trim prefix="limit "> <if test="start != null and count != null"> @@ -776,10 +792,14 @@ <select id="getLargeWaterDurationClientsCount" resultType="java.lang.Long"> SELECT COUNT(*) AS recordCount FROM se_client cli WHERE (SELECT SUM(his.cl_this_time) <where> <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and waterDuration != null"> (SELECT SUM(his.cl_this_time) FROM rm_open_close_valve_history his WHERE his.client_id = cli.id AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterDuration} </if> </where> </select> <!--获取指定时间段内用水时长超过指定值的农户--> @@ -791,10 +811,14 @@ cli.phone, cli.idCard FROM se_client cli WHERE (SELECT SUM(his.cl_this_time) <where> <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and waterDuration != null"> (SELECT SUM(his.cl_this_time) FROM rm_open_close_valve_history his WHERE his.client_id = cli.id AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterDuration} </if> </where> ORDER BY cli.id <trim prefix="limit "> <if test="start != null and count != null"> pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
@@ -53,13 +53,9 @@ String timeStop = qo.getTimeStop(); if(timeStart != null && timeStart != "") { timeStart = timeStart + " 00:00:00"; } else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null && timeStop != "") { timeStop = timeStop + " 23:59:59"; }else { timeStop = LocalDate.now() + " 23:59:59"; } qo.setTimeStart(timeStart); qo.setTimeStop(timeStop); @@ -87,19 +83,15 @@ */ public QueryResultVo<List<VoClient>> getSmallOpenCountClients(OpenCountQO qo) { /** * 补齐起止时间，如果开始时间为空，则默认为当前日期 * 补齐起止时间 */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStart != null && timeStart != "") { timeStart = timeStart + " 00:00:00"; } else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null && timeStop != "") { timeStop = timeStop + " 23:59:59"; }else { timeStop = LocalDate.now() + " 23:59:59"; } qo.setTimeStart(timeStart); qo.setTimeStop(timeStop); @@ -127,16 +119,14 @@ */ public QueryResultVo<List<VoClient>> getLargeWaterConsumptionClients(WaterConsumptionQO qo) { /** * 补齐起止时间，如果开始时间为空，则默认为当前日期 * 补齐起止时间 */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStart != null) { if(timeStart != null && timeStart != "") { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null) { if(timeStop != null && timeStop != "") { timeStop = timeStop + " 23:59:59"; } qo.setTimeStart(timeStart); @@ -169,12 +159,10 @@ */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStart != null) { if(timeStart != null && timeStart != "") { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null) { if(timeStop != null && timeStop != "") { timeStop = timeStop + " 23:59:59"; } qo.setTimeStart(timeStart); @@ -207,12 +195,10 @@ */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStart != null) { if(timeStart != null && timeStart != "") { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null) { if(timeStop != null && timeStop != "") { timeStop = timeStop + " 23:59:59"; } qo.setTimeStart(timeStart); pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/AmountSpentQO.java
@@ -18,6 +18,6 @@ /** * 消费金额 */ @NotNull(message = "消费金额不能为空") // @NotNull(message = "消费金额不能为空") private Double amountSpent; } pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/WaterConsumptionQO.java
@@ -18,6 +18,6 @@ /** * 指定的用水量 */ @NotNull(message = "用水量不能为空") // @NotNull(message = "用水量不能为空") private Double waterConsumption; } pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/WaterDurationQO.java
@@ -18,6 +18,6 @@ /** * 用水时长 */ @NotNull(message = "用水时长不能为空") // @NotNull(message = "用水时长不能为空") private Integer waterDuration; }
