From 63c7e9d7051ed6742eb7334346a53376b0247c29 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 01 四月 2021 09:46:03 +0800
Subject: [PATCH] 删除
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
index 7c4cf6b..ce5f608 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.Dic;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
@@ -13,6 +14,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +47,10 @@
public IPage<DicItem> findDicItems(QueryRequest request, DicItem dicitem) {
LambdaQueryWrapper<DicItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DicItem::getDelFlag, 0);
+ queryWrapper.eq(DicItem::getDicId, dicitem.getDicId());
+ if(StringUtils.isNotBlank(dicitem.getDicItemName())){
+ queryWrapper.like(DicItem::getDicItemName, dicitem.getDicItemName());
+ }
Page<DicItem> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -53,6 +59,7 @@
public List<DicItem> findDicItems(DicItem dicitem) {
LambdaQueryWrapper<DicItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DicItem::getDelFlag, 0);
+ queryWrapper.eq(DicItem::getDicCode,dicitem.getDicCode());
return this.baseMapper.selectList(queryWrapper);
}
@@ -82,6 +89,7 @@
public void deleteDicItem(DicItem dicitem) {
LambdaQueryWrapper<DicItem> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
+ wrapper.eq(DicItem::getDicItemId, dicitem.getDicItemId());
this.remove(wrapper);
}
@@ -99,7 +107,12 @@
public void logicDelDicItem(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- dicitemMapper.logicDeleteByIds(list, operatorId);
+ for (String str1:list){
+ LambdaQueryWrapper<DicItem> wrapper = new LambdaQueryWrapper<>();
+// TODO 设置删除条件
+ wrapper.eq(DicItem::getDicItemId, str1);
+ this.remove(wrapper);
+ }
}
@Override
@@ -110,4 +123,11 @@
redisService.del("dicItems");
redisService.set("dicItems", dicItems);
}
-}
\ No newline at end of file
+
+ @Override
+ public List<DicItem> getAllDicitemsAll() {
+ LambdaQueryWrapper<DicItem> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DicItem::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
+}
--
Gitblit v1.8.0