修正

ruoyi-wages/src/main/java/com/ruoyi/system/controller/AsiccSuppliesController.java

 package com.ruoyi.system.controller;
 
+import com.alibaba.excel.EasyExcelFactory;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.listener.ExcelListener;
 import com.ruoyi.system.model.wages.dao.AsiccDAO;
 import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
+import com.ruoyi.system.model.wages.dao.WagesDetailsExcelDAO;
+import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelSheet1DAO;
 import com.ruoyi.system.service.AsiccSuppliesService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.fileupload.FileItem;
@@ -12,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -37,9 +42,5 @@ public class AsiccSuppliesController {
         return AjaxResult.success(voList);
     }
 
-    @PostMapping("/inquireAboutSubjectAssistance")
-    public AjaxResult inquireAboutSubjectAssistance(@RequestBody List<LinXiInquireAboutSubjectAssistance> LinXiInquireAboutSubjectAssistance) {
-        List<LinXiInquireAboutSubjectAssistance> voList = asiccSuppliesService.inquireAboutSubjectAssistance(LinXiInquireAboutSubjectAssistance);
-        return AjaxResult.success(voList);
-    }
+
 }

ruoyi-wages/src/main/java/com/ruoyi/system/controller/PowerVoucherConversionController.java

+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
+import com.ruoyi.system.service.PowerVoucherConversionService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 2024/8/1
+ * 凭证转换---电力
+ */
+public class PowerVoucherConversionController {
+    private PowerVoucherConversionService powerVoucherConversionService;
+
+    public PowerVoucherConversionController(PowerVoucherConversionService powerVoucherConversionService) {
+        this.powerVoucherConversionService = powerVoucherConversionService;
+    }
+
+    /**
+     * 林西电力凭证信息查询
+     *
+     * @param LinXiInquireAboutSubjectAssistance
+     * @return
+     */
+    @PostMapping("/inquireAboutSubjectAssistance")
+    public AjaxResult inquireAboutSubjectAssistance(@RequestBody List<LinXiInquireAboutSubjectAssistance> LinXiInquireAboutSubjectAssistance) {
+        List<LinXiInquireAboutSubjectAssistance> voList = powerVoucherConversionService.inquireAboutSubjectAssistance(LinXiInquireAboutSubjectAssistance);
+        return AjaxResult.success(voList);
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/model/power/dao/PowerDisplayDao.java

+package com.ruoyi.system.model.power.dao;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 2024/7/30
+ * 电力展示保存---连接数据库
+ */
+@Data
+public class PowerDisplayDao {
+    // 年月
+    private String dateColumn;
+    // 矿id
+    private String mindId;
+    // 项目名
+    private String classificationName;
+    // 总电量
+    private BigDecimal powerTotal;
+    // 电量-尖
+    private BigDecimal powerTip;
+    // 电量-峰
+    private BigDecimal powerPeak;
+    // 电量-平
+    private BigDecimal powerFlat;
+    // 电量-谷
+    private BigDecimal powerValley;
+    // 总电费
+    private BigDecimal electricityTotal;
+    // 电费-尖
+    private BigDecimal electricityTip;
+    // 电费-峰
+    private BigDecimal electricityPeak;
+    // 电费-平
+    private BigDecimal electricityFlat;
+    // 电费-谷
+    private BigDecimal electricityValley;
+    // 电价-尖
+    private BigDecimal electricityPriceTip;
+    // 电价-峰
+    private BigDecimal electricityPricePeak;
+    // 电价-平
+    private BigDecimal electricityPriceFlat;
+    // 电价-谷
+    private BigDecimal electricityPriceValley;
+    // 一级分类
+    private String levelOneClassification;
+    // 二级分类
+    private String levelTwoClassification;
+
+    public PowerDisplayDao(String dateColumn, String mindId, String classificationName, BigDecimal powerTotal, BigDecimal powerTip, BigDecimal powerPeak, BigDecimal powerFlat, BigDecimal powerValley, BigDecimal electricityPriceTip, BigDecimal electricityPricePeak, BigDecimal electricityPriceFlat, BigDecimal electricityPriceValley, String levelOneClassification, String levelTwoClassification) {
+        this.dateColumn = dateColumn;
+        this.mindId = mindId;
+        this.classificationName = classificationName;
+        this.powerTotal = powerTotal;
+        this.powerTip = powerTip;
+        this.powerPeak = powerPeak;
+        this.powerFlat = powerFlat;
+        this.powerValley = powerValley;
+        this.electricityPriceTip = electricityPriceTip;
+        this.electricityPricePeak = electricityPricePeak;
+        this.electricityPriceFlat = electricityPriceFlat;
+        this.electricityPriceValley = electricityPriceValley;
+        this.levelOneClassification = levelOneClassification;
+        this.levelTwoClassification = levelTwoClassification;
+    }
+
+    public PowerDisplayDao() {
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/service/AsiccSuppliesService.java

@@ -11,8 +11,5 @@ import java.util.Map;
  * @date 2024/7/5
  */
 public interface AsiccSuppliesService {
-
-    Map<String,Object> getData(AsiccDAO asiccDAO);
-
-    List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance);
+    Map<String, Object> getData(AsiccDAO asiccDAO);
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/PowerVoucherConversionService.java

+package com.ruoyi.system.service;
+
+import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
+
+import java.util.List;
+
+/**
+ * 2024/8/1
+ */
+public interface PowerVoucherConversionService {
+    List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance);
+
+}

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

@@ -42,50 +42,6 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
         }
     }
 
-    @Override
-    /**
-     * 林西凭证辅助核算调取部分
-     */
-    public List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance) {
-        Optional<String> first = linXiInquireAboutSubjectAssistance.parallelStream()
-                .filter(v -> "6602002006024094".equals(v.getCode()))
-                .map(v -> v.getMoney())
-                .findFirst();
-        for (int i = 0; i < linXiInquireAboutSubjectAssistance.size(); i++) {
-            LinXiInquireAboutSubjectAssistance assistance = linXiInquireAboutSubjectAssistance.get(i);
-            if (first.isPresent() && "6602002006024094".equals(assistance.getCode())) {
-                linXiInquireAboutSubjectAssistance.remove(assistance);
-                i++;
-            }
-            if (first.isPresent() && "6602002003".equals(assistance.getCode())) {
-                assistance.setMoney(new BigDecimal(assistance.getMoney()).add(new BigDecimal(first.get())) + "");
-            }
-        }
-        Map<String, List<String>> map = new HashMap<>();
-        map.put("5002003", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT01"));
-        map.put("5002003_1", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT0299"));
-        map.put("5101003", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT01"));
-        map.put("6402003", Collections.singletonList("其他业务支出费用要素:03_CW0029_10070"));
-        map.put("2211003002017", Arrays.asList("薪酬类别:01_CW0017_1003P", "薪酬列支渠道:030101_CW0018_1003Z"));
-        map.put("2221001001001", Arrays.asList("核算岗位:01_CW0038_100BA", "票类:JX01_CW0049_100DR", "税目税率:VATR1"));
-        Map<String, String> codeMap = new HashMap<>();
-        codeMap.put("5002003", "5002003,基本生产_电力");
-        codeMap.put("5002003_1", "5002003,基本生产_电力");
-        codeMap.put("5101003", "5101003,制造费用_电费");
-        codeMap.put("6601003", "6601003,销售费用_电费");
-        codeMap.put("6602002003", "6602002003,管理费用_管理费_电费");
-        codeMap.put("6402003", "6402003,其他业务成本_供电");
-        codeMap.put("2211003002017", "2211003002017,应付职工薪酬_职工福利费_福利费支出_自办食堂支出");
-        codeMap.put("2221001001001", "2221001001001,应交税费_应交增值税_进项税额_煤炭产品用");
-        codeMap.put("2241005", "2241005,其他应付款_待分析");
-        return linXiInquireAboutSubjectAssistance.parallelStream()
-                .peek(v -> {
-                    v.setAidedList(map.get(v.getCode()));
-                    v.setCode(codeMap.get(v.getCode()));
-                })
-                .collect(Collectors.toList());
-    }
-
     /**
      * 处理特殊表不存在的矿id情况
      *

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

+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
+import com.ruoyi.system.service.PowerVoucherConversionService;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 2024/8/1
+ */
+public class PowerVoucherConversionServiceImpl implements PowerVoucherConversionService {
+    @Override
+    /**
+     * 林西凭证辅助核算调取部分
+     */
+    public List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance) {
+        Optional<String> first = linXiInquireAboutSubjectAssistance.parallelStream()
+                .filter(v -> "6602002006024094".equals(v.getCode()))
+                .map(v -> v.getMoney())
+                .findFirst();
+        for (int i = 0; i < linXiInquireAboutSubjectAssistance.size(); i++) {
+            LinXiInquireAboutSubjectAssistance assistance = linXiInquireAboutSubjectAssistance.get(i);
+            if (first.isPresent() && "6602002006024094".equals(assistance.getCode())) {
+                linXiInquireAboutSubjectAssistance.remove(assistance);
+                i++;
+            }
+            if (first.isPresent() && "6602002003".equals(assistance.getCode())) {
+                assistance.setMoney(new BigDecimal(assistance.getMoney()).add(new BigDecimal(first.get())) + "");
+            }
+        }
+        Map<String, List<String>> map = new HashMap<>();
+        map.put("5002003", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT01"));
+        map.put("5002003_1", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT0299"));
+        map.put("5101003", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT01"));
+        map.put("6402003", Collections.singletonList("其他业务支出费用要素:03_CW0029_10070"));
+        map.put("2211003002017", Arrays.asList("薪酬类别:01_CW0017_1003P", "薪酬列支渠道:030101_CW0018_1003Z"));
+        map.put("2221001001001", Arrays.asList("核算岗位:01_CW0038_100BA", "票类:JX01_CW0049_100DR", "税目税率:VATR1"));
+        Map<String, String> codeMap = new HashMap<>();
+        codeMap.put("5002003", "5002003,基本生产_电力");
+        codeMap.put("5002003_1", "5002003,基本生产_电力");
+        codeMap.put("5101003", "5101003,制造费用_电费");
+        codeMap.put("6601003", "6601003,销售费用_电费");
+        codeMap.put("6602002003", "6602002003,管理费用_管理费_电费");
+        codeMap.put("6402003", "6402003,其他业务成本_供电");
+        codeMap.put("2211003002017", "2211003002017,应付职工薪酬_职工福利费_福利费支出_自办食堂支出");
+        codeMap.put("2221001001001", "2221001001001,应交税费_应交增值税_进项税额_煤炭产品用");
+        codeMap.put("2241005", "2241005,其他应付款_待分析");
+        return linXiInquireAboutSubjectAssistance.parallelStream()
+                .peek(v -> {
+                    v.setAidedList(map.get(v.getCode()));
+                    v.setCode(codeMap.get(v.getCode()));
+                })
+                .collect(Collectors.toList());
+    }
+}