修正

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesAccountServiceImpl.java

@@ -119,7 +119,7 @@ public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService
                                     .mapToObj(recordList::getJSONObject)
                                     .filter(v -> actDispensing.getMaterial().equals(v.getJSONObject("name").getString("zh_CN")))
                                     .findFirst();
-                            if (first.isPresent()){
+                            if (first.isPresent()) {
                                 actDispensing.setAccountingIdB("财务核算部门," + first.get().getString("code"));
                             }
                         }

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

@@ -2,11 +2,22 @@ package com.ruoyi.system.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.model.wages.dao.AsiccDAO;
-import com.ruoyi.system.model.wages.vo.AsiccVo;
+import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
 import com.ruoyi.system.service.AsiccSuppliesService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.springframework.web.bind.annotation.PostMapping;
+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 java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
 
@@ -21,8 +32,14 @@ public class AsiccSuppliesController {
     private final AsiccSuppliesService asiccSuppliesService;
 
     @PostMapping("/getData")
-    public AjaxResult getData(@RequestBody AsiccDAO asiccDAO){
-        Map<String,Object> voList = asiccSuppliesService.getData(asiccDAO);
+    public AjaxResult getData(@RequestBody AsiccDAO asiccDAO) {
+        Map<String, Object> voList = asiccSuppliesService.getData(asiccDAO);
+        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/model/wages/dao/LinXiInquireAboutSubjectAssistance.java

+package com.ruoyi.system.model.wages.dao;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 2024/7/24
+ */
+@Data
+public class LinXiInquireAboutSubjectAssistance {
+    private String classary;
+    private String money;
+    private String code;
+    private List<String> aidedList;
+}

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

 package com.ruoyi.system.service;
 
 import com.ruoyi.system.model.wages.dao.AsiccDAO;
+import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
 
 import java.util.List;
 import java.util.Map;
@@ -12,4 +13,6 @@ import java.util.Map;
 public interface AsiccSuppliesService {
 
     Map<String,Object> getData(AsiccDAO asiccDAO);
+
+    List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance);
 }

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

 package com.ruoyi.system.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.common.ReturnResult;
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.domain.ActSuppliesMaterialCode;
 import com.ruoyi.system.mapper.AsiccSuppliesMapper;
 import com.ruoyi.system.model.wages.dao.AsiccDAO;
+import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance;
 import com.ruoyi.system.service.AsiccSuppliesService;
+import com.ruoyi.system.yyinterface.VoucherUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.Range;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * @author haiwe
@@ -39,6 +46,24 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
         }
     }
 
+    @Override
+    /**
+     * 林西凭证辅助核算调取部分
+     */
+    public List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance) {
+        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", Arrays.asList("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"));
+        List<LinXiInquireAboutSubjectAssistance> collect = linXiInquireAboutSubjectAssistance.parallelStream()
+                .peek(v -> v.setAidedList(map.get(v.getCode())))
+                .collect(Collectors.toList());
+        return collect;
+    }
+
     /**
      * 处理特殊表不存在的矿id情况
      *
@@ -271,6 +296,7 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
 
     /**
      * 处理特殊表存在的矿id情况
+     *
      * @param mineId 矿id
      * @return 一级，二级分类
      */
@@ -317,7 +343,7 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
                         map.put("基本生产原煤", codeList1);
                         map.put("基本生产洗煤", codeList2);
                         map.put("其他费用来源", codeList3);
-                        voMap.put(code,map);
+                        voMap.put(code, map);
                     } else if (Arrays.asList(number2).contains(code) || Arrays.asList(number2).contains(kmCode3)) {
                         String twoLevel = materialCode.getMaterialName();
                         String codeType = materialCode.getMaterialCodeType();
@@ -331,7 +357,7 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
                         map.put("基本生产原煤", codeList1);
                         map.put("基本生产洗煤", codeList2);
                         map.put("其他费用来源", codeList3);
-                        voMap.put(code,map);
+                        voMap.put(code, map);
                     } else {
                         getInfo(voMap, suppliesMap, code, map,
                                 codeList1, codeList2, codeList3,