From f4d206d07eaeabad56e2918edf9799af13bb526e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 12 五月 2025 17:38:12 +0800
Subject: [PATCH] 表阀一体机：web后端系统，实现功能码5B、5C、15、16、22、30、31、50、55、56、65、68、97、98、99远程命令。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
index 179dcc9..913860f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -28,15 +27,12 @@
public QueryResultVo<List<VoCancel>> getCancels(QueryVo queryVo) {
//瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂�
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
String cancelTimeStart = queryVo.cancelTimeStart;
String cancelTimeStop = queryVo.cancelTimeStop;
if(cancelTimeStart != null) {
cancelTimeStart = cancelTimeStart + " 00:00:00";
queryVo.setCancelTimeStart(cancelTimeStart);
}
-
if(cancelTimeStop != null) {
cancelTimeStop = cancelTimeStop + " 23:59:59";
queryVo.setCancelTimeStop(cancelTimeStop);
@@ -48,10 +44,7 @@
QueryResultVo<List<VoCancel>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
- params.put("pageCurr", pageCurr);
- rsVo.pageCurr = pageCurr;
+ rsVo.pageCurr = queryVo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seCancelMapper.getCancels(params);
--
Gitblit v1.8.0