From 7cd9c2faa381dea97ef7902e7aaf6da8cdc6c0c0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 27 八月 2026 18:51:05 +0800
Subject: [PATCH] fix: 修复部门查询报错
---
src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
index 6797e1a..f50c8b9 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
@@ -12,8 +12,111 @@
<result column="update_time" property="updateTime" />
<result column="drag_sort" property="dragSort" />
<result column="is_quality" property="isQuality" />
+ <result column="type" property="type" />
+ <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="pageTechnologyRoutingOperation" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo">
+ select tro.*,
+ top2.name as technologyOperationName,
+ p.product_name as productName,
+ pm.model,
+ pm.model as specificationName,
+ pm.unit,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
+ from technology_routing_operation tro
+ left join technology_operation top2 on tro.technology_operation_id = top2.id
+ left join product_model pm on tro.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join staff_on_job sp on tro.plan_person = sp.id
+ left join staff_on_job se on tro.executor = se.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and tro.id = #{c.id}
+ </if>
+ <if test="c.technologyRoutingId != null">
+ and tro.technology_routing_id = #{c.technologyRoutingId}
+ </if>
+ <if test="c.routeId != null">
+ and tro.technology_routing_id = #{c.routeId}
+ </if>
+ <if test="c.productModelId != null">
+ and tro.product_model_id = #{c.productModelId}
+ </if>
+ <if test="c.technologyOperationId != null">
+ and tro.technology_operation_id = #{c.technologyOperationId}
+ </if>
+ <if test="c.isQuality != null">
+ and tro.is_quality = #{c.isQuality}
+ </if>
+ </if>
+ </where>
+ order by tro.drag_sort asc, tro.id asc
+ </select>
+
+ <select id="listTechnologyRoutingOperation" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo">
+ select tro.*,
+ top2.name as technologyOperationName,
+ p.product_name as productName,
+ pm.model,
+ pm.model as specificationName,
+ pm.unit,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
+ from technology_routing_operation tro
+ left join technology_operation top2 on tro.technology_operation_id = top2.id
+ left join product_model pm on tro.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join staff_on_job sp on tro.plan_person = sp.id
+ left join staff_on_job se on tro.executor = se.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and tro.id = #{c.id}
+ </if>
+ <if test="c.technologyRoutingId != null">
+ and tro.technology_routing_id = #{c.technologyRoutingId}
+ </if>
+ <if test="c.routeId != null">
+ and tro.technology_routing_id = #{c.routeId}
+ </if>
+ <if test="c.productModelId != null">
+ and tro.product_model_id = #{c.productModelId}
+ </if>
+ <if test="c.technologyOperationId != null">
+ and tro.technology_operation_id = #{c.technologyOperationId}
+ </if>
+ <if test="c.isQuality != null">
+ and tro.is_quality = #{c.isQuality}
+ </if>
+ </if>
+ </where>
+ order by tro.drag_sort asc, tro.id asc
+ </select>
+
+ <select id="getTechnologyRoutingOperationInfo" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo">
+ select tro.*,
+ top2.name as technologyOperationName,
+ p.product_name as productName,
+ pm.model,
+ pm.model as specificationName,
+ pm.unit,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
+ from technology_routing_operation tro
+ left join technology_operation top2 on tro.technology_operation_id = top2.id
+ left join product_model pm on tro.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join staff_on_job sp on tro.plan_person = sp.id
+ left join staff_on_job se on tro.executor = se.id
+ where tro.id = #{id}
+ limit 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3