From c7b6fb8f2303e4a35f92b18c1f2ef664dabb4905 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:08 +0800
Subject: [PATCH] feat: 添加同步记录,手动与自动不能同时拉取数据

---
 src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 9c85b11..1fc9456 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -9,37 +9,39 @@
         <id property="id" column="id"/>
         <result property="formInstanceId" column="form_instance_id"/>
         <result property="serialNo" column="serial_no"/>
-        <result property="title" column="title"/>
-        <result property="originatorUserId" column="originator_user_id"/>
-        <result property="originatorName" column="originator_name"/>
-        <result property="bizCreateTime" column="biz_create_time"/>
-        <result property="projectName" column="project_name"/>
-        <result property="batchNo" column="batch_no"/>
-        <result property="contactPerson" column="contact_person"/>
-        <result property="extText1" column="ext_text1"/>
-        <result property="extText2" column="ext_text2"/>
+        <result property="applyNo" column="apply_no"/>
+        <result property="customerName" column="customer_name"/>
         <result property="materialCode" column="material_code"/>
-        <result property="materialCategory" column="material_category"/>
-        <result property="specDesc" column="spec_desc"/>
-        <result property="gradeType" column="grade_type"/>
+        <result property="productName" column="product_name"/>
+        <result property="productSpec" column="product_spec"/>
         <result property="length" column="length"/>
         <result property="width" column="width"/>
-        <result property="thickness" column="thickness"/>
+        <result property="height" column="height"/>
         <result property="quantity" column="quantity"/>
         <result property="volume" column="volume"/>
-        <result property="dateStart" column="date_start"/>
-        <result property="dateEnd" column="date_end"/>
-        <result property="associationReceipt" column="association_receipt"/>
+        <result property="strength" column="strength"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="submitter" column="submitter"/>
+        <result property="submitOrg" column="submit_org"/>
+        <result property="remarkOne" column="remark_one"/>
+        <result property="remarkTwo" column="remark_two"/>
+        <result property="creatorName" column="creator_name"/>
+        <result property="modifierName" column="modifier_name"/>
+        <result property="formCreatedTime" column="form_created_time"/>
+        <result property="formModifiedTime" column="form_modified_time"/>
         <result property="dataSyncType" column="data_sync_type"/>
         <result property="dataSourceType" column="data_source_type"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="totalCount" column="total_count"/>
     </resultMap>
 
-    <select id="listPage" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
-        SELECT
-        production_plan.*
+
+    <select id="listPage" resultMap="ProductionPlanResultMap">
+        SELECT *
         FROM production_plan
-        where 1=1
+        WHERE 1 = 1
     </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3