|
@@ -785,7 +785,7 @@
|
|
|
LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
|
|
|
WHERE
|
|
|
- TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
|
|
|
+ TTTR.RESULT_TIME_TYPE in (1,3) and TTTR.INSERT_USERNAME =#{userId}
|
|
|
<if test="orderType!=null and orderType==21">
|
|
|
AND OO.ORDER_TYPE IN (21,11)
|
|
|
</if>
|