java/mx_charging_pile.git

			@@ -326,7 +326,7 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
			del_flag = 0 and recharge_payment_status = 2
			<if test="sixBefore != null">
			AND create_time >= #{sixBefore}
			</if>
			@@ -349,7 +349,7 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
			del_flag = 0 and recharge_payment_status = 2
			<if test="siteIds != null and siteIds.size() > 0">
			AND site_id IN
			<foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
			@@ -368,7 +368,7 @@
			<select id="countAll" resultType="java.util.Map">
			select sum(electrovalence) as electrovalence,sum(service_charge) as service_charge,sum(commission_amount) as commission_amount,sum(sharing_amount) as sharing_amount
			from t_charging_order
			where create_time >= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
			where create_time >= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2
			</select>
			<select id="getSumByType" resultType="java.util.Map">
			SELECT
			@@ -399,13 +399,13 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and DATE(create_time) = CURDATE()
			<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
			del_flag = 0 and recharge_payment_status = 2 and DATE(create_time) = CURDATE()

			AND id IN
			<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
			#{chargingOrderId}
			</foreach>
			</if>

			</where>
			GROUP BY
			time
			@@ -423,13 +423,13 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
			<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
			del_flag = 0 and recharge_payment_status = 2 and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)

			AND id IN
			<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
			#{chargingOrderId}
			</foreach>
			</if>

			</where>
			GROUP BY
			time
			@@ -447,13 +447,13 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and MONTH(create_time) = MONTH(NOW()) AND YEAR(create_time) = YEAR(NOW())
			<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
			del_flag = 0 and recharge_payment_status = 2 and MONTH(create_time) = MONTH(NOW()) AND YEAR(create_time) = YEAR(NOW())

			AND id IN
			<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
			#{chargingOrderId}
			</foreach>
			</if>

			</where>
			GROUP BY
			time
			@@ -472,13 +472,13 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and YEAR(create_time) = YEAR(NOW())
			<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
			del_flag = 0 and recharge_payment_status = 2 and YEAR(create_time) = YEAR(NOW())

			AND id IN
			<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
			#{chargingOrderId}
			</foreach>
			</if>

			</where>
			GROUP BY
			time
			@@ -496,13 +496,13 @@
			FROM
			t_charging_order
			<where>
			del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
			<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
			del_flag = 0 and recharge_payment_status = 2

			AND id IN
			<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
			#{chargingOrderId}
			</foreach>
			</if>

			</where>
			GROUP BY
			time
			@@ -520,7 +520,6 @@
			WHERE
			del_flag = 0
			AND recharge_payment_status = 2
			AND ISNULL(refund_status)
			AND DATE(create_time) = CURDATE()
			<if test="siteIds != null and siteIds.size() > 0">
			AND site_id IN
			@@ -542,7 +541,6 @@
			WHERE
			del_flag = 0
			AND recharge_payment_status = 2
			AND ISNULL(refund_status)
			AND DATE(create_time) = CURDATE() - INTERVAL 1 DAY
			<if test="siteIds != null and siteIds.size() > 0">
			AND site_id IN
			@@ -570,7 +568,6 @@
			WHERE
			del_flag = 0
			AND recharge_payment_status = 2
			AND ISNULL(refund_status)
			<if test="siteIds != null and siteIds.size() > 0">
			AND site_id IN
			<foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
			@@ -631,6 +628,45 @@
			GROUP BY
			time
			</select>

			<select id="usersByQuery1" resultType="java.util.Map">

			SELECT
			'today' AS data_type,
			'1' as type,
			DATE_FORMAT( create_time, '%Y-%m-%d' ) AS time,
			count(DISTINCT app_user_id) AS counts
			FROM
			t_charging_order
			WHERE
			del_flag = 0
			<if test="statisticsQueryDto.dayType ==1 ">
			AND DATE(create_time) = CURDATE()
			</if>
			<if test="statisticsQueryDto.dayType ==2 ">
			AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE())
			</if>
			<if test="statisticsQueryDto.dayType ==3 ">
			AND MONTH(create_time) = MONTH(CURDATE())
			</if>
			<if test="statisticsQueryDto.dayType ==4">
			AND YEAR(create_time) = YEAR(CURDATE())
			</if>
			<if test="statisticsQueryDto.dayType ==5">
			<if test="statisticsQueryDto.startTime != null">
			AND create_time >= #{statisticsQueryDto.startTime}
			</if>
			<if test="statisticsQueryDto.endTime != null">
			AND create_time <= #{statisticsQueryDto.endTime}
			</if>
			</if>
			GROUP BY
			time


			</select>


			<select id="usersByQuery" resultType="java.util.Map">

			SELECT