From 3128bc3f58135760a8c664e7ef3261e08bb5eefc Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Fri, 10 Feb 2023 13:23:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B4=BE=E5=B7=A5=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=AF=A6=E6=83=85=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/anomaly/dto/RouterBpmVO.java   |  1 +
 .../src/main/resources/mapper/SfcDispatchMapper.xml  |  2 +-
 .../foreverwin/mesnac/meapi/dto/RouterStepDto.java   | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/RouterBpmVO.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/RouterBpmVO.java
index c8938e05..fac9bad9 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/RouterBpmVO.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/RouterBpmVO.java
@@ -19,5 +19,6 @@ public class RouterBpmVO {
     private String routerType;
     private String routerBo;
     private String site;
+    private String sfc;
     private List<RouterStepDto> routerStep;
 }
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index b2ebf858..e9aa1a8c 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -865,7 +865,7 @@
             AND SD.OPERATION = #{operation}
         </if>
         <if test="operationDescription != null and operationDescription != ''">
-            AND OT.DESCRIPTION = #{operationDescription}
+            AND concat(OT.DESCRIPTION, '(' || C5.VALUE || ')') LIKE '%' ||#{operationDescription}|| '%'
         </if>
         <if test="sfc != null and sfc != ''">
             AND SD.SFC = #{sfc}
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java
index 4da96b1b..56da74ea 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java
@@ -11,6 +11,18 @@ public class RouterStepDto extends RouterStep {
    private String repairTime;
    @TableField(exist = false)
    private String pictureAddress;
+   @TableField(exist = false)
+   private String stepId;
+
+   @Override
+   public String getStepId() {
+      return stepId;
+   }
+
+   @Override
+   public void setStepId(String stepId) {
+      this.stepId = stepId;
+   }
 
    public String getPictureAddress() {
       return pictureAddress;