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-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
index 8e82da4..32367af 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.job.mapper.ApsWorkOrderJobMapper">
- <resultMap type="ApsWorkOrderJob" id="ApsWorkOrderJobResult">
+ <resultMap type="com.aps.job.domain.ApsWorkOrderJob" id="ApsWorkOrderJobResult">
<result property="id" column="id" />
<result property="orderId" column="order_id" />
<result property="docNo" column="doc_no" />
@@ -41,6 +41,8 @@
<result property="nextOpName" column="next_op_name" />
<result property="lowOrderCode" column="low_order_code" />
<result property="orderCreateTime" column="order_create_time" />
+ <result property="approveOn" column="approve_on" />
+ <result property="startWorkDate" column="start_work_date" />
</resultMap>
<sql id="selectApsWorkOrderJobVo">
@@ -48,11 +50,11 @@
doc_status, item_code, item_figure, item_figure_version, pruduct_qty, work_qty, op_num, work_center,
dept, start_date, complete_date, next_dept, is_hold_release, is_out_source, org, page_num, page_index,
del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name,
- low_order_code, order_create_time
+ low_order_code, order_create_time, approve_on, start_work_date
from aps_work_order_job
</sql>
- <select id="selectApsWorkOrderJobList" parameterType="ApsWorkOrderJob" resultMap="ApsWorkOrderJobResult">
+ <select id="selectApsWorkOrderJobList" parameterType="com.aps.job.domain.ApsWorkOrderJob" resultMap="ApsWorkOrderJobResult">
<include refid="selectApsWorkOrderJobVo"/>
<where>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
@@ -87,7 +89,7 @@
</where>
</select>
- <select id="selectApsWorkOrderJobListDocNoNotNull" parameterType="ApsWorkOrderJob" resultMap="ApsWorkOrderJobResult">
+ <select id="selectApsWorkOrderJobListDocNoNotNull" parameterType="com.aps.job.domain.ApsWorkOrderJob" resultMap="ApsWorkOrderJobResult">
<include refid="selectApsWorkOrderJobVo"/>
<where>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
@@ -128,7 +130,7 @@
where id = #{id}
</select>
- <insert id="insertApsWorkOrderJob" parameterType="ApsWorkOrderJob" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertApsWorkOrderJob" parameterType="com.aps.job.domain.ApsWorkOrderJob" useGeneratedKeys="true" keyProperty="id">
insert into aps_work_order_job
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if>
@@ -204,7 +206,7 @@
</trim>
</insert>
- <update id="updateApsWorkOrderJob" parameterType="ApsWorkOrderJob">
+ <update id="updateApsWorkOrderJob" parameterType="com.aps.job.domain.ApsWorkOrderJob">
update aps_work_order_job
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
@@ -295,7 +297,9 @@
op_status,
next_op_name,
low_order_code,
- order_create_time
+ order_create_time,
+ approve_on,
+ start_work_date
</trim>
values
<foreach collection="list" item="job" separator=",">
@@ -336,7 +340,9 @@
#{job.opStatus},
#{job.nextOpName},
#{job.lowOrderCode},
- #{job.orderCreateTime}
+ #{job.orderCreateTime},
+ #{job.approveOn},
+ #{job.startWorkDate}
)
</foreach>
</insert>
@@ -401,7 +407,7 @@
plan_start_day,plan_end_day,next_process_deparment,
is_suspended,is_outsourcing,account,
id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
- professional_affiliation,order_create_time
+ professional_affiliation,order_create_time,approve_on,start_work_date,low_order_code
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -411,9 +417,12 @@
op_num,work_center,dept,
start_date,complete_date,next_dept,
is_hold_release,is_out_source,org_code,
- order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
- case when low_order_code='0' then 'main' else 'sub' end as professional_affiliation,
- order_create_time
+ cast(order_id as bigint) as id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
+ (case when low_order_code='0' then 'main' else 'sub' end ) as professional_affiliation,
+ order_create_time,
+ approve_on,
+ start_work_date,
+ low_order_code
from aps_work_order_job
where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (item_code like 'M03%' or item_code like 'M04%'or item_code like 'A75%')
@@ -433,7 +442,11 @@
process_number,work_center,department,
plan_start_day,plan_end_day,next_process_deparment,
is_suspended,is_outsourcing,account,
- id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,plan_type
+ id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,plan_type,
+ order_create_time,
+ approve_on,
+ start_work_date,
+ low_order_code
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -444,9 +457,17 @@
start_date,complete_date,next_dept,
is_hold_release,is_out_source,org_code,
order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
- case when substr(item_code,0,4)='A65' then 'gas' else 'piping' end as plan_type
+ case when substr(item_code,0,4)='A65' then 'gas' else 'piping' end as plan_type,
+ order_create_time,
+ approve_on,
+ start_work_date,
+ low_order_code
from aps_work_order_job
where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (item_code like 'A65%' or item_code like 'W%'));
</insert>
+
+ <delete id="deleteAllWorkOrderJob" >
+ delete from aps_work_order_job where del_flag in ('0','1')
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3