大屏页面调试

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java

@@ -20,6 +20,9 @@ public class ParamsDto {
     /** 结束日期*/
     private String endDate;
 
+    /** 结束日期*/
+    private String date;
+
     /**
      * 类型 验收1 入库2
      * */

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java

@@ -169,23 +169,28 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
     @Override
     public PageResultVo getAcceptanceDetailStorage(ParamsDto dto) {
         extracted(dto);
-        // 分页
+        List<StorageDetailVo> result = mapper.getAcceptanceDetailStorage(dto);
-        PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
+        List<StorageDetailVo> filteredResult = result.stream()
-        PageResultVo pageResult = new PageResultVo();
-        List<StorageDetailVo> result;
-        result = mapper.getAcceptanceDetailStorage(dto);
-        result = result.stream()
                 .filter(storageDetail -> storageDetail.getPurchaseNum() != 0 ||
-                                storageDetail.getCheckNum() != 0 ||
+                        storageDetail.getCheckNum() != 0 ||
-                                storageDetail.getInputNum() != 0)
+                        storageDetail.getInputNum() != 0)
                 .collect(Collectors.toList());
-        // 分页信息
+        // 手动计算分页信息
-        PageInfo<StorageDetailVo> pageInfo = new PageInfo<>(result);
+        int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
-        pageResult.setTotal(pageInfo.getTotal());
+        int pageSize = dto.getPageSize();
-        pageResult.setTotalPageCount(pageInfo.getPages());
+        int total = filteredResult.size();
-        pageResult.setRows(result);
+        int totalPages = (int) Math.ceil((double) total / pageSize);
-        pageResult.setPageNum (dto.getPageNum());
+        // 手动分页，获取当前页的数据
-        pageResult.setPageSize(dto.getPageSize());
+        int startIndex = (pageNum - 1) * pageSize;
+        int endIndex = Math.min(startIndex + pageSize, total);
+        List<StorageDetailVo> currentPageData = filteredResult.subList(startIndex, endIndex);
+        // 构建返回结果对象
+        PageResultVo pageResult = new PageResultVo();
+        pageResult.setTotal(total);
+        pageResult.setTotalPageCount(totalPages);
+        pageResult.setRows(currentPageData);
+        pageResult.setPageNum(pageNum);
+        pageResult.setPageSize(pageSize);
         return pageResult;
     }
 
@@ -447,6 +452,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
                 String month = date.substring(5, 7);
                 // 验收数量
                 dto.setType("1");
+                dto.setDate(year + "-" + month);
                 dto.setStartDate(DateTimeHelper.getFisrtDayOfMonth(Integer.parseInt(year), Integer.parseInt(month)));
                 dto.setEndDate(DateTimeHelper.getLastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month)));
                 List<Map<String, String>> checkList = mapper.getAcceptanceStorage(dto);

sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml

@@ -52,7 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id
             LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4'
             LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
-            WHERE pci.arrival_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
+            WHERE DATE_FORMAT(pci.arrival_time, '%Y-%m') = #{date}
+            AND mt.del_flag = '0'
             <if test="maType!=null and maType == 1">
                 AND sd.dept_name = #{maTypeName}
             </if>
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4'
             LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1'
+            AND mt.del_flag = '0'
             <if test="maType!=null and maType == 1">
                 AND sd.dept_name = #{maTypeName}
             </if>