修改品种管理表bug

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

@@ -116,8 +116,8 @@ public class HealthMedicalRecordController {
             R.error("请选择牧场");
         }
 
-        List<DiseaseDto> list = healthMedicalRecordService.diseaseCount(type,farmId);
-        return R.ok().put("data",list);
+        Map<String, Object> map  = healthMedicalRecordService.diseaseCount(type,farmId);
+        return R.ok().put("data",map);
     }
 
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/dto/IsolationDto.java

@@ -11,6 +11,6 @@ import lombok.Data;
  **/
 @Data
 public class IsolationDto {
-    private String diseaseName;
+    private String diseaseTime;
     private Integer diseaseCount;
 }

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

@@ -19,6 +19,6 @@ public interface HealthMedicalRecordService extends IService<HealthMedicalRecord
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List<DiseaseDto> diseaseCount(String type, String farmId);
+    Map<String, Object> diseaseCount(String type, String farmId);
 }
 

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

@@ -1,5 +1,7 @@
 package com.huimv.management.service.impl;
 
+import com.huimv.management.entity.BaseFeedFormulaEntity;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +20,16 @@ public class BaseBloodlineServiceImpl extends ServiceImpl<BaseBloodlineDao, Base
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+        String farmId = (String) params.get("formFarmId");
+        String keywords = (String) params.get("keyword");
+        QueryWrapper<BaseBloodlineEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(farmId),"",farmId);
+        queryWrapper.like(StringUtils.isNotBlank(keywords),"name",keywords);
+        queryWrapper.like(StringUtils.isNotBlank(keywords),"origin",keywords);
+
         IPage<BaseBloodlineEntity> page = this.page(
                 new Query<BaseBloodlineEntity>().getPage(params),
-                new QueryWrapper<BaseBloodlineEntity>()
+                queryWrapper
         );
 
         return new PageUtils(page);

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

@@ -84,7 +84,7 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
     }
 
     @Override
-    public List<DiseaseDto> diseaseCount(String type, String farmId) {
+    public Map<String, Object> diseaseCount(String type, String farmId) {
         Map<String,Object> resultMap = new HashMap<>();
 
         Date endTime = DateUtil.date();
@@ -144,9 +144,9 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
         isolationWrapper.apply("effective = 1");
 
         List<IsolationDto> isolationDtos = healthIsolationRecordDao.isolationCount(isolationWrapper);
+        resultMap.put("isolationCount",isolationDtos);
 
 
-
-        return diseaseDtos;
+        return resultMap;
     }
 }

huimv-smart-management/src/main/resources/mapper/management/HealthImmuneRecordDao.xml

@@ -17,8 +17,8 @@
 
     <select id="vaccineCoount" resultType="com.huimv.management.entity.dto.ImmuneCountDto">
         select
-            vaccine_name ,
-            COUNT(id) vaccinCount
+            vaccine_name vaccineName,
+            COUNT(id) vaccineCount
             FROM `health_immune_record`
         ${ew.customSqlSegment}
         GROUP BY  vaccine_name

huimv-smart-management/src/main/resources/mapper/management/HealthIsolationRecordDao.xml

@@ -19,12 +19,12 @@
     </resultMap>
     <select id="isolationCount" resultType="com.huimv.management.entity.dto.IsolationDto">
         select
-            disease_name diseaseName,
-            COUNT(id) diseaseCount
+           DATE_FORMAT(create_time,"%Y-%m-%d") diseaseTime,
+           COUNT(*) diseaseCount
 
         FROM health_isolation_record
         ${ew.customSqlSegment}
-        GROUP BY disease_name
+        GROUP BY diseaseTime
 
     </select>