From 981c563b223ee69b47fc5db56b35c5959c30a625 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期五, 11 四月 2025 15:37:05 +0800
Subject: [PATCH] 工艺路线字段调整
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..9e8a96a 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
@@ -22,10 +22,12 @@
<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" />
</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 from aps_process_route
</sql>
<select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
@@ -40,7 +42,8 @@
<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>
</where>
</select>
@@ -68,6 +71,8 @@
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -87,6 +92,8 @@
<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>
</trim>
</insert>
@@ -109,6 +116,8 @@
<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>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3