修改批量入栏

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

@@ -84,8 +84,11 @@ public class YearPigBaseController {
     }
 
     @RequestMapping("/batchLairage")
-    public R batchLairage(String[] eartags,Integer periodId ){
-        yearPigBaseService.batchLairage(eartags,periodId);
+    public R batchLairage(@RequestBody Map<String, Object> map){
+        String eartags = (String)map.get("eartags");
+        Integer periodId = (Integer)map.get("periodId");
+        String[] split = eartags.split(",");
+        yearPigBaseService.batchLairage(split,periodId);
 
         return R.ok();
     }

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

@@ -1,6 +1,7 @@
 package com.huimv.management.service.impl;
 
 import com.huimv.management.entity.HealthMedicalRecordEntity;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,7 +26,7 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
         String farmId = (String) params.get("farmId");
 
         QueryWrapper<HealthImmuneRecordEntity> wrapper = new QueryWrapper<HealthImmuneRecordEntity>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
         IPage<HealthImmuneRecordEntity> page = this.page(
                 new Query<HealthImmuneRecordEntity>().getPage(params),
                 wrapper

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

@@ -1,5 +1,6 @@
 package com.huimv.management.service.impl;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,7 +24,7 @@ public class HealthIsolationRecordServiceImpl extends ServiceImpl<HealthIsolatio
         String farmId = (String) params.get("farmId");
 
         QueryWrapper<HealthIsolationRecordEntity> wrapper = new QueryWrapper<HealthIsolationRecordEntity>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
         IPage<HealthIsolationRecordEntity> page = this.page(
                 new Query<HealthIsolationRecordEntity>().getPage(params),
                 wrapper

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

@@ -1,6 +1,7 @@
 package com.huimv.management.service.impl;
 
 import com.huimv.management.entity.HealthIsolationRecordEntity;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -24,7 +25,7 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
         String farmId = (String) params.get("farmId");
 
         QueryWrapper<HealthMedicalRecordEntity> wrapper = new QueryWrapper<HealthMedicalRecordEntity>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
         IPage<HealthMedicalRecordEntity> page = this.page(
                 new Query<HealthMedicalRecordEntity>().getPage(params),
                 wrapper

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

@@ -4,20 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.entity.YearPigBaseEntity;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.Query;
-
 import com.huimv.management.dao.YearPigBaseDao;
-import com.huimv.management.entity.YearPigBaseEntity;
 import com.huimv.management.service.YearPigBaseService;
 
 
+
+
 @Service("yearPigBaseService")
 public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigBaseEntity> implements YearPigBaseService {
 
@@ -49,17 +48,55 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     public PageUtils queryPage(Map<String, Object> params) {
 
         LambdaQueryWrapper<YearPigBaseEntity> lambdaQuery = Wrappers.lambdaQuery();
-        String keywords = (String) params.get("keywords");
-        //没有参数
-        if (keywords == null || keywords.equals("")){
-            IPage<YearPigBaseEntity> page = this.page(
-                    new Query<YearPigBaseEntity>().getPage(params),
-                    new QueryWrapper<YearPigBaseEntity>()
-            );
-            return new PageUtils(page);
+
+        //耳标
+        String eartag = (String) params.get("eartag");
+        if (StringUtils.isNotEmpty(eartag)) {
+            lambdaQuery.like(YearPigBaseEntity::getEartag,eartag);
         }
 
-        lambdaQuery.like(YearPigBaseEntity::getBreed,keywords);
+        //性别
+        String sex = (String) params.get("sex");
+        if (StringUtils.isNotEmpty(sex)) {
+           lambdaQuery.eq(YearPigBaseEntity::getSex,sex);
+        }
+
+        //品种
+        String breed = (String) params.get("breed");
+        if (StringUtils.isNotEmpty(breed)) {
+            lambdaQuery.eq(YearPigBaseEntity::getBreed,breed);
+        }
+
+        //健康状态
+        String healthStatus = (String) params.get("healthStatus");
+        if (StringUtils.isNotEmpty(healthStatus)) {
+            lambdaQuery.eq(YearPigBaseEntity::getHealthStatus,healthStatus);
+        }
+
+        //养殖状态
+        String outFenceStatus = (String) params.get("outFenceStatus");
+        if (StringUtils.isNotEmpty(outFenceStatus)) {
+            lambdaQuery.eq(YearPigBaseEntity::getOutFenceStatus,outFenceStatus);
+        }
+
+        //栏期
+        String periodId = (String) params.get("periodId");
+        if (StringUtils.isNotEmpty(periodId)) {
+            lambdaQuery.eq(YearPigBaseEntity::getPeriodId,periodId);
+        }
+
+        //栋舍
+        String pigstyId = (String) params.get("pigstyId");
+        if (StringUtils.isNotEmpty(pigstyId)) {
+            lambdaQuery.eq(YearPigBaseEntity::getPigstyId,pigstyId);
+        }
+        //单元
+        String unitId = (String) params.get("unitId");
+        if (StringUtils.isNotEmpty(unitId)) {
+            lambdaQuery.eq(YearPigBaseEntity::getUnitId,unitId);
+        }
+
+
         IPage<YearPigBaseEntity> page = page(this.page(
                 new Query<YearPigBaseEntity>().getPage(params)
         ), lambdaQuery);
@@ -73,7 +110,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     public void batchLairage(String[] eartags,Integer periodId) {
         for (String eartag : eartags) {
             UpdateWrapper<YearPigBaseEntity> updateWrapper = new UpdateWrapper<YearPigBaseEntity>();
-            System.out.println(eartag);
             updateWrapper.eq("eartag",eartag).set("period_id",periodId);
             update(updateWrapper);
         }