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 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} - AND OT.DESCRIPTION = #{operationDescription} + AND concat(OT.DESCRIPTION, '(' || C5.VALUE || ')') LIKE '%' ||#{operationDescription}|| '%' 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;