修复小猪修改等bug

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

@@ -152,16 +152,20 @@ public class YearPigBaseController {
         return R.ok();
     }
 
-    //出栏入栏比例
+    //认养未认养比例
     @RequestMapping("/outAndInProportion")
     public R outAndInProportion(Integer formFarmId){
-        //出栏
-        Integer outFenct = yearPigBaseService.findByoutFenceStatus(1,formFarmId);
-        //育肥
-        Integer inFenct = yearPigBaseService.findByoutFenceStatus(0,formFarmId);
+        //以认养
+        Integer adopted = yearPigBaseService.findByFosterStatus(1,formFarmId);
+        //未认养
+        Integer notAdopted = yearPigBaseService.findByFosterStatus(0,formFarmId);
         Map<String,Integer> resultMap = new HashMap<String,Integer>();
-        resultMap.put("outFenct",outFenct);
-        resultMap.put("inFenct",inFenct);
+        resultMap.put("adopted",adopted);
+        resultMap.put("notAdopted",notAdopted);
+        Integer total = notAdopted + adopted;
+        resultMap.put("total",total);
+
+
 
         return R.ok().put("data",resultMap);
     }

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

@@ -53,5 +53,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
     Integer countByPeriodId(Integer currentPeriodId);
 
     PageUtils fattenList(Map<String, Object> params);
+
+    Integer findByFosterStatus(int i, Integer formFarmId);
 }
 

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

@@ -174,6 +174,15 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         return integer;
     }
 
+    //查看认养状态
+    @Override
+    public Integer findByFosterStatus(int i, Integer formFarmId) {
+        LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(YearPigBaseEntity::getFarmId,formFarmId);
+        wrapper.eq(YearPigBaseEntity::getFosterStatus,i);
+        Integer integer = pigBaseDao.selectCount(wrapper);
+        return integer;
+    }
 
     @Override
     public   Map<String ,Object> queryPageByRelationship(Map<String, Object> params) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {