From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/resources/mapper/production/ProductionAccountMapper.xml |   87 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index 8b669e9..2841854 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -21,6 +21,93 @@
         <result column="dept_id" property="deptId" />
     </resultMap>
 
+    <select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionAccountVo">
+        select
+        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,
+        pa.scheduling_user_id as schedulingUserId,
+        pa.scheduling_user_name as schedulingUserName,
+        cast(sum(
+            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
+        ) 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,
+        case
+            when sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) = 0 then '0%'
+            else concat(
+                cast(
+                    round(
+                        sum(ifnull(ppo.quantity, 0)) /
+                        sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) * 100, 2
+                    ) as char
+                ),
+                '%'
+            )
+        end as outputRate,
+        group_concat(distinct pa.technology_operation_name order by pa.technology_operation_name separator ',') as process,
+        case
+            when count(distinct date(pa.scheduling_date)) = 1 then min(date(pa.scheduling_date))
+            else null
+        end as schedulingDate,
+        case
+            when count(distinct date_format(pa.scheduling_date, '%Y-%m')) = 1 then min(date_format(pa.scheduling_date, '%Y-%m'))
+            else null
+        end as schedulingMonth
+        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 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
+        left join (
+            select production_product_main_id,
+                   cast(sum(ifnull(quantity, 0)) as decimal(18,4)) as quantity,
+                   cast(sum(ifnull(scrap_qty, 0)) as decimal(18,4)) as scrapQty
+            from production_product_output
+            group by production_product_main_id
+        ) ppo on ppo.production_product_main_id = ppm.id
+        <where>
+            <if test="c != null">
+                <if test="c.productCategory != null and c.productCategory != ''">
+                    and p_parent.product_name like concat('%', #{c.productCategory}, '%')
+                </if>
+                <if test="c.specificationModel != null and c.specificationModel != ''">
+                    and pm.model like concat('%', #{c.specificationModel}, '%')
+                </if>
+                <if test="c.schedulingUserId != null">
+                    and pa.scheduling_user_id = #{c.schedulingUserId}
+                </if>
+                <if test="c.schedulingUserName != null and c.schedulingUserName != ''">
+                    and pa.scheduling_user_name like concat('%', #{c.schedulingUserName}, '%')
+                </if>
+                <if test="c.process != null and c.process != ''">
+                    and pa.technology_operation_name like concat('%', #{c.process}, '%')
+                </if>
+                <if test="c.entryDate != null">
+                    and date(pa.scheduling_date) = #{c.entryDate}
+                </if>
+                <if test="c.entryDateStart != null">
+                    and date(pa.scheduling_date) &gt;= #{c.entryDateStart}
+                </if>
+                <if test="c.entryDateEnd != null">
+                    and date(pa.scheduling_date) &lt;= #{c.entryDateEnd}
+                </if>
+            </if>
+        </where>
+        group by pa.scheduling_user_id,
+        pa.scheduling_user_name
+        order by wages desc,
+        pa.scheduling_user_id asc
+    </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

--
Gitblit v1.9.3