523096025 1 рік тому
батько
коміт
0f01c56bfa

admin/src/main/java/com/huimv/farm/damsubsidy/entity/Vo/SmsVo.java → admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/SmsVo.java


+ 2 - 2
admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.xml

@@ -23,7 +23,7 @@
 
     <select id="listDetail" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
         SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
- FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.id = #{id}
+ FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.id = #{id} and l.inspection_type =0
     </select>
 
     <select id="getLast" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
@@ -33,6 +33,6 @@
 
     <select id="listTransaction" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
         SELECT b.*,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,eartags FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l
-        ON b.inspection_num = l.inspection_num WHERE b.bill_buy_status = 2 ORDER BY b.create_time DESC
+        ON b.inspection_num = l.inspection_num WHERE b.bill_buy_status = 2  AND  l.inspection_type = 1 ORDER BY b.create_time DESC
     </select>
 </mapper>