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/ApsProcessRouteMapper.xml | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
index d54cd15..5d6a41f 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteMapper">
- <resultMap type="ApsProcessRoute" id="ApsProcessRouteResult">
+ <resultMap type="com.aps.core.domain.ApsProcessRoute" id="ApsProcessRouteResult">
<result property="id" column="id" />
<result property="itemNo" column="item_no" />
<result property="workOrderNo" column="work_order_no" />
@@ -22,13 +22,20 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="standardTime" column="standard_time" />
+ <result property="processOrder" column="process_order" />
+ <result property="workCenter" column="work_center" />
+ <result property="processQty" column="process_qty" />
+ <result property="opStatus" column="op_status" />
+ <result property="opStatus" column="op_status" />
+ <result property="orgCode" column="org_code" />
</resultMap>
<sql id="selectApsProcessRouteVo">
- select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route
+ select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order,work_center from aps_process_route
</sql>
- <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
+ <select id="selectApsProcessRouteList" parameterType="com.aps.core.domain.ApsProcessRoute" resultMap="ApsProcessRouteResult">
<include refid="selectApsProcessRouteVo"/>
<where>
<if test="itemNo != null and itemNo != ''"> and item_no like '%' || #{itemNo} || '%' </if>
@@ -40,15 +47,18 @@
<if test="notStartWorkCount != null "> and not_start_work_count = #{notStartWorkCount}</if>
<if test="completedCount != null "> and completed_count = #{completedCount}</if>
<if test="discardCount != null "> and discard_count = #{discardCount}</if>
- <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>
+ <if test="params.beginIntegrationDay != null and params.beginIntegrationDay != '' and params.endIntegrationDay != null and params.endIntegrationDay != ''"> and integration_day between #{params.beginIntegrationDay} and #{params.endIntegrationDay}</if>
+<!-- <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>-->
<if test="plant != null and plant != ''"> and plant = #{plant}</if>
+ <if test="workCenter != null and workCenter != ''"> and work_center = #{workCenter}</if>
</where>
+ order by process_number asc
</select>
<select id="selectApsProcessRouteById" parameterType="String" resultMap="ApsProcessRouteResult">
</select>
- <insert id="insertApsProcessRoute" parameterType="ApsProcessRoute">
+ <insert id="insertApsProcessRoute" parameterType="com.aps.core.domain.ApsProcessRoute">
insert into aps_process_route
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -68,6 +78,9 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="standardTime != null">standard_time,</if>
+ <if test="processOrder != null">process_order,</if>
+ <if test="workCenter != null">work_center,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -87,10 +100,13 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="standardTime != null">#{standardTime},</if>
+ <if test="processOrder != null">#{processOrder},</if>
+ <if test="workCenter != null">#{workCenter},</if>
</trim>
</insert>
- <update id="updateApsProcessRoute" parameterType="ApsProcessRoute">
+ <update id="updateApsProcessRoute" parameterType="com.aps.core.domain.ApsProcessRoute">
update aps_process_route
<trim prefix="SET" suffixOverrides=",">
<if test="itemNo != null">item_no = #{itemNo},</if>
@@ -109,6 +125,9 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="standardTime != null">standard_time = #{standardTime},</if>
+ <if test="processOrder != null">process_order = #{processOrder},</if>
+ <if test="workCenter != null">work_center = #{workCenter},</if>
</trim>
where id = #{id}
</update>
@@ -123,4 +142,9 @@
#{id}
</foreach>
</delete>
+
+ <select id="selectProcessNameList" parameterType="String" resultMap="ApsProcessRouteResult">
+ select DISTINCT process_name from aps_process_route where org_code = #{orgCode}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3