From b55c9f4ddf68de8bade1f4bf627609fb36828ba5 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 31 一月 2021 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lybDevelop' into lybDevelop
---
febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl
index a62b7c9..cdbc78c 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl
@@ -12,8 +12,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
import java.util.List;
+import java.util.Date;
/**
*
@@ -28,15 +31,16 @@
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class ${className}ServiceImpl extends ServiceImpl
-<${className}Mapper, ${className}> implements I${className}Service {
+class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements I${className}Service {
private final ${className}Mapper ${className?uncap_first}Mapper;
-
+private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+.map(u -> u.getUserId().toString())
+.orElse("1");
@Override
public IPage<${className}> find${className}s(QueryRequest request, ${className} ${className?uncap_first}) {
LambdaQueryWrapper<${className}> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
+queryWrapper.eq(${className}::getDelFlag, 0);
Page<${className}> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -44,27 +48,52 @@
@Override
public List<${className}> find${className}s(${className} ${className?uncap_first}) {
LambdaQueryWrapper<${className}> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
+queryWrapper.eq(${className}::getDelFlag, 0);
return this.baseMapper.selectList(queryWrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create${className}(${className} ${className?uncap_first}) {
+${className?uncap_first}.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+${className?uncap_first}.setCreator(operatorId);
+${className?uncap_first}.setModifier(operatorId);
this.save(${className?uncap_first});
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update${className}(${className} ${className?uncap_first}) {
+${className} dbData = this.getById(${className?uncap_first}.getBadId());
+${className?uncap_first}.setCreateTime(dbData.getCreateTime());
+${className?uncap_first}.setCreator(dbData.getCreator());
+${className?uncap_first}.setDelFlag(dbData.getDelFlag());
+${className?uncap_first}.setModifyTime(new Date());
+${className?uncap_first}.setModifier(operatorId);
this.saveOrUpdate(${className?uncap_first});
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete${className}(${className} ${className?uncap_first}) {
-LambdaQueryWrapper<${className}> wapper = new LambdaQueryWrapper<>();
+LambdaQueryWrapper<${className}> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
+this.remove(wrapper);
}
-}
+/**
+*
+* 根据Id批量逻辑删除记录
+*
+* date 2021-01-28 10:48
+* @author: luoyibo
+* @param ids 待删除Id
+* @return void
+*/
+@Override
+@Transactional(rollbackFor = Exception.class)
+public void logicDel${className}(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ ${className?uncap_first}Mapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0