diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasClassGroupTaskController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasClassGroupTaskController.java index eabe0107..8ff59b03 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGasClassGroupTaskController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasClassGroupTaskController.java @@ -128,7 +128,7 @@ public class HighGasClassGroupTaskController { if (list.size() > 0) { dataCount = gasClassGroupTaskService.countGroupTaskData(gasId, list.get(0).getClassNum(), - list.get(0).getGasClassGroupId(), + list.get(0).getId(), list.get(0).getStatus(), list.get(0).getStartTime(), null diff --git a/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java index a2f174b1..7c711a09 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java @@ -15,7 +15,7 @@ public interface HighGasClassGroupTaskMapperExt { " select " + " case when SUM(a.total_price) is not null then SUM(a.total_price) else 0 end refuelPrice," + " COUNT(1) refuelNum," + - " case when SUM(a.gas_liters_preferences) is not null then SUM(a.gas_liters_preferences) else 0 end refuelLiters" + + " case when SUM(a.gas_oil_liters) is not null then SUM(a.gas_oil_liters) else 0 end refuelLiters" + " from high_child_order a" + " where goods_type = 3 " + " and gas_class_group_task_id = #{gasClassGroupTaskId} " + @@ -27,7 +27,7 @@ public interface HighGasClassGroupTaskMapperExt { " select " + " case when SUM(a.total_price) is not null then SUM(a.total_price) else 0 end refundPrice," + " COUNT(1) refundNum," + - " case when SUM(a.gas_liters_preferences) is not null then SUM(a.gas_liters_preferences) else 0 end refundLiters" + + " case when SUM(a.gas_oil_liters) is not null then SUM(a.gas_oil_liters) else 0 end refundLiters" + " from high_child_order a" + " where goods_type = 3 " + " and gas_class_group_task_id = #{gasClassGroupTaskId} " + @@ -46,7 +46,7 @@ public interface HighGasClassGroupTaskMapperExt { " LEFT JOIN (select gas_oil_no," + " case when SUM(a.total_price) is not null then SUM(a.total_price) else 0 end refuelPrice," + " COUNT(1) refuelNum," + - " case when SUM(a.gas_liters_preferences) is not null then SUM(a.gas_liters_preferences) else 0 end refuelLiters" + + " case when SUM(a.gas_oil_liters) is not null then SUM(a.gas_oil_liters) else 0 end refuelLiters" + " from high_child_order a" + " where gas_class_group_task_id = #{gasClassGroupTaskId} and goods_type = 3 and child_orde_status in (2,3)" + " GROUP BY a.gas_oil_no) b on b.gas_oil_no = a.oil_no" +