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/ApsStandardProcessRouteHeaderMapper.xml | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 91b7341..7747fbe 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
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper">
- <resultMap type="ApsStandardProcessRouteHeader" id="ApsStandardProcessRouteHeaderResult">
+ <resultMap type="com.aps.core.domain.ApsStandardProcessRouteHeader" id="ApsStandardProcessRouteHeaderResult">
<result property="id" column="id" />
<result property="itemCode" column="item_code" />
<result property="drawingNumber" column="drawing_number" />
@@ -13,6 +13,7 @@
<result property="startDate" column="start_date" />
<result property="endDate" column="end_date" />
<result property="orgCode" column="org_code" />
+ <result property="processAllTime" column="process_all_time" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -21,10 +22,12 @@
</resultMap>
<sql id="selectApsStandardProcessRouteHeaderVo">
- select id, route_id, version, start_date, end_date, org_code, del_flag, create_by, create_time, update_by, update_time, item_code, drawing_number from aps_standard_process_route_header
+ select id, route_id, version, start_date, end_date, org_code, del_flag, create_by,
+ create_time, update_by, update_time, item_code, drawing_number, process_all_time
+ from aps_standard_process_route_header
</sql>
- <select id="selectApsStandardProcessRouteHeaderList" parameterType="ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
+ <select id="selectApsStandardProcessRouteHeaderList" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
<include refid="selectApsStandardProcessRouteHeaderVo"/>
<where>
<if test="routeId != null and routeId != ''"> and route_id = #{routeId}</if>
@@ -33,9 +36,9 @@
<if test="endDate != null and endDate != ''"> and end_date = #{endDate}</if>
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
<if test="itemCode != null and itemCode != ''"> and item_code like '%' || #{itemCode} || '%'</if>
- <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">
@@ -43,7 +46,7 @@
where id = #{id}
</select>
- <insert id="insertApsStandardProcessRouteHeader" parameterType="ApsStandardProcessRouteHeader">
+ <insert id="insertApsStandardProcessRouteHeader" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader">
insert into aps_standard_process_route_header
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -73,7 +76,7 @@
</trim>
</insert>
- <update id="updateApsStandardProcessRouteHeader" parameterType="ApsStandardProcessRouteHeader">
+ <update id="updateApsStandardProcessRouteHeader" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader">
update aps_standard_process_route_header
<trim prefix="SET" suffixOverrides=",">
<if test="routeId != null">route_id = #{routeId},</if>
@@ -100,4 +103,22 @@
#{id}
</foreach>
</delete>
+
+ <select id="queryStandardProcessRouteHeaderByPlantAndItemCode" parameterType="String" resultMap="ApsStandardProcessRouteHeaderResult">
+ <include refid="selectApsStandardProcessRouteHeaderVo"/>
+ where del_flag = '0'
+ <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
+ <if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode} </if>
+ </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