From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期六, 19 八月 2023 15:16:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java index 2722a1a..7b93cf3 100644 --- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java +++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java @@ -60,19 +60,5 @@ return rawMaterialMapper.selectRawmaAll(); } - /** - * 閫夋嫨鍘熸潗鏂欐姤妫� - * - * @param id - * @return - */ - @Override - public InspectionVo selectRawmaById(Integer id, String startTime, String endTime) throws ParseException { - InspectionVo inspectionVo = rawMaterialMapper.selectRawmaById(id); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - inspectionVo.setStartTime(formatter.parse(startTime)); - inspectionVo.setEndTime(formatter.parse(endTime)); - inspectionVo.setType(0); - return inspectionVo; - } + } -- Gitblit v1.9.3