添加牧场id字段

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

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

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

@@ -88,8 +88,8 @@ public class PeriodController {
     }
 
     @RequestMapping("/findAll")
-    public R findAll(){
-        List list = periodService.findAll();
+    public R findAll(Integer formFarmId){
+        List list = periodService.findAll(formFarmId);
 
         return R.ok().put("all",list);
     }

huimv-smart-management/src/main/java/com/huimv/management/dao/EmployeeDao.java

@@ -3,6 +3,7 @@ package com.huimv.management.dao;
 import com.huimv.management.entity.EmployeeEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 养殖员信息表
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-05-07 15:32:42
  */
 @Mapper
+@Repository
 public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
 	
 }

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

@@ -44,6 +44,10 @@ public class EmployeeEntity implements Serializable {
      */
     private Boolean jobStatus;
     /**
+     * 牧场id
+     */
+    private Integer farmId ;
+    /**
      * 删除状态 0正常 1已删除
      */
     @TableLogic

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

@@ -18,6 +18,6 @@ public interface EmployeeService extends IService<EmployeeEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 }
 

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

@@ -18,7 +18,7 @@ public interface PeriodService extends IService<PeriodEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 
     List findAllByFarmId(Integer id);
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/EmployeeServiceImpl.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.entity.EmployeeEntity;
 import com.huimv.management.entity.EmployeeEntity;
@@ -39,6 +40,9 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
    public PageUtils queryPage(Map<String, Object> params) {
 
        LambdaQueryWrapper<EmployeeEntity> lambdaQuery = Wrappers.lambdaQuery();
+       String farmId = (String)params.get("formFarmId");
+       lambdaQuery.eq(StringUtils.isNotBlank(farmId),EmployeeEntity::getFarmId,farmId);
+
        String keywords = (String) params.get("keywords");
        //没有参数
        if (keywords == null || keywords.equals("")){
@@ -59,8 +63,12 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
    }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<EmployeeEntity> lambdaQuery = Wrappers.lambdaQuery();
+        if (formFarmId != null){
+            lambdaQuery.eq(EmployeeEntity::getFarmId,formFarmId);
+        }
+
         List<EmployeeEntity> pastureEntities = employeeDao.selectList(lambdaQuery);
         return pastureEntities;
     }

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

@@ -32,7 +32,7 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
     public PageUtils queryPage(Map<String, Object> params) {
 
         LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
-        String farmId = (String)params.get("farmId");
+        String farmId = (String)params.get("fromFarmId");
         lambdaQuery.eq(StringUtils.isNotBlank(farmId),PeriodEntity::getPigstyId,farmId);
 
         String keywords = (String) params.get("keywords");
@@ -56,8 +56,9 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
     }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PeriodEntity::getPastureId,formFarmId);
         List<PeriodEntity> pastureEntities = periodDao.selectList(lambdaQuery);
         return pastureEntities;
     }