From c9a5c5c9a57abee05470e958e4dc161809f73cf4 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期五, 12 一月 2024 09:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
index b3342ef..43292df 100644
--- a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
@@ -15,7 +15,7 @@
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopCode" column="workshop_code" />
<result property="lineCode" column="line_code" />
- <result property="processes" column="processes" />
+ <result property="processesCode" column="processes_code" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createUser" column="create_user" />
@@ -29,7 +29,7 @@
</resultMap>
<sql id="selectEmEquipmentArchivesVo">
- select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
+ select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes_code, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
</sql>
<select id="selectEmEquipmentArchivesList" parameterType="EmEquipmentArchives" resultMap="EmEquipmentArchivesResult">
@@ -44,7 +44,7 @@
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
<if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
<if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
- <if test="processes != null and processes != ''"> and processes = #{processes}</if>
+ <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -73,7 +73,7 @@
<if test="equipmentTypeName != null">equipment_type_name,</if>
<if test="workshopCode != null">workshop_code,</if>
<if test="lineCode != null">line_code,</if>
- <if test="processes != null">processes,</if>
+ <if test="processesCode != null">processes_code,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createUser != null">create_user,</if>
@@ -96,7 +96,7 @@
<if test="equipmentTypeName != null">#{equipmentTypeName},</if>
<if test="workshopCode != null">#{workshopCode},</if>
<if test="lineCode != null">#{lineCode},</if>
- <if test="processes != null">#{processes},</if>
+ <if test="processesCode != null">#{processesCode},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createUser != null">#{createUser},</if>
@@ -122,7 +122,7 @@
<if test="equipmentTypeName != null">equipment_type_name = #{equipmentTypeName},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="lineCode != null">line_code = #{lineCode},</if>
- <if test="processes != null">processes = #{processes},</if>
+ <if test="processesCode != null">processes_code = #{processesCode},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createUser != null">create_user = #{createUser},</if>
--
Gitblit v1.9.3