From 002a61cd8b5a4239d357a2add1fda2c8c433cda6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 17:28:34 +0800
Subject: [PATCH] 钣金计划大表-导出功能调整

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
index 3292fc1..f78c192 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
@@ -16,10 +16,15 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="processNumber"    column="process_number"    />
+        <result property="workCenter"    column="work_center"    />
+
     </resultMap>
 
     <sql id="selectApsPlateProcessShopStatVo">
-        select id, doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time, update_by, update_time from aps_plate_process_shop_stat
+        select id, doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time, update_by, update_time,
+               process_number,work_center
+        from aps_plate_process_shop_stat
     </sql>
 
     <select id="selectApsPlateProcessShopStatList" parameterType="ApsPlateProcessShopStat" resultMap="ApsPlateProcessShopStatResult">
@@ -30,7 +35,10 @@
             <if test="shopName != null  and shopName != ''"> and shop_name = #{shopName}</if>
             <if test="planStartDate != null  and planStartDate != ''"> and plan_start_date = #{planStartDate}</if>
             <if test="planEndDate != null  and planEndDate != ''"> and plan_end_date = #{planEndDate}</if>
-             and del_flag='0'
+
+            <if test="processNumber != null  and processNumber != ''"> and process_number = #{processNumber}</if>
+            <if test="workCenter != null  and workCenter != ''"> and work_center = #{workCenter}</if>
+            and del_flag='0'
         </where>
     </select>
     
@@ -52,6 +60,8 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="processNumber != null">process_number,</if>
+            <if test="workCenter != null">work_center,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="docNo != null">#{docNo},</if>
@@ -64,6 +74,8 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="processNumber != null">#{processNumber},</if>
+            <if test="workCenter != null">#{workCenter},</if>
          </trim>
     </insert>
 
@@ -100,7 +112,9 @@
 
     <insert id="batchInsert" parameterType="java.util.List">
         insert into aps_plate_process_shop_stat
-        (doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time)
+        (doc_no, shop_code, shop_name, plan_start_date, plan_end_date, del_flag, create_by, create_time,
+         process_number, work_center
+        )
         values
         <foreach collection="list" item="item" separator=",">
         (
@@ -111,7 +125,9 @@
             #{item.planEndDate},
             #{item.delFlag},
             #{item.createBy},
-            #{item.createTime}
+            #{item.createTime},
+            #{item.processNumber},
+            #{item.workCenter}
         )
         </foreach>
     </insert>

--
Gitblit v1.9.3