From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
index 4afd715..9295d20 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
@@ -23,12 +23,15 @@
</resultMap>
<sql id="selectApsStandardProcessRouteLineVo">
- select id, route_id, route_num, route_name, start_date, end_date, create_time, org_code, shop_code, productivity_model, design_capacity, del_flag, create_by, update_by, update_time from aps_standard_process_route_line
+ select id, route_id, route_num, route_name, start_date, end_date, create_time, org_code,
+ shop_code, productivity_model, design_capacity, del_flag, create_by, update_by,
+ update_time
+ from aps_standard_process_route_line
</sql>
<select id="selectApsStandardProcessRouteLineList" parameterType="ApsStandardProcessRouteLine" resultMap="ApsStandardProcessRouteLineResult">
<include refid="selectApsStandardProcessRouteLineVo"/>
- <where>
+ <where>
<if test="routeId != null and routeId != ''"> and route_id = #{routeId}</if>
<if test="routeNum != null and routeNum != ''"> and route_num = #{routeNum}</if>
<if test="routeName != null and routeName != ''"> and route_name = #{routeName}</if>
@@ -40,6 +43,7 @@
<if test="designCapacity != null and designCapacity != ''"> and design_capacity = #{designCapacity}</if>
and del_flag = '0'
</where>
+
</select>
<select id="selectApsStandardProcessRouteLineById" parameterType="Long" resultMap="ApsStandardProcessRouteLineResult">
--
Gitblit v1.9.3