update 跨车间转序明细

meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml

@@ -825,6 +825,7 @@
             <if test="workOrder!=null"> AND C1.VALUE LIKE  '%'||#{workOrder}||'%'</if>
             <if test="shopOrder!=null"> AND SO.SHOP_ORDER=#{shopOrder}</if>
             <if test="sfc!=null"> AND ZSD.SFC  LIKE  '%'||#{sfc}||'%'</if>
+            <if test="comfirmUser!=null"> AND ZNU.FULL_NAME = #{comfirmUser}</if>
             <if test="startFromDate != null">
                 AND ZLT.COM_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')
             </if>
@@ -837,8 +838,14 @@
             <if test="completeToDate != null">
                 AND ZLT.OTHER4  &lt;=  TO_DATE(#{completeToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
             </if>
-
+            <choose>
+                <when test="status != 'NEW'" >
                     ORDER BY ZLT.COM_DATE_TIME DESC
+                </when>
+                <otherwise>
+                    ORDER BY ZLT.CREATED_DATE_TIME
+                </otherwise>
+            </choose>
 
         </where>