提交代码

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringIndustryMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface ZEngineeringIndustryMapper extends BaseMapperPlus<ZEngineeringIndustryMapper, ZEngineeringIndustry, ZEngineeringIndustryVo> {
 
-    List<Map<String,Object>> getByUserList(@Param("names") List DateList, @Param("by")String name, @Param("type")String type,@Param("szAndGy")String szAndGy,@Param("pa") Page<?> page);
+    Page<Map<String,Object>> getByUserList(@Param("names") List DateList, @Param("by")String name, @Param("type")String type,@Param("szAndGy")String szAndGy,@Param("pa") Page<?> page);
     List<Map<String,String>> getReviewStatusByNodeId(@Param("id") String id);
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface IZEngineeringIndustryService {
 
-    List<Map<String,Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery);
+    TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery);
 
     /**
      * 查询工业工程|市政工程

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -66,7 +66,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     private ZEngineeringCivilMapper zEngineeringCivilMapper;
 
     @Override
-    public List<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery) {
+    public TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery) {
         Page<T> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         String leftJoin = null;
         String szAndGy = null;
@@ -97,10 +97,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             DateList.add(item.substring(item.indexOf("2")));
         });
         String username = LoginHelper.getUsername();
-        List<Map<String, Object>> byUserList = baseMapper.getByUserList(DateList, username, leftJoin,szAndGy, page);
+        Page<Map<String, Object>> listPage = baseMapper.getByUserList(DateList, username, leftJoin, szAndGy, page);
 
         if ("1".equals(type)){ // 顶管
-            byUserList.forEach(item -> {
+            listPage.getRecords().forEach(item -> {
 
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
                 MonthTableNameHandler.setData(date);
@@ -129,7 +129,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             });
         }
         else if ("2".equals(type)){ // 基建
-            byUserList.forEach(item -> {
+            listPage.getRecords().forEach(item -> {
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
@@ -156,7 +156,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             });
         }
         else if ("3".equals(type)){ // 危险工程
-            byUserList.forEach(item -> {
+            listPage.getRecords().forEach(item -> {
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
 ;
                 MonthTableNameHandler.setData(date);
@@ -170,7 +170,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             });
         }
         else if ("4".equals(type)){ // 市政工程
-            byUserList.forEach(item -> {
+            listPage.getRecords().forEach(item -> {
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
 ;
                 MonthTableNameHandler.setData(date);
@@ -198,7 +198,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             });
         }
         else if ("5".equals(type)){ // 工业工程
-            byUserList.forEach(item -> {
+            listPage.getRecords().forEach(item -> {
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
 ;
                 MonthTableNameHandler.setData(date);
@@ -212,7 +212,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             MonthTableNameHandler.removeData();
         }
         else if ("6".equals(type)){ // 工业工程
-            byUserList.forEach(item -> {
+            listPage.getRecords().forEach(item -> {
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
 ;
                 MonthTableNameHandler.setData(date);
@@ -225,7 +225,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             });
             MonthTableNameHandler.removeData();
         }
-        return byUserList;
+        return TableDataInfo.build(listPage);
     }
 
     /**