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/ApsWorkOrderProcessMapper.xml |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
index 9565f61..1360735 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.aps.job.mapper.ApsWorkOrderProcessMapper">
     
-    <resultMap type="ApsWorkOrderProcess" id="ApsWorkOrderProcessResult">
+    <resultMap type="com.aps.job.domain.ApsWorkOrderProcess" id="ApsWorkOrderProcessResult">
         <result property="id"    column="id"    />
         <result property="itemCode"    column="item_code"    />
         <result property="docNo"    column="doc_no"    />
@@ -18,15 +18,19 @@
         <result property="scrapQty"    column="scrap_qty"    />
         <result property="opStatus"    column="op_status"    />
         <result property="org"    column="org"    />
-        <result property="org_code"    column="org_code"    />
-        <result property="work_center"    column="workCenter"    />
+        <result property="orgCode"    column="org_code"    />
+        <result property="workCenter"    column="workCenter"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectApsWorkOrderProcessVo">
-        select id, item_code, doc_no, op_num, op_id, process_name, standard_time, paln_start_date, plan_complete_date, process_qty, scrap_qty, op_status, org, org_code, work_center from aps_work_order_process
+        select id, item_code, doc_no, op_num, op_id, process_name, standard_time, paln_start_date, plan_complete_date, process_qty, scrap_qty, op_status, org, org_code, work_center, create_by, create_time, update_by, update_time from aps_work_order_process
     </sql>
 
-    <select id="selectApsWorkOrderProcessList" parameterType="ApsWorkOrderProcess" resultMap="ApsWorkOrderProcessResult">
+    <select id="selectApsWorkOrderProcessList" parameterType="com.aps.job.domain.ApsWorkOrderProcess" resultMap="ApsWorkOrderProcessResult">
         <include refid="selectApsWorkOrderProcessVo"/>
         <where>  
             <if test="itemCode != null  and itemCode != ''"> and item_code = #{itemCode}</if>
@@ -51,7 +55,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertApsWorkOrderProcess" parameterType="ApsWorkOrderProcess">
+    <insert id="insertApsWorkOrderProcess" parameterType="com.aps.job.domain.ApsWorkOrderProcess">
         insert into aps_work_order_process
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -69,6 +73,8 @@
             <if test="org != null">org,</if>
             <if test="orgCode != null">org_code,</if>
             <if test="workCenter != null">work_center,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -86,10 +92,12 @@
             <if test="org != null">#{org},</if>
             <if test="orgCode != null">#{orgCode},</if>
             <if test="workCenter != null">#{work_center},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 
-    <update id="updateApsWorkOrderProcess" parameterType="ApsWorkOrderProcess">
+    <update id="updateApsWorkOrderProcess" parameterType="com.aps.job.domain.ApsWorkOrderProcess">
         update aps_work_order_process
         <trim prefix="SET" suffixOverrides=",">
             <if test="itemCode != null">item_code = #{itemCode},</if>
@@ -106,6 +114,8 @@
             <if test="org != null">org = #{org},</if>
             <if test="orgCode != null">org_code = #{orgCode},</if>
             <if test="workCenter != null">work_center = #{workCenter},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -144,13 +154,16 @@
             op_status = #{item.opStatus},
             org = #{item.org},
             org_code = #{item.orgCode},
-            work_center = #{item.workCenter}
+            work_center = #{item.workCenter},
+            update_by = #{item.updateBy},
+            update_time = #{item.updateTime}
             WHERE id = #{item.id}
         </foreach>
     </update>
 
     <insert id="insertApsWorkOrderProcessBatch">
         INSERT INTO aps_work_order_process (
+        id,
         item_code,
         doc_no,
         op_num,
@@ -164,10 +177,13 @@
         op_status,
         org,
         org_code,
-        work_center
+        work_center,
+        create_by,
+        create_time
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
+            #{item.id},
             #{item.itemCode},
             #{item.docNo},
             #{item.opNum},
@@ -181,7 +197,9 @@
             #{item.opStatus},
             #{item.org},
             #{item.orgCode},
-            #{item.workCenter}
+            #{item.workCenter},
+            #{item.createBy},
+            #{item.createTime}
             )
         </foreach>
     </insert>
@@ -203,7 +221,8 @@
             op_status,
             plant,
             org_code,
-            work_center
+            work_center,
+            create_time
         )
         SELECT
             id,
@@ -220,11 +239,17 @@
             op_status,
             org,
             org_code,
-            work_center
+            work_center,
+            now()
         FROM aps_work_order_process
     </insert>
 
     <!-- 鍒犻櫎 aps_process_route 琛ㄤ腑鐨勬暟鎹� -->
+    <delete id="deleteApsWorkOrderProcess">
+        DELETE FROM aps_work_order_process
+    </delete>
+
+    <!-- 鍒犻櫎 aps_process_route 琛ㄤ腑鐨勬暟鎹� -->
     <delete id="deleteApsProcessRoute">
         DELETE FROM aps_process_route
     </delete>

--
Gitblit v1.9.3