From fd80c03df8aa8261e4c8174b9ee0a91edb45d60c Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:08:57 +0800
Subject: [PATCH] fix: 客户档案查询领用人返回用户昵称
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 127 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index 4be1c23..22c1963 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -13,6 +13,11 @@
<result column="finished_num" property="finishedNum" />
<result column="work_hours" property="workHours" />
<result column="technology_operation_name" property="technologyOperationName" />
+ <result column="adjust_amount" property="adjustAmount" />
+ <result column="adjust_remark" property="adjustRemark" />
+ <result column="adjust_user" property="adjustUser" />
+ <result column="adjust_time" property="adjustTime" />
+ <result column="accounting_batch_no" property="accountingBatchNo" />
<result column="scheduling_date" property="schedulingDate" />
<result column="create_user" property="createUser" />
<result column="create_time" property="createTime" />
@@ -23,24 +28,42 @@
<select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionAccountVo">
select
+ group_concat(distinct ppm.product_no order by ppm.product_no separator ',') as reportNo,
+ case
+ when sum(case when ppm.audit_status = 0 then 1 else 0 end) > 0 then '寰呭鏍�'
+ when sum(case when ppm.audit_status = 2 then 1 else 0 end) > 0 then '瀹℃牳涓嶉�氳繃'
+ else '瀹℃牳閫氳繃'
+ end as auditStatusName,
+ case
+ when sum(case when ppm.report_type = 1 then 1 else 0 end) > 0 then '杞诲井杩斿伐'
+ when sum(case when ppm.report_type = 2 then 1 else 0 end) > 0 then '涓ラ噸杩斿伐'
+ when sum(case when ppm.report_type = 3 then 1 else 0 end) > 0 then '鎶ュ簾'
+ else '鍚堟牸'
+ end as reportTypeName,
group_concat(distinct p_parent.product_name order by p_parent.product_name separator ',') as productCategory,
group_concat(distinct pm.model order by pm.model separator ',') as specificationModel,
group_concat(distinct pm.unit order by pm.unit separator ',') as unit,
+ ifnull(p.standard_quantity, 0) as productStandardQuantity,
pa.scheduling_user_id as schedulingUserId,
pa.scheduling_user_name as schedulingUserName,
+ group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
cast(sum(
case
- when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
- else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
- case
- when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
- then cast(substring_index(pm.model, '*', -1) as decimal(18,4))
- else 1
- 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
when sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) = 0 then '0%'
@@ -55,6 +78,7 @@
)
end as outputRate,
group_concat(distinct pa.technology_operation_name order by pa.technology_operation_name separator ',') as process,
+ group_concat(distinct pa.adjust_remark order by pa.adjust_time desc separator ',') as adjustRemark,
case
when count(distinct date(pa.scheduling_date)) = 1 then min(date(pa.scheduling_date))
else null
@@ -68,6 +92,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
left join product p_parent on p_parent.id = p.parent_id
@@ -79,6 +104,8 @@
group by production_product_main_id
) ppo on ppo.production_product_main_id = ppm.id
<where>
+ and ppm.audit_status = 1
+ and ppm.report_type in (0, 1)
<if test="c != null">
<if test="c.productCategory != null and c.productCategory != ''">
and p_parent.product_name like concat('%', #{c.productCategory}, '%')
@@ -113,11 +140,67 @@
</select>
<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 cast(ifnull(sum(
+ 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
+ ), 0) as decimal(18,2)) as accountBalance,
+ cast(ifnull(sum(
+ 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
+ ), 0) as decimal(18,2)) as account
+ from production_account pa
+ left join production_product_main ppm on ppm.id = pa.production_product_main_id
+ 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}
+ and date_format(pa.scheduling_date, '%Y-%m') = #{date}
+ and (
+ pa.production_product_main_id is null
+ or (
+ ppm.audit_status = 1
+ and ppm.report_type in (0, 1)
+ )
+ )
+ </select>
+
+ <select id="selectMonthSalaryCalcItems" resultType="java.util.Map">
+ select
+ poro.type as operationType,
+ ifnull(pa.finished_num, 0) as finishedNum,
+ ifnull(ppm.work_hour, 0) as workHour,
+ ifnull(ppm.repair_work_hour, 0) as repairWorkHour,
+ ifnull(too.standard_quantity, 0) as standardQuantity,
+ ifnull(p.standard_quantity, 0) as productStandardQuantity,
+ ifnull(too.violin_factor, 0) as violinFactor,
+ ifnull(too.viola_factor, 0) as violaFactor,
+ ifnull(too.bass_factor, 0) as bassFactor,
+ p.product_name as productName
+ from production_account pa
+ left join production_product_main ppm on ppm.id = pa.production_product_main_id
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.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 production_order po on pot.production_order_id = po.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
+ left join product p_parent on p_parent.id = p.parent_id
+ where pa.scheduling_user_id = #{userId}
+ and date_format(pa.scheduling_date, '%Y-%m') = #{date}
+ and (
+ pa.production_product_main_id is null
+ or (
+ ppm.audit_status = 1
+ and ppm.report_type in (0, 1)
+ )
+ )
</select>
<select id="selectDailyWagesStats" resultType="java.util.Map">
@@ -125,11 +208,23 @@
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}
+ from production_account pa
+ inner join production_product_main ppm on ppm.id = pa.production_product_main_id
+ where pa.scheduling_date >= #{startDate}
+ and pa.scheduling_date <= #{endDate}
+ and ppm.audit_status = 1
+ and ppm.report_type in (0, 1)
group by date_format(scheduling_date, '%m-%d')
order by date_format(scheduling_date, '%m-%d')
</select>
+ <select id="selectAccountingMonths" resultType="java.lang.String">
+ select distinct date_format(pa.scheduling_date, '%Y-%m') as monthValue
+ from production_account pa
+ inner join production_product_main ppm on ppm.id = pa.production_product_main_id
+ where ppm.audit_status = 1
+ and ppm.report_type in (0, 1)
+ order by monthValue
+ </select>
+
</mapper>
--
Gitblit v1.9.3