From 211d2887af4608fbdfd40af1e16e4f58131dfaa2 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:08:54 +0800
Subject: [PATCH] feat: 添加清除当前用户的所有消息接口
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index 741ee80..22c1963 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -49,16 +49,20 @@
group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
cast(sum(
case
- when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
- when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_work_hour, 0))
- else case
- when ifnull(p.standard_quantity, 0) = 0 then 0
- else ifnull(pa.finished_num, 0) / ifnull(p.standard_quantity, 0) * 8
- end
+ when ifnull(too.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
end
) as decimal(18,4)) as wages,
cast(sum(ifnull(pa.finished_num, 0)) as decimal(18,4)) as finishedNum,
- cast(sum(ifnull(pa.work_hours, 0)) as decimal(18,4)) as workHours,
+ cast(sum(
+ case
+ when poro.type = 0 then ifnull(pa.work_hours, 0) + ifnull(ppm.repair_work_hour, 0)
+ else case
+ when ifnull(too.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
+ end
+ end
+ ) as decimal(18,4)) as workHours,
cast(sum(ifnull(pa.adjust_amount, 0)) as decimal(18,4)) as adjustAmount,
cast(sum(ifnull(ppm.work_hour, 0)) as decimal(18,4)) as workHour,
case
@@ -138,19 +142,14 @@
<select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
select cast(ifnull(sum(
case
- when pa.adjust_amount is not null then 0
- when poro.type = 0 then 0
- else case
- when ifnull(p.standard_quantity, 0) = 0 then 0
- else ifnull(pa.finished_num, 0) / ifnull(p.standard_quantity, 0) * 8
- end
+ when ifnull(too.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
end
), 0) as decimal(18,2)) as accountBalance,
cast(ifnull(sum(
case
- when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
- when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_work_hour, 0))
- else 0
+ when ifnull(too.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
end
), 0) as decimal(18,2)) as account
from production_account pa
@@ -158,6 +157,7 @@
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
left join production_order po on pot.production_order_id = po.id
left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join technology_operation too on poro.technology_operation_id = too.id
left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
left join product p on pm.product_id = p.id
where pa.scheduling_user_id = #{userId}
--
Gitblit v1.9.3