1 修改客商判断逻辑

src/main/java/com/example/backend/pAndSExe/controller/PsExeController.java

@@ -16,7 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 @RestController
 @RequestMapping("/pAndSExe")
 @CrossOrigin(
-        originPatterns = "*",  // 替换 origins → originPatterns
+        originPatterns = "*",
         allowCredentials = "true",
         maxAge = 3600
 )
@@ -46,8 +46,8 @@ public class PsExeController {
     private DaodandengjiSettleService daodandengjiSettleService;
 
     @Autowired
-
     private ShoukuanrenlingSettleService shoukuanrenlingSettleService;
+
     @Autowired
     private XiaoshoujiesuankaipiaoSettleService xiaoshoujiesuankaipiaoSettleService;
 
@@ -55,40 +55,171 @@ public class PsExeController {
     private DailijiesuanSettleService dailijiesuanSettleService;
 
     /**
-     * 导入采、销执行表Excel文件
+     * 1. 导入采、销执行表Excel文件（单独）
      */
-    @PostMapping("/import")
-    public ResponseEntity<ExcelImportResult<Void>> importExcel(@RequestParam("file") MultipartFile file) {
+    @PostMapping("/importPsExe")
+    public ResponseEntity<ExcelImportResult<Void>> importPsExeExcel(@RequestParam("file") MultipartFile file) {
         logger.info("收到采、销执行表导入请求，文件名: {}", file.getOriginalFilename());
         return psExeService.importExcel(file);
     }
 
     /**
-     * ：导入库存业务Excel文件
+     * 2. 导入所有业务（批量）
+     */
+    @PostMapping("/importAll")
+    public Result<String> importAllBusinessExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到所有业务批量导入请求，文件名: {}", file.getOriginalFilename());
+        StringBuilder resultMsg = new StringBuilder();
+        try {
+            // 依次调用所有业务导入方法，汇总结果
+            resultMsg.append("库存业务：").append(stockService.importInfExe1ToMdkc()).append("；");
+            resultMsg.append("货款付款业务：").append(payService.importInfExe3ToPay()).append("；");
+            resultMsg.append("费用付款业务：").append(feePayService.importInfFeiyongfukuanToPay()).append("；");
+            resultMsg.append("费用发票结算业务：").append(feeInvoiceSettleService.importInfToSettle()).append("；");
+            resultMsg.append("进项发票结算业务：").append(jinxiangInvoiceSettleService.importJinxiangInfToSettle()).append("；");
+            resultMsg.append("到单登记：").append(daodandengjiSettleService.importDaodandengjiInfToSettle()).append("；");
+            resultMsg.append("收款认领结算业务：").append(shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle()).append("；");
+            resultMsg.append("销售结算开票业务：").append(xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle()).append("；");
+            resultMsg.append("代理结算业务：").append(dailijiesuanSettleService.importDailijiesuanInfToSettle()).append("；");
+            return Result.success(resultMsg.toString(), "所有业务批量导入成功");
+        } catch (Exception e) {
+            logger.error("所有业务批量导入失败", e);
+            return Result.fail("所有业务批量导入失败：" + e.getMessage() + "，已执行部分：" + resultMsg);
+        }
+    }
+
+    /**
+     * 3. 导入库存业务（单独）
      */
     @PostMapping("/importStock")
-    // 返回Result<String> 而非String
     public Result<String> importStockExcel(@RequestParam("file") MultipartFile file) {
         logger.info("收到库存业务导入请求，文件名: {}", file.getOriginalFilename());
         try {
-            // 调用服务方法，获取导入结果
-           String resultMsg = stockService.importInfExe1ToMdkc();
-           String s = payService.importInfExe3ToPay();
-           String s1 = feePayService.importInfFeiyongfukuanToPay();
-           String s2 = feeInvoiceSettleService.importInfToSettle();
-            String s3 = jinxiangInvoiceSettleService.importJinxiangInfToSettle();
-           // String s4 = daodandengjiSettleService.importDaodandengjiInfToSettle();
-           // String s5 = shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle();
-           // String s6 = xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle();
-           // String s7 = dailijiesuanSettleService.importDailijiesuanInfToSettle();
-
-
-            // 返回成功JSON
-            return Result.success(resultMsg+s+s1+s2+s3/*+s4+s5+s6+s7*/, "所有业务导入");
+            String resultMsg = stockService.importInfExe1ToMdkc();
+            return Result.success(resultMsg, "库存业务导入成功");
         } catch (Exception e) {
             logger.error("库存业务导入失败", e);
-            // 返回失败JSON
             return Result.fail("库存业务导入失败：" + e.getMessage());
         }
     }
+
+    /**
+     * 4. 导入货款付款业务（单独）
+     */
+    @PostMapping("/importPay")
+    public Result<String> importPayExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到货款付款业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = payService.importInfExe3ToPay();
+            return Result.success(resultMsg, "货款付款业务导入成功");
+        } catch (Exception e) {
+            logger.error("货款付款业务导入失败", e);
+            return Result.fail("货款付款业务导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 5. 导入费用付款业务（单独）
+     */
+    @PostMapping("/importFeePay")
+    public Result<String> importFeePayExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到费用付款业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = feePayService.importInfFeiyongfukuanToPay();
+            return Result.success(resultMsg, "费用付款业务导入成功");
+        } catch (Exception e) {
+            logger.error("费用付款业务导入失败", e);
+            return Result.fail("费用付款业务导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 6. 导入费用发票结算业务（单独）
+     */
+    @PostMapping("/importFeeInvoice")
+    public Result<String> importFeeInvoiceExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到费用发票结算业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = feeInvoiceSettleService.importInfToSettle();
+            return Result.success(resultMsg, "费用发票结算业务导入成功");
+        } catch (Exception e) {
+            logger.error("费用发票结算业务导入失败", e);
+            return Result.fail("费用发票结算业务导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 7. 导入进项发票结算业务（单独）
+     */
+    @PostMapping("/importJinxiangInvoice")
+    public Result<String> importJinxiangInvoiceExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到进项发票结算业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = jinxiangInvoiceSettleService.importJinxiangInfToSettle();
+            return Result.success(resultMsg, "进项发票结算业务导入成功");
+        } catch (Exception e) {
+            logger.error("进项发票结算业务导入失败", e);
+            return Result.fail("进项发票结算业务导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 8. 导入到单登记（单独）
+     */
+    @PostMapping("/importDaodandengji")
+    public Result<String> importDaodandengjiExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到到单登记导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = daodandengjiSettleService.importDaodandengjiInfToSettle();
+            return Result.success(resultMsg, "到单登记导入成功");
+        } catch (Exception e) {
+            logger.error("到单登记导入失败", e);
+            return Result.fail("到单登记导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 9. 导入收款认领结算业务（单独）
+     */
+    @PostMapping("/importShoukuanrenling")
+    public Result<String> importShoukuanrenlingExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到收款认领结算业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle();
+            return Result.success(resultMsg, "收款认领结算业务导入成功");
+        } catch (Exception e) {
+            logger.error("收款认领结算业务导入失败", e);
+            return Result.fail("收款认领结算业务导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 10. 导入销售结算开票业务（单独）
+     */
+    @PostMapping("/importXiaoshoujiesuan")
+    public Result<String> importXiaoshoujiesuanExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到销售结算开票业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle();
+            return Result.success(resultMsg, "销售结算开票业务导入成功");
+        } catch (Exception e) {
+            logger.error("销售结算开票业务导入失败", e);
+            return Result.fail("销售结算开票业务导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 11. 导入代理结算业务（单独）
+     */
+    @PostMapping("/importDailijiesuan")
+    public Result<String> importDailijiesuanExcel(@RequestParam("file") MultipartFile file) {
+        logger.info("收到代理结算业务导入请求，文件名: {}", file.getOriginalFilename());
+        try {
+            String resultMsg = dailijiesuanSettleService.importDailijiesuanInfToSettle();
+            return Result.success(resultMsg, "代理结算业务导入成功");
+        } catch (Exception e) {
+            logger.error("代理结算业务导入失败", e);
+            return Result.fail("代理结算业务导入失败：" + e.getMessage());
+        }
+    }
 }

src/main/java/com/example/backend/pAndSExe/mapper/GongyingshangMapper.java

@@ -32,7 +32,6 @@ public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
             "        ) b ON a.id = b.rid AND b.row_num = 1\n" +
             "        left join SGGMIIP.custattn c on a.id = c.rid\n" +
             "        where ifnull(a.del_flag, 0) != 1\n" +
-            "        and INSTR(ctNature, '供应商') > 0\n" +
             "        and nvl(ctStatus,'')='已准入'\n" +
             "        and a.ctCnNm = #{ctName}\n" +
             "        order by a.fno\n" +
@@ -63,7 +62,6 @@ public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
             "        ) b ON a.id = b.rid AND b.row_num = 1\n" +
             "        left join SGGMIIP.custattn c on a.id = c.rid\n" +
             "        where ifnull(a.del_flag, 0) != 1\n" +
-            "        and INSTR(ctNature, '供应商') > 0\n" +
             "        and nvl(ctStatus,'')='已准入'\n" +
             "        and a.fno=#{fno}\n" +
             "        order by a.fno\n" +