From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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..8c0c4a1 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,15 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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,17 +30,15 @@
/**
* 鍒嗛〉鏌ヨ
- *
* @param materialCoding
* @param materialName
- * @param condition
* @param createTime
* @param page
* @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,9 +47,22 @@
* @return
*/
@Override
- public List<RawMaterial> selectRawmaAll() {
+ public List<Map<String, Object>> selectRawmaAll() {
return rawMaterialMapper.selectRawmaAll();
}
+ @Override
+ public Integer insertRawMaterial(RawMaterial rawMaterial) {
+ return rawMaterialMapper.insert(rawMaterial);
+ }
+
+ @Override
+ public Integer deleteRawMaterial(String deleteId) {
+ LambdaUpdateWrapper<RawMaterial> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(RawMaterial::getId, deleteId);
+ updateWrapper.set(RawMaterial::getState, 0);
+ return rawMaterialMapper.update(new RawMaterial(), updateWrapper);
+ }
+
}
--
Gitblit v1.9.3