电力汇总（表格的导入以及特殊表的处理）-bug的修改

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerWagesServiceImpl.java

@@ -17,7 +17,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -68,7 +70,7 @@ public class PowerWagesServiceImpl implements PowerWagesService {
 
                     PowerList = PowerList.parallelStream()
                             .filter(v -> v.getA2() != null && !v.getA2().equals("null") && !filterList.contains(v.getA2()))
-                            .filter(v -> v.getA1() != null && !v.getA3().equals("null") && !filterList.contains(v.getA3()))
+                            .filter(v -> v.getA3() != null && !v.getA3().equals("null") && !filterList.contains(v.getA3()))
                             .peek(v -> v.setComparisonId(comparisonId))
                             .collect(Collectors.toList());
                     deMapper.insertBatch(PowerList, mineId, date);
@@ -133,10 +135,44 @@ public class PowerWagesServiceImpl implements PowerWagesService {
                 ceMapper.add(powerDetails, mineId, importTime, type);
             }
         }
+    }
 
+    @Override
+    public List<PowerWagesDetails> selectByMineIdAndDate(String mineId, String date) throws IllegalAccessException {
+
+        List<PowerWagesDetails> details = deMapper.selectByMineIdAndDate(mineId, date);
+//        for (PowerWagesDetails detail : details) {
+//            PowerWagesComparation comparation = ceMapper.selectByCId(detail.getComparisonId());
+//            if (comparation != null) {
+//                // 获取PowerWagesDetails和PowerWagesComparation的字段
+//                Field[] detailFields = PowerWagesDetails.class.getDeclaredFields();
+//                Field[] comparationFields = PowerWagesComparation.class.getDeclaredFields();
+//
+//                for (Field comparationField : comparationFields) {
+//                    comparationField.setAccessible(true);
+//                    // 遍历details中的字段，找到同名且类型相同的字段进行赋值
+//                    for (Field detailField : detailFields) {
+//                        if (detailField.getName().equals(comparationField.getName()) &&
+//                                detailField.getType().equals(comparationField.getType())) {
+//                            detailField.setAccessible(true);
+//                            Object detailsValue = detailField.get(detail);
+//                            // 将comparation中的值替换为details中的值
+//                            comparationField.set(comparation, detailsValue);
+//                            break;
+//                        }
+//                    }
+//                }
+//            } else {
+//                return null; // 或者根据业务逻辑处理未找到comparation的情况
+//            }
+//        }
+        return details; // 返回处理后的details列表
 
     }
 }
 
 
 
+
+
+