From 179b7b6c557eec27f5a05ee7ed2981f14825b692 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期六, 26 八月 2023 16:10:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 17 ++++------------- 1 files changed, 4 insertions(+), 13 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 7b93cf3..b72eba2 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 @@ -1,22 +1,14 @@ package com.yuanchu.limslaboratory.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yuanchu.limslaboratory.pojo.Instrument; import com.yuanchu.limslaboratory.pojo.RawMaterial; import com.yuanchu.limslaboratory.mapper.RawMaterialMapper; -import com.yuanchu.limslaboratory.pojo.vo.InspectionVo; import com.yuanchu.limslaboratory.service.RawMaterialService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; - import javax.annotation.Resource; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; @@ -37,7 +29,6 @@ /** * 鍒嗛〉鏌ヨ - * * @param materialCoding * @param materialName * @param condition @@ -46,8 +37,8 @@ * @return */ @Override - public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page) { - return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, condition, createTime, page); + public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page) { + return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, type, createTime, page); } /** @@ -56,7 +47,7 @@ * @return */ @Override - public List<RawMaterial> selectRawmaAll() { + public List<Map<String, Object>> selectRawmaAll() { return rawMaterialMapper.selectRawmaAll(); } -- Gitblit v1.9.3