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/ApsWeldSeamMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index 5cf207c..af28ae3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamMapper">
- <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
+ <resultMap type="com.aps.core.domain.ApsWeldSeam" id="ApsWeldSeamResult">
<result property="id" column="id" />
<result property="workOrderType" column="work_order_type" />
<result property="materialCode" column="material_code" />
@@ -32,7 +32,7 @@
select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
</sql>
- <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
+ <select id="selectApsWeldSeamList" parameterType="com.aps.core.domain.ApsWeldSeam" resultMap="ApsWeldSeamResult">
<include refid="selectApsWeldSeamVo"/>
<where>
<if test="workOrderType != null and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -66,7 +66,7 @@
<include refid="selectApsWeldSeamVo"/>
where work_order_no = #{workOrderNo}
</select>
- <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
+ <insert id="insertApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
insert into aps_weld_seam
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -116,7 +116,7 @@
</trim>
</insert>
- <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
+ <update id="updateApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
update aps_weld_seam
<trim prefix="SET" suffixOverrides=",">
<if test="workOrderType != null">work_order_type = #{workOrderType},</if>
@@ -155,21 +155,45 @@
</delete>
<select id="weldSeamStat" parameterType="java.util.List" resultType="com.aps.core.domain.ApsWeldSeamStatistics">
SELECT produce_year as year,
- produce_month as month,
- production_base as productionBase,
- SUM ( CASE WHEN work_order_type = '0' AND classification = '1' THEN production_quantity ELSE 0 END ) AS pipingOrderRequirement,
- SUM ( CASE WHEN work_order_type = '0' AND classification = '0' THEN production_quantity ELSE 0 END ) AS gasOrderRequirement,
- SUM ( CASE WHEN work_order_type = '1' AND classification = '1' THEN production_quantity ELSE 0 END ) AS pipingPredictionRequirement,
- SUM ( CASE WHEN work_order_type = '1' AND classification = '0' THEN production_quantity ELSE 0 END ) AS gasPredictionRequirement
+ produce_month as month,
+ production_base as productionBase,
+ work_order_type as workOrderType,
+ classification,
+ sum(total_weld_seam) as total
+ FROM aps_weld_seam where del_flag='0'
+ GROUP BY produce_year, produce_month, production_base, work_order_type, classification
+ </select>
+ <update id="removeLastBatch" parameterType="String">
+ update aps_weld_seam set del_flag='1' where del_flag='0'
+ </update>
+
+ <select id="weldSeamEcharts" parameterType="java.util.List" resultType="map">
+
+ SELECT
+ seam.produce_year,
+ seam.produce_month,
+ seam.production_base,
+ workOrderType.dict_label AS work_order_name,
+ classification.dict_label AS classification_name,
+ SUM ( seam.total_weld_seam ) AS total_weld_seam
FROM
- "aps_weld_seam"
- where 1=1
- <foreach item="item" index="index" collection="list" separator=",">
- or ( produce_year=#{item.produceYear} and produce_month=#{item.produceMonth} and production_base=#{item.productionBase})
- </foreach>
+ aps_weld_seam seam
+ LEFT JOIN sys_dict_data workOrderType ON seam.work_order_type = workOrderType.dict_value
+ AND workOrderType.dict_type = 'aps_weld_work_order_type'
+ LEFT JOIN sys_dict_data classification ON seam.classification = classification.dict_value
+ AND classification.dict_type = 'aps_weld_classification'
+ <where>
+ seam.del_flag = '0'
+ <foreach item="item" index="index" collection="list" separator=" OR " open="and (" close=") ">
+ produce_year = #{item.produceYear} and produce_month = #{item.produceMonth}
+ </foreach>
+ </where>
GROUP BY
- produce_year,
- produce_month,
- production_base
+ seam.produce_year,
+ seam.produce_month,
+ seam.production_base,
+ workOrderType.dict_label,
+ classification.dict_label
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3