diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index a90ba26b..ca0ea7e5 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -692,7 +692,7 @@ LEFT JOIN ROUTER_STEP rs ON zsd.ROUTER_BO = rs.ROUTER_BO AND rs.STEP_ID = zsd.STEP_ID LEFT JOIN ROUTER_OPERATION ro ON ro.ROUTER_STEP_BO = rs.HANDLE AND ro.OPERATION_BO = ss.OPERATION_BO LEFT JOIN CUSTOM_FIELDS cf3 ON cf3.HANDLE = ro.HANDLE AND cf3."ATTRIBUTE" = 'PROD_TIME' - INNER JOIN DATA_FIELD df ON df.DATA_FIELD = 'WORK_ORDER' + LEFT JOIN DATA_FIELD df ON df.DATA_FIELD = 'WORK_ORDER' LEFT JOIN DATA_FIELD_LIST dfl ON dfl.DATA_FIELD_BO = df.HANDLE AND dfl.DATA_VALUE = zab.WORK_ORDER LEFT JOIN DATA_FIELD_LIST_T dflt ON dflt.DATA_FIELD_LIST_BO = dfl.HANDLE AND dflt.LOCALE = #{locale} @@ -704,9 +704,9 @@ AND cf.VALUE = #{itemNumber} - AND (dflt.DATA_TAG = #{workOrder} OR - zab.WORK_ORDER = #{workOrder} OR - cf2.VALUE = #{workOrder} + AND (dflt.DATA_TAG like '%${workOrder}%' OR + zab.WORK_ORDER like '%${workOrder}%' OR + cf2.VALUE like '%${workOrder}%' )