订单列表报错修复、采购订单流程修改

src/main/java/com/mmc/oms/service/uav/impl/UavPOServiceImpl.java

@@ -86,7 +86,7 @@ public class UavPOServiceImpl implements UavPOService {
     @Transactional
     public void updateUavPOrderStatus(Integer id, UavOrderStatus uavOrderStatus){
         Integer nextCode = null;
-        if (uavOrderStatus.getNextCode().equals(UavOrderStatus.PAYING.getCode())) {
+        if (uavOrderStatus.getCode().equals(UavOrderStatus.PAYING.getCode())) {
             nextCode = 420;
         }else {
             nextCode = uavOrderStatus.getNextCode();

src/main/resources/mapper/uav/UavOrderDao.xml

@@ -212,7 +212,7 @@
             and #{endTime} >= create_time
         </if>
         <if test="show != null">
-            and #{show} = show
+            and show = #{show}
         </if>
     </select>
 
@@ -243,7 +243,7 @@
             and #{endTime} >= uo.create_time
         </if>
         <if test="show != null">
-            and #{show} = show
+            and show = #{show}
         </if>
         order by uo.id desc
         limit #{pageNo}, #{pageSize}