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)); }