From 00423e63e41c83e9ca6ca3046bdb8c86955d6963 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 25 Jul 2023 11:08:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=B0=E5=BD=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/RequestRecallController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 3b974077..fe6d6bd8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -6,6 +6,7 @@ import com.dxhy.common.util.DateTimeHelper; import com.dxhy.common.utils.R; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.service.RequestRecordService; +import com.dxhy.erp.utils.DateUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -50,8 +51,8 @@ public class RequestRecallController extends AbstractController { Integer pageSize = (Integer) params.get("pageSize"); Integer orderBy = (Integer) params.get("orderBy"); - JSONObject resultJson = requestRecordService.getRecordList(portName, DateTimeHelper.parseDateTime(startTime), - DateTimeHelper.parseDateTime(endTime), status, methodName, pageNumber, pageSize, orderBy); + JSONObject resultJson = requestRecordService.getRecordList(portName, DateUtil.strToDate(startTime), + DateUtil.strToDate(endTime), status, methodName, pageNumber, pageSize, orderBy); return ResponseEntity.ok(R.ok().put("data",resultJson)); }