From 0afd6c073589d5221774dab5cf4a9d21415ec0e8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 18:00:44 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 e4220a0..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,5 +1,7 @@
package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
@@ -7,14 +9,14 @@
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.util.List;
import java.util.Map;
import java.util.Objects;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -26,8 +28,41 @@
@Resource
private RawMaterialMapper rawMaterialMapper;
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param materialCoding
+ * @param materialName
+ * @param createTime
+ * @param page
+ * @return
+ */
@Override
- public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String 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);
}
+
+ /**
+ * 鏌ヨ鎵�鏈夊師鏉愭枡鎶ユ鍗�
+ *
+ * @return
+ */
+ @Override
+ 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