1

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

@@ -80,8 +80,8 @@ public class WagesController {
      * @return
      */
     @RequestMapping("/lxWages")
-    public AjaxResult LinXiExcelAnalysisWages(@RequestParam("file") MultipartFile file, @RequestParam("date")String date){
-        String s = wagesService.linXiExcelAnalysisWages(file, date);
+    public AjaxResult LinXiExcelAnalysisWages(@RequestParam("file") MultipartFile file, @RequestParam("date")String date, @RequestParam("mineId") String mineId){
+        String s = wagesService.linXiExcelAnalysisWages(file, date, mineId);
         return new AjaxResult(200, s);
     }
 

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesDetailsMapper.java

 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.model.wages.dao.WagesDetailsExcelDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -10,7 +11,5 @@ import java.util.List;
  */
 public interface WagesDetailsMapper {
 
-    void deleteDetailsToDate(String date);
-
-    void insertBatch(String date, List<WagesDetailsExcelDAO> list);
+    void insertBatch(@Param("date") String date, @Param("accList") List<WagesDetailsExcelDAO> wagesList, @Param("mineId") String mineId);
 }

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

@@ -5,8 +5,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
-
 /**
  * @author haiwe
  * @date 2024/6/5
@@ -451,10 +449,12 @@ public class WagesDetailsExcelDAO {
     private String a180;
 
 
-    private LocalDateTime importTime;
+    private String importTime;
     /**
      * 矿
      */
-    private Integer mineId;
+    private String mineId;
+
+    private String type;
 
 }

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

@@ -19,5 +19,5 @@ public interface WagesService {
 
     JSONObject selectWagesVoucherList(String s);
 
-    String linXiExcelAnalysisWages(MultipartFile file, String date);
+    String linXiExcelAnalysisWages(MultipartFile file, String date, String mineId);
 }

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

 package com.ruoyi.system.service.impl;
 
-import cn.hutool.poi.excel.ExcelReader;
-import cn.hutool.poi.excel.ExcelUtil;
-
-import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.mapper.WagesCompilationMapper;
 import com.ruoyi.system.model.wages.dao.WagesCompilationDAO;
 import com.ruoyi.system.service.WagesCompilationService;
 import lombok.RequiredArgsConstructor;
-
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;