From 71f90ed3a2eeea97b20cd095cc34a1f64dac5c81 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 26 十一月 2025 11:21:39 +0800
Subject: [PATCH] 提交 计算方式进度
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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 5464928..7490e80 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -579,7 +579,7 @@
and rw.device_name regexp #{reportingWork.deviceName}
</if>
<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
- and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
</if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
@@ -1118,10 +1118,10 @@
<select id="mesSelectWorkBasicDeviceMp">
SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
on bd.id=bdp.basic_category
- where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
+ where bd.basic_category="process" and bdp.basic_type="device"
</select>
<select id="mesSelectWorkBasicTeamsMp">
- select id,login_name,user_name,address from erp_user_info.`user`
+ select id,login_name,user_name,address from erp_user_info.`user` where address is not null
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0