基站查询增加牧场

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BasePigpenController.java

@@ -77,6 +77,8 @@ public class BasePigpenController {
         return new Result(10000,"删除成功",true);
     }
 
+    
+    
 
     @PostMapping("/page")
     public Result page(@RequestBody Map map){

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/dto/CollectorRegisterParam.java

@@ -148,6 +148,7 @@ public class CollectorRegisterParam   {
     private Integer pageNo;
 
 
+    private Integer farmId;
 
 
 

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/impl/CollectorRegisterServiceImpl.java

@@ -85,7 +85,15 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterM
             if (ObjectUtil.isNotEmpty(collectorRegisterParam.getCanStatus())) {
                 queryWrapper.lambda().like(CollectorRegister::getCanStatus, collectorRegisterParam.getCanStatus());
             }
-
+             //根据牧场
+            if (ObjectUtil.isNotEmpty(collectorRegisterParam.getFarmId())) {
+             queryWrapper.lambda().eq( CollectorRegister::getFarmCode,  String.valueOf(collectorRegisterParam.getFarmId()) );
+         }
+            
+            
+            
+            
+            
 
               Page<CollectorRegister> page = page(new Page<>(collectorRegisterParam.getPageNo(), collectorRegisterParam.getPageSize()), queryWrapper);