1

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

-package com.ruoyi.system.controller;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.service.WagesDetailsService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * @author haiwe
- * @date 2024/6/5
- */
-@RestController
-@RequestMapping(value = "/wages/details")
-@RequiredArgsConstructor
-public class WagesDetailsController {
-
-    private final WagesDetailsService wagesDetailsService;
-
-    @DeleteMapping("/delete")
-    public AjaxResult delete(@RequestParam("mineId") String mineId,
-                             @RequestParam("date") String date,
-                             @RequestParam("type") String type
-                            ) {
-        wagesDetailsService.deteleByMineIdAndDate(mineId,date,type);
-        return AjaxResult.success();
-
-    }
-
-
-}

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

-package com.ruoyi.system.service;
-
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * @author haiwe
- * @date 2024/6/5
- */
-public interface WagesDetailsService {
-
-
-    void deteleByMineIdAndDate(String mineId, String date,String type);
-}

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

@@ -44,6 +44,7 @@ public class WagesServiceImpl implements WagesService {
     WagesSalaryProofMapper wagesSalaryProofMapper;
     private final WagesDetailsMapper wagesDetailsMapper;
     private final WagesDetailsMapper detailsMapper;
+    private final WagesUtils wagesUtils;
 
     @Transactional
     @Override
@@ -219,19 +220,19 @@ public class WagesServiceImpl implements WagesService {
     @Override
     public String linXiExcelAnalysisWages(MultipartFile file, String date, String mineId) {
         try {
-            Integer comparisonId = WagesUtils.getComparisonId(mineId, "0");
+            Integer comparisonId = wagesUtils.getComparisonId(mineId, "0");
             detailsMapper.deleteBatch(mineId, date, comparisonId);
-            comparisonId = WagesUtils.getComparisonId(mineId, "1");
+            comparisonId = wagesUtils.getComparisonId(mineId, "1");
             detailsMapper.deleteBatch(mineId, date, comparisonId);
             List<String> filterList = Arrays.asList("小计", "合计", "总计");
             InputStream inputStream = file.getInputStream();
             List<WagesDetailsExcelDAO> wagesList = EasyExcelFactory.read(inputStream, WagesDetailsExcelDAO.class, new ExcelListener<WagesDetailsExcelDAO>()).sheet(0).headRowNumber(2).doReadSync();
             inputStream.close();
-            Integer comparisonId1 = WagesUtils.getComparisonId(mineId, "0");
+            Integer comparisonId1 = wagesUtils.getComparisonId(mineId, "0");
             InputStream inputStream1 = file.getInputStream();
             List<WagesDetailsExcelDAO> financeWagesList = EasyExcelFactory.read(inputStream1, WagesDetailsExcelDAO.class, new ExcelListener<WagesDetailsExcelDAO>()).sheet(1).headRowNumber(2).doReadSync();
             inputStream1.close();
-            Integer comparisonId2 = WagesUtils.getComparisonId(mineId, "1");
+            Integer comparisonId2 = wagesUtils.getComparisonId(mineId, "1");
             wagesList = wagesList.parallelStream()
                     .filter(v -> !filterList.contains(v.getA1()))
                     .peek(v -> v.setComparisonId(comparisonId1)).collect(Collectors.toList());

ruoyi-wages/src/main/java/com/ruoyi/system/utils/WagesUtils.java

@@ -4,6 +4,7 @@ import com.ruoyi.system.mapper.WagesCompilationMapper;
 import com.ruoyi.system.mapper.WagesVersionMapper;
 import com.ruoyi.system.model.wages.dao.WagesCompilationExcelDAO;
 import com.ruoyi.system.model.wages.dao.WagesVersionDAO;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Optional;
@@ -12,9 +13,10 @@ import java.util.stream.Collectors;
 /**
  * 2024/6/13
  */
+@Component
 public class WagesUtils {
-    private static WagesVersionMapper wagesVersionMapper;
-    private static WagesCompilationMapper wagesCompilationMapper;
+    private WagesVersionMapper wagesVersionMapper;
+    private WagesCompilationMapper wagesCompilationMapper;
 
     public WagesUtils(WagesVersionMapper wagesVersionMapper, WagesCompilationMapper wagesCompilationMapper) {
         this.wagesVersionMapper = wagesVersionMapper;
@@ -27,7 +29,7 @@ public class WagesUtils {
      * @param type
      * @return
      */
-    public static Integer getComparisonId(String mineId, String type) {
+    public Integer getComparisonId(String mineId, String type) {
         List<WagesCompilationExcelDAO> wagesCompilationExcelDAO = wagesCompilationMapper.selectByMineIdAndType(mineId, type);
         if (wagesCompilationExcelDAO == null || wagesCompilationExcelDAO.size() == 0) {
             return null;