From a00a32e331bbf32ebaf6850150977204d9de381a Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 04 八月 2025 14:44:52 +0800
Subject: [PATCH] 修改每次修变量，由0.1改为1

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index a8921fe..b136531 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -102,7 +102,7 @@
     </select>
 
     <select id="SelectWorkBasicTeamsMp">
-        select * from erp_user_info.`user` WHERE address=#{process}
+        select id,login_name,user_name,address from erp_user_info.`user` WHERE address=#{process}
     </select>
 
     <!--    鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
@@ -298,8 +298,8 @@
 
     <select id="historyTeamsMp">
         SELECT
-            bdp.id,
-            bdp.basic_type,
+            bd.id,
+            bd.basic_type,
             rw.teams  as basic_name,
             bd.basic_name,bd.id AS basic_category,
             rw.process
@@ -540,8 +540,8 @@
 
             left join sd.`order` as o on o.order_id=rw.order_id
         where rw.reviewed_state != 2
-          and rw.reporting_work_time >= #{selectTime1}
-    AND rw.reporting_work_time &lt;  #{selectTime2}
+          and date(rw.reporting_work_time) >= date(#{selectTime1})
+    AND date(rw.reporting_work_time) &lt;=  date(#{selectTime2})
           and position(#{orderId} in rw.order_id)
           and rw.reviewed_state!=-1
           and o.create_order>0
@@ -552,7 +552,8 @@
             and o.order_id regexp #{reportingWork.orderId}
         </if>
         <if test="reportingWork.processId != null and reportingWork.processId != ''">
-            and rw.process_id regexp #{reportingWork.processId}
+
+            and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')
         </if>
         <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
             and o.project regexp #{reportingWork.order.project}

--
Gitblit v1.8.0