From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +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/SalesLedgerProductionAccountingMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index d9ddde7..f2e460a 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper">
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
+ <select id="listPage" resultType="com.ruoyi.production2.dto.SalesLedgerProductionAccountingDto">
SELECT
t4.id,
t4.finished_num * t4.work_hours as wages,
@@ -51,7 +51,7 @@
order by t4.scheduling_date desc
</select>
<select id="pageProductionAccounting"
- resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
+ resultType="com.ruoyi.production2.dto.SalesLedgerProductionAccountingDto">
SELECT
slpa.scheduling_user_id,
slpa.scheduling_user_name,
@@ -84,8 +84,7 @@
</if>
</where>
- GROUP BY slpa.scheduling_user_name
-
+ GROUP BY slpa.scheduling_user_id, slpa.scheduling_user_name
</select>
<select id="selectDailyWagesStats" resultType="java.util.Map">
@@ -105,7 +104,7 @@
GROUP BY DATE(ppout.create_time)
ORDER BY DATE(ppout.create_time);
</select>
- <select id="getByUserId" resultType="com.ruoyi.production.dto.UserAccountDto">
+ <select id="getByUserId" resultType="com.ruoyi.production2.dto.UserAccountDto">
select
slpa.scheduling_user_id as user_id,
pp.type,
--
Gitblit v1.9.3