From e04a3cfe29914cc7418504e78701dd512fed0d3a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 11:50:00 +0800
Subject: [PATCH] feat: 计划时间格式调整为年月日+时分秒;多选报工人;生产报工只能看指定报告人

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 6e7e06c..e132174 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -12,10 +12,10 @@
         <result column="work_order_no" property="workOrderNo"/>
         <result column="status" property="status"/>
         <result column="tenant_id" property="tenantId"/>
-        <result column="actual_end_time" property="planStartTime"/>
+        <result column="plan_start_time" property="planStartTime"/>
         <result column="plan_end_time" property="planEndTime"/>
         <result column="actual_start_time" property="actualStartTime"/>
-        <result column="actualEndTime" property="actualEndTime"/>
+        <result column="actual_end_time" property="actualEndTime"/>
     </resultMap>
 
     <select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
@@ -26,6 +26,7 @@
         pm.unit,
         p.product_name AS productName,
         po.nps_no AS productOrderNpsNo,
+        pp.salary_quota,
         ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
         CASE
         WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
@@ -43,10 +44,19 @@
                and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
             </if>
             <if test="c.planStartTime != null and c.planEndTime != null">
-                and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
+                and pwo.create_time <![CDATA[ >= ]]> #{c.planStartTime}
+                and pwo.create_time <![CDATA[ <= ]]> #{c.planEndTime}
             </if>
             <if test="c.productOrderId != null and c.productOrderId != ''">
                and pwo.product_order_id = #{c.productOrderId}
+            </if>
+            <if test="c.type != null and c.type == 2 and c.currentUserId != null">
+                and exists (
+                    select 1
+                    from product_work_order_rapporteur pwor
+                    where pwor.work_order_id = pwo.id
+                      and pwor.user_id = #{c.currentUserId}
+                )
             </if>
     </select>
     <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
@@ -76,4 +86,23 @@
                 p.product_name,
                 po.nps_no
     </select>
+    <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+        SELECT
+            id,
+            actual_start_time AS planStartTime,
+            plan_quantity
+        FROM
+            product_work_order
+        WHERE
+            actual_start_time &gt;= #{startDate}
+            AND actual_start_time &lt;= #{endDate}
+    </select>
+    <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
+        SELECT SUBSTRING(work_order_no, 3) as work_order_no
+        FROM product_work_order
+        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
+        order by work_order_no  desc
+        limit 1
+        ;
+    </select>
 </mapper>

--
Gitblit v1.9.3