From 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 10:45:01 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index b1c01e6..8b669e9 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -21,4 +21,24 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
+ select ifnull(sum(finished_num), 0) as accountBalance,
+ ifnull(sum(work_hours), 0) as account
+ from production_account
+ where scheduling_user_id = #{userId}
+ and date_format(scheduling_date, '%Y-%m') = #{date}
+ </select>
+
+ <select id="selectDailyWagesStats" resultType="java.util.Map">
+ select date_format(scheduling_date, '%m-%d') as dateStr,
+ cast(ifnull(sum(finished_num), 0) as decimal(18,2)) as numberOfCompleted,
+ cast(ifnull(sum(work_hours), 0) as decimal(18,2)) as amount,
+ cast(0 as decimal(18,2)) as passRate
+ from production_account
+ where scheduling_date >= #{startDate}
+ and scheduling_date <= #{endDate}
+ group by date_format(scheduling_date, '%m-%d')
+ order by date_format(scheduling_date, '%m-%d')
+ </select>
+
</mapper>
--
Gitblit v1.9.3