From a303cd042ed27bdf2b8daaf3d3bc23f1ef9956af Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 15 八月 2023 17:59:23 +0800
Subject: [PATCH] 设备台账
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
index f7882e9..45f2bfb 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.limslaboratory.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.pojo.Classify;
@@ -29,28 +30,16 @@
@Override
public Integer addClassifyInformation(Classify classify) {
- if (ObjectUtils.isEmpty(classify.getFatherName())){
- classify.setFatherName(classify.getSonName());
- classify.setSonName(null);
- LambdaQueryWrapper<Classify> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Classify::getFatherName, classify.getFatherName());
- wrapper.isNull(Classify::getSonName);
- wrapper.eq(Classify::getState, 1);
- Classify classify1 = classifyMapper.selectOne(wrapper);
- if (ObjectUtils.isEmpty(classify1)){
- return classifyMapper.insert(classify);
- }
- return 2;
- }
- LambdaQueryWrapper<Classify> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Classify::getFatherName, classify.getFatherName());
- wrapper.eq(Classify::getSonName, classify.getSonName());
- wrapper.eq(Classify::getState, 1);
- Classify classify1 = classifyMapper.selectOne(wrapper);
+ //LambdaQueryWrapper<Classify> wrapper = new LambdaQueryWrapper<>();
+ //wrapper.eq(Classify::getFatherName, classify.getFatherName());
+ //wrapper.eq(Classify::getSonName, classify.getSonName());
+ //wrapper.eq(Classify::getState, 1);
+ Classify classify1 = classifyMapper.selectOneByName(classify);
if (ObjectUtils.isEmpty(classify1)){
+ classify.setCreateTime(DateUtil.date());
return classifyMapper.insert(classify);
} else {
- return 3;
+ return 2;
}
}
--
Gitblit v1.9.3