From 3434b8a8a8547d76b7c20fb475f9ba45be03016d Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 14:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E8=B0=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9F=A5=E8=AF=A2=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/RequestRecallController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 46a1360e..45d71be0 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 @@ -2,6 +2,7 @@ package com.dxhy.erp.controller; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.util.DateTimeHelper; import com.dxhy.common.utils.R; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.service.RequestRecordService; @@ -41,15 +42,16 @@ public class RequestRecallController extends AbstractController { @RequestMapping(path = "/requestRecordBatch", method = {RequestMethod.POST}) public ResponseEntity batchRequestRecord(@RequestBody Map params) { String portName = (String) params.get("portName"); - Date startTime = (Date) params.get("startTime"); - Date endTime = (Date) params.get("endTime"); + String startTime = (String) params.get("startTime"); + String endTime = (String) params.get("endTime"); Integer status = (Integer) params.get("status"); String methodName = (String) params.get("startTime"); Integer pageNumber = (Integer) params.get("pageNumber"); Integer pageSize = (Integer) params.get("pageSize"); Integer orderBy = (Integer) params.get("orderBy"); - JSONObject resultJson = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize, orderBy); + JSONObject resultJson = requestRecordService.getRecordList(portName, DateTimeHelper.parseDateTime(startTime), + DateTimeHelper.parseDateTime(endTime), status, methodName, pageNumber, pageSize, orderBy); return ResponseEntity.ok(R.ok().put("data",resultJson)); }