From 598b657c99ca6439c74c37973022fcf8cf1f0c10 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 19:13:59 +0800
Subject: [PATCH] 翻页问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java | 4 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java | 4 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java
index a2f9a8d..9370343 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java
@@ -44,8 +44,8 @@
@GetMapping("/confirm-page")
@ApiOperationSupport(order = 3)
@Operation(summary = "纭鍗曞垪琛�", description = "纭鍗曞垪琛�")
- public R<IPage<FlowVO>> finishedList(@Parameter(description = "娴佺▼鍚嶇О")String myProcessName, @Parameter(description = "娴佺▼鍒涘缓鏃堕棿寮�濮�") LocalDateTime createTimeBegin, @Parameter(description = "娴佺▼鍒涘缓鏃堕棿鎴") LocalDateTime createTimeEnd, @Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
- IPage<FlowVO> pages = confirmTablePrintService.confirmTablePage(Condition.getPage(query), myProcessName,keyword,createTimeBegin,createTimeEnd);
+ public R<IPage<FlowVO>> confirmPage( @Parameter(description = "娴佺▼鍒涘缓鏃堕棿寮�濮�") LocalDateTime createTimeBegin, @Parameter(description = "娴佺▼鍒涘缓鏃堕棿鎴") LocalDateTime createTimeEnd, @Parameter(description = "闆剁粍浠跺彿") String drawingNo, Query query) {
+ IPage<FlowVO> pages = confirmTablePrintService.confirmTablePage(Condition.getPage(query), drawingNo,createTimeBegin,createTimeEnd);
return R.data(pages);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
index 3fa79fc..e65540d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
@@ -161,10 +161,10 @@
* @param page 鍒嗛〉淇℃伅
* @param createTimeBegin
* @param createTimeEnd
- * @param keyword 鍏抽敭瀛�
+ * @param drawingNo 鍏抽敭瀛�
* @return
*/
- public IPage<FlowVO> confirmTablePage(IPage<FlowVO> page, String drawingNo, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
+ public IPage<FlowVO> confirmTablePage(IPage<FlowVO> page, String drawingNo, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
//鍥哄寲閲岃矾鏉戝畼
HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.CURE_PROCESS_KEY).includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java
index d723157..18738ff 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java
@@ -92,8 +92,8 @@
query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
IPage<NewProgrammingVO> page = new Page<>();
- long firstResult = (page.getCurrent()-1) * page.getSize();
- List<HistoricProcessInstance> processes = query.listPage((int)firstResult,(int)queryVO.getSize());
+ long firstResult = (long) (queryVO.getCurrent() - 1) * queryVO.getSize();
+ List<HistoricProcessInstance> processes = query.listPage((int)firstResult,queryVO.getSize());
page.setTotal(query.count());
--
Gitblit v1.9.3