From c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 12 五月 2025 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
index 7b152eb..4246e11 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
@@ -39,6 +39,7 @@
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
and del_flag = '0'
</where>
+ ORDER BY version desc
</select>
<select id="selectApsStandardProcessRouteHeaderById" parameterType="Long" resultMap="ApsStandardProcessRouteHeaderResult">
@@ -112,4 +113,15 @@
and del_flag = '0'
</where>
</select>
+
+ <select id="selectProcessRouteStandardTimeData" parameterType="String" resultType="com.alibaba.fastjson2.JSONObject">
+ select hd.item_code,sum(standard_time) as standardTime,hd.org_code
+ from aps_standard_process_route_line as ln
+ left join aps_standard_process_route_header as hd on ln.route_id=hd.route_id
+ where ln.del_flag='0' and hd.del_flag='0'
+ <if test="orgCode != null and orgCode != ''">
+ and hd.org_code = #{orgCode}
+ </if>
+ group by hd.item_code,hd.org_code
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3