|
@@ -4,14 +4,14 @@
|
|
|
|
|
|
<select id="productionReport" resultType="com.fjhx.form.entity.ProductionReportBo">
|
|
|
SELECT pod.id,
|
|
|
- pod.company_id AS factoryId,
|
|
|
- po.`code` AS orderCode,
|
|
|
+ pod.company_id AS factoryId,
|
|
|
+ po.`code` AS orderCode,
|
|
|
pod.product_id,
|
|
|
pod.quantity,
|
|
|
po.delivery_period,
|
|
|
pod.finish_time,
|
|
|
IF(DATE_FORMAT(IFNULL(po.finish_time, NOW()), '%Y-%m-%d') > DATE_FORMAT(po.delivery_period, '%Y-%m-%d'),
|
|
|
- 1, 0) as isOverdue,
|
|
|
+ 1, 0) as isOverdue,
|
|
|
IF(DATE_FORMAT(IFNULL(po.finish_time, NOW()), '%Y-%m-%d') > DATE_FORMAT(po.delivery_period, '%Y-%m-%d'),
|
|
|
DATEDIFF(IFNULL(po.finish_time, NOW()), po.delivery_period), 0) as overdueDay,
|
|
|
DATEDIFF(po.delivery_period, po.produce_time) /
|
|
@@ -218,4 +218,19 @@
|
|
|
GROUP BY t1.buy_corporation_id,
|
|
|
t1.data_month
|
|
|
</select>
|
|
|
+ <select id="userPerformanceReport" resultType="com.fjhx.form.entity.UserPerformanceBo">
|
|
|
+ SELECT t1.user_id,
|
|
|
+ su.nick_name AS user_name,
|
|
|
+ sum(t1.amount) AS amount,
|
|
|
+ CONCAT('{', GROUP_CONCAT(CONCAT('"', t1.`data_day`, '":', t1.amount)), '}') AS dayJson
|
|
|
+ FROM (SELECT prd.user_id,
|
|
|
+ IFNULL(sum(prd.amount), 0) AS amount,
|
|
|
+ DATE_FORMAT(prd.create_time, '%d') AS data_day
|
|
|
+ FROM production_reporting_detail prd
|
|
|
+ WHERE DATE_FORMAT(prd.create_time, '%Y-%m') = DATE_FORMAT(#{dataDate}, '%Y-%m')
|
|
|
+ GROUP BY prd.user_id,
|
|
|
+ data_day) t1
|
|
|
+ LEFT JOIN sys_user su ON t1.user_id = su.user_id
|
|
|
+ GROUP BY t1.user_id
|
|
|
+ </select>
|
|
|
</mapper>
|