交易模糊查询且根据兽医地址查询

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillBuyInfoController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
@@ -41,11 +42,13 @@ public class BillBuyInfoController {
     private BillBuyInfoMapper billBuyInfoMapper;
 
     @PostMapping("/listTransaction")
-    public Result listTransaction(@RequestBody Map<String,String> paramsMap){
+    public Result listTransaction(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+        String search = paramsMap.get("search");
+        String addressCode = TokenSign.getAddressCode(httpServletRequest);
         Page<BillBuyInfoVo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        Page<BillBuyInfoVo> billBuyInfoPage = billBuyInfoMapper.listTransaction(page);
+        Page<BillBuyInfoVo> billBuyInfoPage = billBuyInfoMapper.listTransaction(page,search,addressCode);
         Page<BillBuyInfoImageVo> billBuyInfoVoPage = new Page<>();
         List billBuyInfoImageVoList = new ArrayList();
         for (BillBuyInfo record : billBuyInfoPage.getRecords()) {

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -77,7 +77,7 @@ public class BillLandingInspectionController {
 
     //根据检疫证号返回全部耳标
     @PostMapping("/getEartagNoBy")
-    public Result getEartagNoBy(HttpServletRequest httpServletRequest, @RequestParam Map<String, String> paramsMap){
+    public Result getEartagNoBy(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
         return iBillLandingInspectionService.getEartagNoBy(httpServletRequest,paramsMap);
     }
 

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -20,5 +20,5 @@ public interface BillBuyInfoMapper extends BaseMapper<BillBuyInfo> {
 
     BillBuyInfoVo getLast(@Param("userName") Long userName);
 
-    Page<BillBuyInfoVo> listTransaction(Page<BillBuyInfoVo> page);
+    Page<BillBuyInfoVo> listTransaction(Page<BillBuyInfoVo> page,@Param("search") String search,@Param("addressCode") String addressCode);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -194,7 +194,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         return Result.SUCCESS();
     }
 
-    public  String getUrl(String content, MultipartFile image) throws IOException {
+    public String getUrl(String content, MultipartFile image) throws IOException {
         if (ObjectUtil.isNotEmpty(image)){
             if ( !"".equals(content)){
                 content = content +","+uploadImage.getImageCom(image);
@@ -233,6 +233,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 .eq("inspection_sch", 6));
         if (ObjectUtil.isNotEmpty(billLandingInspection)){
             billLandingInspection.setInspectionNum(inspectionNum);
+            billLandingInspection.setInspectionName(buyer+"的产地检疫(保存)");
             billLandingInspection.setCargoOwner(cargoOwner);
             billLandingInspection.setOwnerPhone(ownerphone);
             billLandingInspection.setAnimalType(Integer.parseInt(animalType));
@@ -246,6 +247,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         }else {
             BillLandingInspection billLandingInspection1 = new BillLandingInspection();
             billLandingInspection1.setInspectionNum(inspectionNum);
+            billLandingInspection1.setInspectionName(buyer+"的产地检疫(保存)");
             billLandingInspection1.setCargoOwner(cargoOwner);
             billLandingInspection1.setOwnerPhone(ownerphone);
             billLandingInspection1.setAnimalType(Integer.parseInt(animalType));

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

@@ -33,6 +33,7 @@
 
     <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  AND  l.inspection_sch = 4 ORDER BY b.create_time DESC
+        ON b.inspection_num = l.inspection_num  LEFT JOIN `sys_user` u ON b.buyer_id = u.id
+        WHERE u.brief_address_code LIKE  '${addressCode}%' AND b.buyer_name LIKE '%${search}%' AND b.bill_buy_status = 2  AND  l.inspection_sch = 4 ORDER BY b.create_time DESC
     </select>
 </mapper>