【web端&小程序端-验收管理】【现场环境】电站管理，完成页签，导出全部数据，部分数据为空

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BusinessFieldMapper.java

@@ -2,8 +2,6 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
-import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfBusinessField;
 import org.apache.ibatis.annotations.Param;
 
@@ -61,62 +59,62 @@ public interface BusinessFieldMapper extends BaseMapper<HygfBusinessField> {
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getBasicInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getBasicInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取勘察信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getSurveyInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getSurveyInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取设计信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getDesignInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getDesignInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取商务信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getBusinessInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getBusinessInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取扩展信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getExtendedInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getExtendedInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取资料归档信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getArchivingInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getArchivingInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取工程信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getEngineeringInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getEngineeringInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取并网信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getGridInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getGridInformation(@Param("list") List<Long> stationIdList);
 
     /**
      * 获取派工单信息
      * @param stationIdList
      * @return
      */
-    List<Map<String, Object>> getDispatchOrderInformation(@Param("list") List<String> stationIdList);
+    List<Map<String, Object>> getDispatchOrderInformation(@Param("list") List<Long> stationIdList);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BusinessFieldServiceImpl.java

@@ -177,6 +177,9 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
         if (CollectionUtil.isEmpty(stationIdList)) {
             return data;
         }
+        List<Long> sequenceNbrListLong = stationIdList.stream()
+                .map(Long::valueOf)  // 将字符串转换为Long
+                .collect(Collectors.toList());
         Map<String, Map<String, Object>> basicInformation = new HashMap<>();
         Map<String, Map<String, Object>> surveyInformation = new HashMap<>();
         Map<String, Map<String, Object>> designInformation = new HashMap<>();
@@ -186,19 +189,19 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
         Map<String, Map<String, Object>> engineeringInformation = new HashMap<>();
         Map<String, Map<String, Object>> gridInformation = new HashMap<>();
         Map<String, Map<String, Object>> dispatchOrderInformation = new HashMap<>();
-        if (stationIdList.size() < 1000) {
-            basicInformation = getBasicInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.BASIC_INFORMATION.getName()));
-            surveyInformation = getSurveyInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.SURVEY_INFORMATION.getName()));
-            designInformation = getDesignInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.DESIGN_INFORMATION.getName()));
-            businessInformation = getBusinessInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.BUSINESS_INFORMATION.getName()));
-            extendedInformation = getExtendedInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.EXTENDED_INFORMATION.getName()));
-            archivingInformation = getArchivingInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.ARCHIVING_INFORMATION.getName()));
-            engineeringInformation = getEngineeringInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.ENGINEERING_INFORMATION.getName()));
-            gridInformation = getGridInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.GRID_INFORMATION.getName()));
-            dispatchOrderInformation = getDispatchOrderInformation(stationIdList, businessTypeMap.get(BusinessTypeEnum.DISPATCH_ORDER_INFORMATION.getName()));
+        if (sequenceNbrListLong.size() < 1000) {
+            basicInformation = getBasicInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.BASIC_INFORMATION.getName()));
+            surveyInformation = getSurveyInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.SURVEY_INFORMATION.getName()));
+            designInformation = getDesignInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.DESIGN_INFORMATION.getName()));
+            businessInformation = getBusinessInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.BUSINESS_INFORMATION.getName()));
+            extendedInformation = getExtendedInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.EXTENDED_INFORMATION.getName()));
+            archivingInformation = getArchivingInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.ARCHIVING_INFORMATION.getName()));
+            engineeringInformation = getEngineeringInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.ENGINEERING_INFORMATION.getName()));
+            gridInformation = getGridInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.GRID_INFORMATION.getName()));
+            dispatchOrderInformation = getDispatchOrderInformation(sequenceNbrListLong, businessTypeMap.get(BusinessTypeEnum.DISPATCH_ORDER_INFORMATION.getName()));
         } else {
-            List<List<String>> lists = ListUtils.splitList(stationIdList, 1000);
-            for (List<String> list : lists) {
+            List<List<Long>> lists = ListUtils.splitList(sequenceNbrListLong, 1000);
+            for (List<Long> list : lists) {
                 basicInformation.putAll(getBasicInformation(list, businessTypeMap.get(BusinessTypeEnum.BASIC_INFORMATION.getName())));
                 surveyInformation.putAll(getSurveyInformation(list, businessTypeMap.get(BusinessTypeEnum.SURVEY_INFORMATION.getName())));
                 designInformation.putAll(getDesignInformation(list, businessTypeMap.get(BusinessTypeEnum.DESIGN_INFORMATION.getName())));
@@ -250,7 +253,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getDispatchOrderInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getDispatchOrderInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         return dealFields(businessFieldMapper.getDispatchOrderInformation(stationIdList), fields);
     }
 
@@ -260,7 +263,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getGridInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getGridInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         return dealFields(businessFieldMapper.getGridInformation(stationIdList), fields);
     }
 
@@ -270,7 +273,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getEngineeringInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getEngineeringInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         List<Map<String, Object>> dataMap = businessFieldMapper.getEngineeringInformation(stationIdList);
         if (CollectionUtil.isNotEmpty(dataMap)) {
             for (Map<String, Object> item : dataMap) {
@@ -416,7 +419,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getArchivingInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getArchivingInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         return dealFields(businessFieldMapper.getArchivingInformation(stationIdList), fields);
     }
 
@@ -426,7 +429,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getExtendedInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getExtendedInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         List<Map<String, Object>> dataMap = businessFieldMapper.getExtendedInformation(stationIdList);
         if (CollectionUtil.isNotEmpty(dataMap)) {
             for (Map<String, Object> item : dataMap) {
@@ -477,7 +480,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getBusinessInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getBusinessInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         List<Map<String, Object>> businessInformation = businessFieldMapper.getBusinessInformation(stationIdList);
         if (CollectionUtil.isNotEmpty(businessInformation)) {
             for (Map<String, Object> item : businessInformation) {
@@ -498,7 +501,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getDesignInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getDesignInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         List<Map<String, Object>> dataMap = businessFieldMapper.getDesignInformation(stationIdList);
         if (CollectionUtil.isNotEmpty(dataMap)) {
             for (Map<String, Object> item : dataMap) {
@@ -660,7 +663,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getSurveyInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getSurveyInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         List<Map<String, Object>> surveyInformation = businessFieldMapper.getSurveyInformation(stationIdList);
         if (CollectionUtil.isNotEmpty(surveyInformation)) {
             for (Map<String, Object> item : surveyInformation) {
@@ -733,7 +736,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
      * @param fields
      * @return
      */
-    private Map<String, Map<String, Object>> getBasicInformation(List<String> stationIdList, List<HygfBusinessField> fields) {
+    private Map<String, Map<String, Object>> getBasicInformation(List<Long> stationIdList, List<HygfBusinessField> fields) {
         List<Map<String, Object>> basicInformation = businessFieldMapper.getBasicInformation(stationIdList);
         if (CollectionUtil.isNotEmpty(basicInformation)) {
             //对个别类型进行翻译