添加牧场id字段

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

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -94,8 +96,11 @@ public class HealthMedicalRecordController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
-        return R.ok().put("all",healthMedicalRecordService.list());
+    public R findAll(Integer formFarmId){
+        LambdaQueryWrapper<HealthMedicalRecordEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(HealthMedicalRecordEntity::getFarmId,formFarmId);
+
+        return R.ok().put("all",healthMedicalRecordService.list(wrapper));
     }
 
 }

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

@@ -91,8 +91,8 @@ public class PigstyController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
-        List list = pigstyService.findAll();
+    public R findAll(Integer formFarmId){
+        List list = pigstyService.findAll(formFarmId);
 
         return R.ok().put("all",list);
     }

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

@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -123,4 +124,17 @@ public class YearPigBaseController {
         return R.ok();
     }
 
+    //出栏入栏比例
+    @RequestMapping("/outAndInProportion")
+    public R outAndInProportion(Integer farmId){
+        //出栏
+        Integer outFenct = yearPigBaseService.findByoutFenceStatus(1,farmId);
+        //育肥
+        Integer inFenct = yearPigBaseService.findByoutFenceStatus(0,farmId);
+        Map<String,Integer> resultMap = new HashMap<String,Integer>();
+        resultMap.put("outFenct",outFenct);
+        resultMap.put("inFenct",inFenct);
+
+        return R.ok().put("data",resultMap);
+    }
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/BreedParentsEntity.java

@@ -1,6 +1,7 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -71,6 +72,7 @@ public class BreedParentsEntity implements Serializable {
 	/**
 	 * 数据是否有效
 	 */
+	@TableLogic(delval = "0",value = "1")
 	private Integer effective;
 	/**
 	 * 后备字段

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

@@ -18,7 +18,7 @@ public interface PigstyService extends IService<PigstyEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 
     Integer delete(Integer[] ids);
 

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

@@ -20,5 +20,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
     void batchLairage(String[] eartags,Integer periodId);
 
     void such(Integer[] ids);
+
+    Integer findByoutFenceStatus(int i, Integer farmId);
 }
 

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

@@ -22,7 +22,7 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
     public PageUtils queryPage(Map<String, Object> params) {
 
         //根据牧场查询
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
         QueryWrapper<HealthMedicalRecordEntity> wrapper = new QueryWrapper<HealthMedicalRecordEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
 

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

@@ -1,6 +1,7 @@
 package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.dao.YearPigBaseDao;
 import com.huimv.management.entity.PigstyEntity;
@@ -35,6 +36,9 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
     public PageUtils queryPage(Map<String, Object> params) {
 
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        String farmId = (String) params.get("formFarmId");
+        lambdaQuery.eq(StringUtils.isNotBlank(farmId),PigstyEntity::getFarmId,farmId);
+
         String keywords = (String) params.get("keywords");
         //没有参数
         if (keywords == null || keywords.equals("")){
@@ -45,6 +49,8 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
             return new PageUtils(page);
         }
 
+
+
         lambdaQuery.like(PigstyEntity::getNumber,keywords);
         IPage<PigstyEntity> page = page(this.page(
                 new Query<PigstyEntity>().getPage(params)
@@ -55,8 +61,9 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
     }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PigstyEntity::getFarmId,formFarmId);
         List<PigstyEntity> pastureEntities = pigstyDao.selectList(lambdaQuery);
         return pastureEntities;
     }

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

@@ -100,6 +100,11 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
             lambdaQuery.eq(YearPigBaseEntity::getUnitId,unitId);
         }
 
+        //单元
+        String farmId = (String) params.get("formFarmId");
+        if (StringUtils.isNotEmpty(farmId)) {
+            lambdaQuery.eq(YearPigBaseEntity::getFarmId,farmId);
+        }
 
         IPage<YearPigBaseEntity> page = page(this.page(
                 new Query<YearPigBaseEntity>().getPage(params)
@@ -124,4 +129,12 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         pigBaseDao.such(ids);
     }
 
+    @Override
+    public Integer findByoutFenceStatus(int i, Integer farmId) {
+        LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(YearPigBaseEntity::getFarmId,farmId);
+        wrapper.eq(YearPigBaseEntity::getOutFenceStatus,i);
+        Integer integer = pigBaseDao.selectCount(wrapper);
+        return integer;
+    }
 }