From 51aeb12b0bd3030931b22c666b9c83e7ee51c800 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 17:18:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml |   14 ++++++++++++--
 1 files changed, 12 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 9f94cbf..1965e12 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
@@ -20,18 +20,20 @@
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="routeCode"    column="route_code"    />
+        <result property="standardTime"    column="standard_time"    />
     </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
+               update_time, route_code, standard_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>
@@ -43,6 +45,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">
@@ -119,4 +122,11 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectTotalStandTime" parameterType="String"  resultMap="ApsStandardProcessRouteLineResult">
+        select sum(standard_time) as standard_time
+        from aps_standard_process_route_line
+        where route_id = #{routeId}
+        ;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3