接受数据修改6

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckEggTextureInfoController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.DuckEggTextureInfo;
 import com.huimv.guowei.admin.service.IBaseDuckInfoService;
 import com.huimv.guowei.admin.service.IDuckEggTextureInfoService;

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/Batch.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -41,12 +44,15 @@ public class Batch implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 是否启用 0为启用 1为不启用
      */
     private Integer isEnable;
 
+    private Integer count;
+
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDepartureService.java

@@ -22,4 +22,6 @@ public interface IDepartureService extends IService<Departure> {
 
     Result listBatch(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
+    Result editBatch(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
 }

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

@@ -2,6 +2,7 @@ package com.huimv.guowei.admin.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
@@ -38,19 +39,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchMapper, Batch> implements
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        QueryWrapper<Batch> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
-        List<Batch> batches = batchMapper.selectList(queryWrapper);
-        List<BatchVo> list = new ArrayList<>();
-        for (Batch batch : batches) {
-            QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("batch_num", batch.getBatchNum());
-            Integer count = infoMapper.selectCount(queryWrapper1);
-            BatchVo batchVo = new BatchVo();
-            BeanUtil.copyProperties(batch, batchVo);
-            batchVo.setCount(count);
-            list.add(batchVo);
-        }
+        String batchNum = paramsMap.get("batchNum");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         if (pageNum == null || "".equals(pageNum)) {
@@ -59,19 +48,17 @@ public class BatchServiceImpl extends ServiceImpl<BatchMapper, Batch> implements
         if (pageSize == null || "".equals(pageSize)) {
             pageSize = "10";
         }
-        int page = Integer.parseInt(pageNum);//相当于pageNo-------分页中的pi
-        int count = Integer.parseInt(pageSize);//相当于pageSize-------分页中的ps
-        int size = list.size();
-        int pageCount=size/count;
-        int fromIndex = count * (page - 1);
-        int toIndex = fromIndex + count;
-        if (toIndex >= size) {
-            toIndex = size;
-        }
-        if(page>pageCount+1){
-            fromIndex=0;
-            toIndex=0;
+        QueryWrapper<Batch> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(batchNum), "batch_num", batchNum);
+        Page<Batch> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<Batch> batchPage = batchMapper.selectPage(page, queryWrapper);
+        List<Batch> records = batchPage.getRecords();
+        for (Batch record : records) {
+            QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("batch_num", record.getBatchNum());
+            Integer count = infoMapper.selectCount(queryWrapper1);
+            record.setCount(count);
         }
-        return new Result(ResultCode.SUCCESS, list.subList(fromIndex, toIndex));
+        return new Result(ResultCode.SUCCESS, batchPage);
     }
 }

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

@@ -68,6 +68,13 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
     @Override
     public Result listBatch(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        return null;
+    }
+
+    @Override
+    public Result editBatch(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String batchNum = paramsMap.get("batchNum");
 
         return null;
     }