From e146067ae373f9385b9ddbb57c6eb7a933bf2561 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 10:10:41 +0800
Subject: [PATCH] 生产工序增加字段

---
 src/main/resources/mapper/technology/TechnologyOperationMapper.xml |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
index 2039849..6b63fa5 100644
--- a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
@@ -14,8 +14,31 @@
         <result column="is_quality" property="isQuality" />
         <result column="type" property="type" />
         <result column="device_ledger_id" property="deviceLedgerId" />
+        <result column="plan_person" property="planPerson" />
+        <result column="executor" property="executor" />
+        <result column="process_type" property="processType" />
         <result column="create_user" property="createUser" />
         <result column="dept_id" property="deptId" />
     </resultMap>
 
+    <select id="listPage" resultType="com.ruoyi.technology.bean.vo.TechnologyOperationVo">
+        select t.*,
+               sp.staff_name as planPersonName,
+               se.staff_name as executorName
+        from technology_operation t
+            left join staff_on_job sp on t.plan_person = sp.id
+            left join staff_on_job se on t.executor = se.id
+        <where>
+            <if test="c.name != null and c.name != ''">
+                and t.name like concat('%', #{c.name}, '%')
+            </if>
+            <if test="c.no != null and c.no != ''">
+                and t.no like concat('%', #{c.no}, '%')
+            </if>
+            <if test="c.type != null">
+                and t.type = #{c.type}
+            </if>
+        </where>
+        order by t.id desc
+    </select>
 </mapper>

--
Gitblit v1.9.3