添加疾病管理查询全部

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

@@ -18,10 +18,9 @@ import com.huimv.common.utils.R;
  * 室内环境信息Controller
  *
  * @author yinhao
- * @version 1.0
- * @date 2021-05-07 15:32:42
+ *
  */
-@Api(tags = "室内环境信息Controller")
+@Api(tags = "室内环境信息")
 @RestController
 @RequestMapping("management/indoorenvironment")
 public class IndoorEnvironmentController {

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

@@ -33,7 +33,7 @@ public class HealthDiseaseCauseEntity implements Serializable {
 	/**
 	 * 具体描述
 	 */
-	private String desc;
+	private String description;
 	/**
 	 * 创建时间
 	 */

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

@@ -41,7 +41,7 @@ public class HealthDiseaseEntity implements Serializable {
 	/**
 	 * 猪病概述
 	 */
-	private String desc;
+	private String description;
 	/**
 	 * 临床症状
 	 */

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

@@ -43,7 +43,7 @@ public class HealthSymptomEntity implements Serializable {
 	/**
 	 * 具体描述
 	 */
-	private String desc;
+	private String description;
 	/**
 	 * 创建时间
 	 */

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

@@ -43,7 +43,7 @@ public class HealthTreatmentPlanEntity implements Serializable {
 	/**
 	 * 描述
 	 */
-	private String desc;
+	private String description;
 	/**
 	 * 创建时间
 	 */

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

@@ -1,5 +1,6 @@
 package com.huimv.management.service.impl;
 
+import com.huimv.management.entity.HealthMedicalRecordEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +21,14 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+        //根据牧场查询
+        String farmId = (String) params.get("farmId");
+
+        QueryWrapper<HealthImmuneRecordEntity> wrapper = new QueryWrapper<HealthImmuneRecordEntity>();
+        wrapper.eq("farm_id",farmId);
         IPage<HealthImmuneRecordEntity> page = this.page(
                 new Query<HealthImmuneRecordEntity>().getPage(params),
-                new QueryWrapper<HealthImmuneRecordEntity>()
+                wrapper
         );
 
         return new PageUtils(page);

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

@@ -18,9 +18,15 @@ public class HealthIsolationRecordServiceImpl extends ServiceImpl<HealthIsolatio
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        //根据牧场查询
+        String farmId = (String) params.get("farmId");
+
+        QueryWrapper<HealthIsolationRecordEntity> wrapper = new QueryWrapper<HealthIsolationRecordEntity>();
+        wrapper.eq("farm_id",farmId);
         IPage<HealthIsolationRecordEntity> page = this.page(
                 new Query<HealthIsolationRecordEntity>().getPage(params),
-                new QueryWrapper<HealthIsolationRecordEntity>()
+                wrapper
         );
 
         return new PageUtils(page);

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

@@ -1,5 +1,6 @@
 package com.huimv.management.service.impl;
 
+import com.huimv.management.entity.HealthIsolationRecordEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,15 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        //根据牧场查询
+        String farmId = (String) params.get("farmId");
+
+        QueryWrapper<HealthMedicalRecordEntity> wrapper = new QueryWrapper<HealthMedicalRecordEntity>();
+        wrapper.eq("farm_id",farmId);
         IPage<HealthMedicalRecordEntity> page = this.page(
                 new Query<HealthMedicalRecordEntity>().getPage(params),
-                new QueryWrapper<HealthMedicalRecordEntity>()
+                wrapper
         );
 
         return new PageUtils(page);

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

@@ -21,6 +21,30 @@ import com.huimv.management.service.YearPigBaseService;
 @Service("yearPigBaseService")
 public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigBaseEntity> implements YearPigBaseService {
 
+//    @Override
+//    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);
+//        }
+//
+//        lambdaQuery.like(YearPigBaseEntity::getBreed,keywords);
+//        IPage<YearPigBaseEntity> page = page(this.page(
+//                new Query<YearPigBaseEntity>().getPage(params)
+//        ), lambdaQuery);
+//
+//
+//        return new PageUtils(page);
+//    }
+
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
@@ -45,7 +69,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     }
 
 
-
     @Override
     public void batchLairage(String[] eartags,Integer periodId) {
         for (String eartag : eartags) {