From 6ddb2d5ec1cc1e566da7f75d6c6d28d9ca420823 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Fri, 12 Jun 2026 16:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E7=90=86=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/erpdata/feign/IErpMesRbPkpqryClient.java | 2 +- .../erpdata/feign/IErpMesRbPkpqryClientFallback.java | 2 +- .../desk/quality/controller/ReviewSheetController.java | 6 ++++-- .../desk/quality/service/IReviewSheetService.java | 2 +- .../desk/quality/service/impl/ReviewSheetServiceImpl.java | 4 ++-- .../org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java | 4 ++-- .../springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java | 2 +- .../org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml | 4 ++++ 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java index f0ac61898..8e0456563 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java @@ -56,5 +56,5 @@ public interface IErpMesRbPkpqryClient { List listErpNew(@RequestBody ErpQueryRequest erpQueryRequest); @PostMapping(LIST_ERP_ALL) - List listErpAll(); + List listErpAll(@RequestParam(value = "rsCode", required = false) String rsCode); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java index 0711c467f..fcb1be080 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java @@ -30,7 +30,7 @@ public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient { } @Override - public List listErpAll() { + public List listErpAll(String rsCode) { return List.of(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index b35a9d34a..25f4bf004 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -572,10 +572,12 @@ public class ReviewSheetController extends BladeController { @GetMapping("/reviewFormExportExcel") @ApiOperationSupport(order = 70) @Operation(summary = "导出Excel", description = "传入ReviewSheet") - public void reviewFormExportExcel(@Parameter(hidden = true) @RequestParam Map reviewSheet, + public void reviewFormExportExcel(@Parameter(hidden = true) @RequestParam ReviewSheetErpSearch search, BladeUser bladeUser, HttpServletResponse response) { - List list = service.reviewFormExportExcel(); + String rsCode = search.getRsCode(); + + List list = service.reviewFormExportExcel(rsCode); ExcelUtil.export(response, "[审理单]数据" + DateUtil.time(), "[审理单]数据表", list, ReviewFormFileExcel.class); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java index d122e4886..c1b3ed4ce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -151,5 +151,5 @@ public interface IReviewSheetService extends EnBaseService { IPage listErp(IPage page, ReviewSheetErpSearch search); - List reviewFormExportExcel(); + List reviewFormExportExcel(String rsCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index 6a4791f76..c2c002dc2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -957,9 +957,9 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl reviewFormExportExcel() { + public List reviewFormExportExcel(String rsCode) { - List listVO = erpMesRbPkpqryClient.listErpAll(); + List listVO = erpMesRbPkpqryClient.listErpAll(rsCode); return listVO; } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java index b7afd76bb..36d314cfe 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java @@ -58,8 +58,8 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient { } @Override - public List listErpAll() { - List result = erpMesRbPkpqryMapper.listErpAll(); + public List listErpAll(String rsCode) { + List result = erpMesRbPkpqryMapper.listErpAll(rsCode); return result; } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java index 1ec1a43a5..29bde96d2 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java @@ -32,5 +32,5 @@ public interface ErpMesRbPkpqryMapper extends Mapper { List listErpNew(IPage page, @Param("q") ReviewSheetErpSearch search); - List listErpAll(); + List listErpAll(@Param("rsCode") String rsCode); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml index e0de10d47..e90ab7d03 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml @@ -57,6 +57,10 @@ select code, id, precode, prtno, name, qstandno, lotno, cntt, cntn, deptcode, useproc, checker, checkername, chker, chkername, checkdate, finishdate, dispose, disposename, p5layer1, p5layer2, p5layer3, p5layer4, p1llayer3, p1llayer4, p1llayer12, p1remark, p1projectid, p2layer7, opinion, type, pern, status, rprtn, rsplcode, p6layer2, p6layer3, p6layer4, p6layer5, p2layer1, p2layer11, p2layer3, p2layer4, p2layer5, p2layer9, p2layer6, p2layer8, fine, reward, noticeno, percent1, percent2, backcause, editdate, splywxcode, useseq, typicalflag, lotflag, psign, judgeflag, judgestart, judgeend, period, userlevel, remark, lowerrflag, usedept, jdname, redodeptcode from dba_mgr.v_mes_rb_qisbillqry a + where 1=1 + + and code = #{rsCode} +