修改批量入栏

huimv-smart-management/src/main/java/com/huimv/management/controller/HealthImmuneRecordController.java

@@ -97,13 +97,11 @@ public class HealthImmuneRecordController {
         String eartags = (String)map.get("eartags");
         String manName = (String)map.get("manName");
         String[] split = eartags.split(",");
-
-
-        String vaccine = (String)map.get("vaccine");
+        String vaccineName = (String)map.get("vaccineName");
         Integer farmId = Integer.parseInt((String)map.get("farmId"));
         Integer manId = (Integer)map.get("manId");
 
-        healthImmuneRecordService.saveAll(split,vaccine,farmId,manName,manId);
+        healthImmuneRecordService.saveAll(split,vaccineName,farmId,manName,manId);
 
         return R.ok();
     }

huimv-smart-management/src/main/java/com/huimv/management/service/HealthImmuneRecordService.java

@@ -18,7 +18,7 @@ public interface HealthImmuneRecordService extends IService<HealthImmuneRecordEn
 
     PageUtils queryPage(Map<String, Object> params);
 
-    void saveAll(String[] eartags, String vaccine, Integer farmId, String manName, Integer manId);
+    void saveAll(String[] eartags, String vaccineName, Integer farmId, String manName, Integer manId);
 
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthImmuneRecordServiceImpl.java

@@ -24,9 +24,14 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
     public PageUtils queryPage(Map<String, Object> params) {
         //根据牧场查询
         String farmId = (String) params.get("farmId");
+        String eartag = (String)params.get("eartag");
 
         QueryWrapper<HealthImmuneRecordEntity> wrapper = new QueryWrapper<HealthImmuneRecordEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+        if (StringUtils.isNotBlank(eartag)){
+            wrapper.like("pig_id",eartag);
+        }
+
         IPage<HealthImmuneRecordEntity> page = this.page(
                 new Query<HealthImmuneRecordEntity>().getPage(params),
                 wrapper
@@ -36,12 +41,12 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
     }
 
     @Override
-    public void saveAll(String[] eartags, String vaccine, Integer farmId, String manName, Integer manId) {
+    public void saveAll(String[] eartags, String vaccineName, Integer farmId, String manName, Integer manId) {
         HealthImmuneRecordEntity healthImmuneRecordEntity = new HealthImmuneRecordEntity();
         healthImmuneRecordEntity.setFarmId(farmId);
         healthImmuneRecordEntity.setManId(manId);
         healthImmuneRecordEntity.setManName(manName);
-        healthImmuneRecordEntity.setVaccineName(vaccine);
+        healthImmuneRecordEntity.setVaccineName(vaccineName);
         for (String eartag : eartags) {
             healthImmuneRecordEntity.setPigId(eartag);
             save(healthImmuneRecordEntity);