采购订单sql修复

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

@@ -113,7 +113,7 @@
     <select id="getUavPOrder" resultMap="uavPOResultMap">
         select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
         from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
-        where id = #{id}
+        where upo.id = #{id}
     </select>
 
     <select id="listPurchaseOrder" resultMap="uavPOResultMap" parameterType="com.mmc.oms.model.qo.uav.UavPOrderQO">
@@ -121,42 +121,42 @@
         from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
         where 1 = 1
         <if test="keyword != null">
-            and uo.order_no = #{orderNo}
+            and uo.order_no = #{keyword}
         </if>
         <if test="thirdBackUserAccountId != null">
-            and third_user_account_id = #{thirdBackUserAccountId}
+            and upo.third_user_account_id = #{thirdBackUserAccountId}
         </if>
         <if test="statusCode != null">
-            and status_code = #{statusCode}
+            and upo.status_code = #{statusCode}
         </if>
         <if test="startTime != null">
-            and create_time >= #{startTime}
+            and upo.create_time >= #{startTime}
         </if>
         <if test="endTime != null">
-            and #{endTime} >= create_time
+            and #{endTime} >= upo.create_time
         </if>
-        order by id desc
+        order by upo.id desc
         limit #{pageNo}, #{pageSize}
     </select>
 
     <select id="countListPurchaseOrder" resultType="java.lang.Integer" parameterType="com.mmc.oms.model.qo.uav.UavPOrderQO">
         select count(*)
-        from uav_purchase_order
+        from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
         where 1 = 1
         <if test="keyword != null">
-            and uo.order_no = #{orderNo}
+            and uo.order_no = #{keyword}
         </if>
         <if test="thirdBackUserAccountId != null">
-            and third_user_account_id = #{thirdBackUserAccountId}
+            and upo.third_user_account_id = #{thirdBackUserAccountId}
         </if>
         <if test="statusCode != null">
-            and status_code = #{statusCode}
+            and upo.status_code = #{statusCode}
         </if>
         <if test="startTime != null">
-            and create_time >= #{startTime}
+            and upo.create_time >= #{startTime}
         </if>
         <if test="endTime != null">
-            and #{endTime} >= create_time
+            and #{endTime} >= upo.create_time
         </if>
     </select>
 
@@ -169,13 +169,13 @@
     <select id="getUavPOrderByUavOId" resultType="com.mmc.oms.entity.uav.UavPurchaseOrderDO">
         select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
         from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
-        where uav_order_id = #{uavOrderId}
+        where upo.uav_order_id = #{uavOrderId}
     </select>
 
     <select id="getUavPOrderByNo" resultType="com.mmc.oms.entity.uav.UavPurchaseOrderDO">
         select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
         from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
-        where order_no = #{orderNo}
+        where upo.order_no = #{orderNo}
     </select>
 
     <select id="getUavPOrderPayById" resultType="com.mmc.oms.entity.uav.UavPurchaseOrderPayDO">