tobacco-back.git

			@@ -21,7 +21,7 @@
			sum(abnormal_sign) AS abnormalSign,
			sum(not_sign_count) AS notSignCount,
			sum(sign_count )AS signCount,
			CONCAT_WS( '',ROUND(AVG(proportion),0), '%') as proportion,
			ROUND(AVG(proportion),0) as proportionInt,
			</if>
			<if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '4'.toString()">
			YEAR(DATE_FORMAT(DATE_SUB(send_date,INTERVAL 1 DAY),'%Y-%m-%d')) sendDate,
			@@ -62,21 +62,16 @@
			</if>
			</where>
			GROUP BY
			<if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '1'.toString()">
			DATE(send_date),
			</if>
			<if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '2'.toString()">
			WEEK(send_date,1),
			</if>
			<if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '3'.toString()">
			MONTH(send_date),
			</if>
			<if test="bo.StatisticalType!=null and bo.StatisticalType !='' and bo.StatisticalType == '4'.toString()">
			YEAR(send_date),
			</if>
			send_date,
			car_name,
			line,
			batch
			batch,
			amount,
			abnormal_sign,
			not_sign_count,
			sign_count,
			proportion,
			user_name
			ORDER BY
			line ASC,
			send_date asc
			@@ -128,12 +123,18 @@
			</if>
			</where>
			GROUP BY
			DATE(send_date),
			send_date,
			car_name,
			line,
			batch
			batch,
			amount,
			abnormal_sign,
			not_sign_count,
			sign_count,
			proportion,
			user_name
			ORDER BY
			line ASC,
			send_date asc
			</select>
			</mapper>
			</mapper>