档案管理修改

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckHealthInfoServiceImpl.java

@@ -54,19 +54,14 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String format = sdf.format(date);
-        if (StringUtils.isBlank(startDate)) {
-            startDate = format + " 00:00:00";
+        QueryWrapper<DuckHealthInfo> queryWrapper = new QueryWrapper<>();
+        if (startDate == null || "".equals(startDate)) {
+            queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId).orderByAsc("health_date");
         }else {
             startDate = startDate + " 00:00:00";
-        }
-        if (StringUtils.isBlank(endDate)) {
-            endDate = format + " 23:59:59";
-        }else {
             endDate = endDate + " 23:59:59";
+            queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId).between("health_date", startDate, endDate).orderByAsc("health_date");
         }
-
-        QueryWrapper<DuckHealthInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId).between("health_date", startDate, endDate).orderByAsc("health_date");
         Page<DuckHealthInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, healthInfoMapper.selectPage(page, queryWrapper));
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckImmunityInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.BaseDuckInfo;
+import com.huimv.guowei.admin.entity.DuckHealthInfo;
 import com.huimv.guowei.admin.entity.DuckImmunityInfo;
 import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
 import com.huimv.guowei.admin.mapper.DuckImmunityInfoMapper;
@@ -44,28 +45,21 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
 
-        Date date = new Date();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String format = sdf.format(date);
-        if (StringUtils.isBlank(startDate)) {
-            startDate = format + " 00:00:00";
-        } else {
-            startDate = startDate + " 00:00:00";
-        }
-        if (StringUtils.isBlank(endDate)) {
-            endDate = format + " 23:59:59";
-        } else {
-            endDate = endDate + " 23:59:59";
-        }
         if (pageNum == null || "".equals(pageNum)) {
             pageNum = "1";
         }
         if (pageSize == null || "".equals(pageSize)) {
             pageSize = "10";
         }
+
         QueryWrapper<DuckImmunityInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId)
-                .between("health_date", startDate, endDate).orderByAsc("health_date");
+        if (startDate == null || "".equals(startDate)) {
+            queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId).orderByAsc("health_date");
+        }else {
+            startDate = startDate + " 00:00:00";
+            endDate = endDate + " 23:59:59";
+            queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId).between("health_date", startDate, endDate).orderByAsc("health_date");
+        }
         Page<DuckImmunityInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, infoMapper.selectPage(page, queryWrapper));
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvMoveCallServiceImpl.java

@@ -54,11 +54,13 @@ public class EnvMoveCallServiceImpl extends ServiceImpl<EnvMoveCallMapper, EnvMo
         } else {
             QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId);
-            String startDate = paramsMap.get("startDate");
-            String endDate = paramsMap.get("endDate");
-            startDate = startDate + " 00:00:00";
-            endDate = endDate + " 23:59:59";
-            queryWrapper.eq("duck_id", duckCode).between("call_date", startDate, endDate);
+            String startAge = paramsMap.get("startAge");
+            String endAge = paramsMap.get("endAge");
+            if (startAge == null || "".equals(startAge)) {
+                queryWrapper.eq("duck_id", duckCode);
+            } else {
+                queryWrapper.eq("duck_id", duckCode).between("dayage", startAge, endAge);
+            }
             return new Result(ResultCode.SUCCESS, moveCallMapper.listDay(queryWrapper));
         }
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -59,7 +59,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         }
         if ("1".equals(type)) {
             QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("duck_id", duckCode).eq("farm_id", farmId).orderByAsc("call_date");
+            queryWrapper.eq("duck_id", duckCode).eq("farm_id", farmId);
             Page<EnvRegularCallEgg> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, eggMapper.listPage(page, queryWrapper));
         } else {

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -49,7 +49,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         }
         if ("1".equals(type)) {
             QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("duck_id", duckCode).eq("farm_id", farmId).orderByAsc("call_date");
+            queryWrapper.eq("duck_id", duckCode).eq("farm_id", farmId);
             Page<EnvRegularCallFeeding> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS,feedingMapper.listPage(page, queryWrapper));
         } else {