增加 and p.IfOrder1ed = 'T' 有效的订单

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -107,7 +107,7 @@
     </update>
 
     <update id="addAReviewComment">
-        update loadbills set ApplyDate = CURRENT_TIMESTAMP, audit2Desc = #{audit2Desc} where SrcEntityID = #{entityId} and SrcLineNo = #{lineNo}
+        update loadbills set ApplyDate = CURRENT_TIMESTAMP, auditDesc = #{audit2Desc} where SrcEntityID = #{entityId} and SrcLineNo = #{lineNo}
     </update>
     <update id="approvedTaskListV1">
         UPDATE wf_TaskList SET status= #{status} WHERE SYSID = '1' AND ACTID =#{actId} AND ENTITYID = #{entityId}
@@ -205,7 +205,7 @@
                     and p.ifStarted = 'B'
                 </if>
             </if>
-            and ((b.CarID=-1) or ((b.CarID &lt;&gt; -1)))
+            and ((b.CarID=-1) or ((b.CarID &lt;&gt; -1)))  and p.IfOrder1ed = 'T'
             <if test="dataStart != null and dataStart != '' and dataEnd != null and dataEnd != ''">
                 and b.BillDate >= #{dataStart, jdbcType=VARCHAR} and b.BillDate &lt;= #{dataEnd, jdbcType=VARCHAR}
             </if>