From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
index 4b097a5..1f974aa 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
@@ -261,13 +261,14 @@
l.route_name as process_name,
l.route_num as process_number,
l.standard_time,
- m.domain,
- s.work_shop as workshop
+ string_agg(DISTINCT m.domain, ';') as domain,
+ string_agg(DISTINCT s.work_shop, ';') as workshop
FROM aps_gas_pipeline_prediction p
JOIN aps_standard_process_route_header h ON p.material_code = h.item_code AND p.factory = h.org_code
JOIN aps_standard_process_route_line l ON h.route_id = l.route_id
LEFT JOIN aps_material_product_group_management m ON p.material_code = m.material_code AND p.factory = m.factory
LEFT JOIN aps_standard_process s ON l.route_name = s.process_name
+ GROUP BY p.id, p.material_code, p.factory, p.predict_quantity, p.predict_date, h.route_id, l.route_name, l.route_num, l.standard_time
ORDER BY p.material_code, l.route_num
</select>
@@ -283,12 +284,13 @@
r.process_name,
r.process_number,
r.standard_time,
- m.domain,
- s.work_shop as workshop
+ string_agg(DISTINCT m.domain, ';') as domain,
+ string_agg(DISTINCT s.work_shop, ';') as workshop
FROM aps_gas_pipeline_mo mo
JOIN aps_process_route r ON mo.mo = r.work_order_no
LEFT JOIN aps_material_product_group_management m ON mo.material_code = m.material_code AND mo.factory = m.factory
LEFT JOIN aps_standard_process s ON r.process_name = s.process_name
+ GROUP BY mo.id, mo.mo, mo.material_code, mo.factory, mo.quantity, mo.plan_end, r.process_name, r.process_number, r.standard_time
ORDER BY mo.mo, r.process_number
</select>
@@ -399,4 +401,65 @@
process_plan_start_day
</select>
+ <!-- 鏌ヨ鎵�鏈夋墜宸ユ皵浣撳伐鍗曟暟鎹� -->
+ <select id="selectAllMoData" resultType="java.util.Map">
+ SELECT
+ id,
+ mo,
+ factory,
+ material_code,
+ plan_end,
+ quantity
+ FROM aps_gas_pipeline_mo
+ </select>
+
+ <!-- 鏌ヨ鍩虹缁熻鏁版嵁锛堜笉鍖呭惈鏃堕棿闄愬埗锛夛紝鐢ㄤ簬鑾峰彇鎵�鏈夊彲鑳界殑宸ュ簭鍚嶅拰杞﹂棿 -->
+ <select id="selectBaseStatData" parameterType="java.util.Map" resultType="java.util.Map">
+ SELECT DISTINCT
+ process_name AS "processName",
+ plant AS "plant",
+ major AS "major",
+ workshop AS "workshop"
+ FROM aps_gas_piping_route_stat
+ <where>
+ <if test="plants != null and plants.size() > 0">
+ AND plant IN
+ <foreach collection="plants" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="plant != null and plant != ''">
+ AND plant = #{plant}
+ </if>
+ <if test="majors != null and majors.size() > 0">
+ AND major IN
+ <foreach collection="majors" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="major != null and major != ''">
+ AND major = #{major}
+ </if>
+ <if test="workshops != null and workshops.size() > 0">
+ AND workshop IN
+ <foreach collection="workshops" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="workshop != null and workshop != ''">
+ AND workshop = #{workshop}
+ </if>
+ </where>
+ </select>
+
+ <!-- 鏌ヨ鎵�鏈夊幓閲嶇殑宸ュ簭鍚嶇О -->
+ <select id="selectDistinctProcessNames" resultType="java.lang.String">
+ SELECT DISTINCT process_name FROM aps_gas_piping_route_stat WHERE process_name IS NOT NULL AND process_name != ''
+ </select>
+
+ <!-- 鏌ヨ鎵�鏈夊幓閲嶇殑杞﹂棿 -->
+ <select id="selectDistinctWorkshops" resultType="java.lang.String">
+ SELECT DISTINCT workshop FROM aps_gas_piping_route_stat WHERE workshop IS NOT NULL AND workshop != ''
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3