From 981c563b223ee69b47fc5db56b35c5959c30a625 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期五, 11 四月 2025 15:37:05 +0800
Subject: [PATCH] 工艺路线字段调整

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml
index 213f945..c5dd261 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml
@@ -24,12 +24,12 @@
         select id, resource_group_name, devices_quantity, theory_hours, rest_days, theory_capacity, request_date, del_flag, create_by, create_time, update_by, update_time, plant from aps_resource_group
     </sql>
 
-    <select id="selectApsResourceGroupList" parameterType="ApsResourceGroupParam" resultMap="ApsResourceGroupResult">
+    <select id="selectApsResourceGroupList" parameterType="ApsResourceGroup" resultMap="ApsResourceGroupResult">
         <include refid="selectApsResourceGroupVo"/>
         <where>  
-            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName|| '%')</if>
+            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName}|| '%'</if>
 
-            <if test="beginRequestDate != null and beginRequestDate != '' and endRequestDate != null and endRequestDate != ''"> and request_date between #{beginRequestDate} and #{endRequestDate}</if>
+            <if test="params.beginRequestDate != null and params.beginRequestDate != '' and params.endRequestDate != null and params.endRequestDate != ''"> and request_date between #{params.beginRequestDate} and #{params.endRequestDate}</if>
             <!--<if test="plant != null  and plant != ''"> and plant = #{plant}</if>
             <if test="devicesQuantity != null "> and devices_quantity = #{devicesQuantity}</if>
             <if test="theoryHours != null "> and theory_hours = #{theoryHours}</if>

--
Gitblit v1.9.3