From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderFlowMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderFlowMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderFlowMapper.xml
index e93794d..1ef3543 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderFlowMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderFlowMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.sxkj.gd.workOrder.mapper.GdWorkOrderFlowMapper">
+<mapper namespace="org.sxkj.gd.workorder.mapper.GdWorkOrderFlowMapper">
<!-- 通用查询映射结果 -->
<resultMap id="gdWorkOrderFlowResultMap" type="org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity">
@@ -22,7 +22,15 @@
<select id="selectGdWorkOrderFlowPage" resultMap="gdWorkOrderFlowResultMap">
- select * from ja_gd_work_order_flow where is_deleted = 0
+ select * from ja_gd_work_order_flow
+ <where>
+ <if test="param2.type != null and param2.type != ''">
+ and type = #{param2.type}
+ </if>
+ <if test="param2.workOrderId != null and param2.workOrderId != ''">
+ and workOrderId = #{param2.workOrderId}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3