From b2dee2f787cb8e27417373d0a31ad39501017782 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 27 二月 2022 09:21:29 +0800
Subject: [PATCH] fix(bug修复): 信息录入模块录入基本信息时的入职类型默认设置成新入职
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 225 +++++++++++++++++++++++++++++---------------------------
1 files changed, 116 insertions(+), 109 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 742085a..6ff6e37 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -51,51 +51,51 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpLaborTroubleServiceImpl extends ServiceImpl<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {
- private final RedisService redisService;
+ private final RedisService redisService;
private final EmpLaborTroubleMapper empLabortroubleMapper;
- private final IEmpBaseInfoService empBaseInfoService;
- private final IRemoteDeptService remoteDeptService;
+ private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
- QueryWrapper<EmpLaborTrouble> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpLaborTrouble> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("a.DelFlag", empLabortrouble.getDelFlag());
if (StringUtils.isNotBlank(empLabortrouble.getEmpNumb())) {
- queryWrapper.like("a.EmpNumb", empLabortrouble.getEmpNumb());
- }
- if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
- queryWrapper.like("a.EmpName", empLabortrouble.getEmpName());
- }
- if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
- queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
- }
- if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
- queryWrapper.like("a.DeptName", empLabortrouble.getDeptName());
- }
- if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
- queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
- empLabortrouble.getArbitrationDateStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
- queryWrapper.between("a.SettleDate", empLabortrouble.getSettleDateStr().split(",")[0],
- empLabortrouble.getSettleDateStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
- queryWrapper.eq("a.ArbitrationType", empLabortrouble.getArbitrationType());
- }
- if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
- queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
- }
- if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
- }
- if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
- queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
- }
- queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ queryWrapper.like("a.EmpNumb", empLabortrouble.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
+ queryWrapper.like("a.EmpName", empLabortrouble.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
+ queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
+ empLabortrouble.getArbitrationDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
+ queryWrapper.between("a.SettleDate", empLabortrouble.getSettleDateStr().split(",")[0],
+ empLabortrouble.getSettleDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
+ queryWrapper.eq("a.ArbitrationType", empLabortrouble.getArbitrationType());
+ }
+ if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
+ queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empLabortrouble.getEmpStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
+ queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "arbitrationDate", FebsConstant.ORDER_ASC, true);
IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
@@ -113,13 +113,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
- LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
- lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
- lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
- if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException(MyConstant.MESSAGE);
- }
+ LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag, 1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empLabortrouble.setCreator(operatorId);
empLabortrouble.setModifier(operatorId);
@@ -129,14 +129,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
- LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
- lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
- lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
- lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
- if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException(MyConstant.MESSAGE);
- }
+ LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag, 1);
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId, empLabortrouble.getArbitrationId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
empLabortrouble.setCreateTime(dbData.getCreateTime());
empLabortrouble.setCreator(dbData.getCreator());
@@ -175,69 +175,76 @@
public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empLabortroubleMapper.momentToNormal(list, operatorId)>0;
+ return empLabortroubleMapper.momentToNormal(list, operatorId) > 0;
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
- for (List<Object> list : listObject) {
- if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
- continue;
- }
- EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
- empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empLabortrouble.setEmpNumb(list.get(0).toString());
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
- }
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
- if (null == dept) {
- returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
- continue;
- }
- EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
- if (null == empBaseInfo){
- returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
- continue;
- }
- empLabortrouble.setDelFlag(2);
- empLabortrouble.setEmpId(empBaseInfo.getEmpId());
- empLabortrouble.setDeptName(list.get(1).toString());
- empLabortrouble.setDeptId(dept.getDeptId());
- empLabortrouble.setJobName(list.get(2).toString());
- empLabortrouble.setEmpName(list.get(3).toString());
- empLabortrouble.setCertificateNumb(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
- }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpLaborTrouble(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
+ continue;
+ }
+ EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
+ empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empLabortrouble.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(1).toString()));
+ continue;
+ }
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo) {
+ returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+ empLabortrouble.setDelFlag(0);
+ empLabortrouble.setEmpId(empBaseInfo.getEmpId());
+ empLabortrouble.setDeptName(list.get(1).toString());
+ empLabortrouble.setDeptId(dept.getDeptId());
+ empLabortrouble.setJobName(list.get(2).toString());
+ empLabortrouble.setEmpName(list.get(3).toString());
+ empLabortrouble.setCertificateNumb(list.get(4).toString());
- //仲裁类型
- DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
- if (null!=dicItem){
- empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
- }
+ //仲裁类型
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "zctype") && StrUtil.equals(j.getDicItemName(), list.get(6).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
+ empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
+ }
- empLabortrouble.setArbitrationReason(list.get(7).toString());
- empLabortrouble.setReporter(list.get(8).toString());
- empLabortrouble.setRemark(list.get(9).toString());
- if (StringUtils.isNotBlank(list.get(10).toString())) {
- empLabortrouble.setArbitrationPay(new BigDecimal(list.get(10).toString()));
- }
- if (StringUtils.isNotBlank(list.get(11).toString())) {
- empLabortrouble.setArbitrationStatus("未结案".equals(list.get(11).toString()) ? 0 : 1);
- }
- if (StringUtils.isNotBlank(list.get(12).toString())) {
- empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
- }
- empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
- this.save(empLabortrouble);
- }
- }
+ empLabortrouble.setArbitrationReason(list.get(7).toString());
+ empLabortrouble.setReporter(list.get(8).toString());
+ empLabortrouble.setRemark(list.get(9).toString());
+ if (StringUtils.isNotBlank(list.get(10).toString())) {
+ empLabortrouble.setArbitrationPay(new BigDecimal(list.get(10).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(11).toString())) {
+ empLabortrouble.setArbitrationStatus("未结案".equals(list.get(11).toString()) ? 0 : 1);
+ }
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empLabortrouble.setArbitrationDate(DateUtil.parse(list.get(5).toString()));
+ }
- private List<EmpLaborTrouble> convertDicItemName(List<EmpLaborTrouble> list){
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empLabortrouble.setSettleDate(DateUtil.parse(list.get(12).toString()));
+ }
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+
+ empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
+ this.save(empLabortrouble);
+ }
+ }
+
+ private List<EmpLaborTrouble> convertDicItemName(List<EmpLaborTrouble> list) {
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
list.forEach(p -> {
//仲裁类型
@@ -248,6 +255,6 @@
.orElse(""));
});
- return list;
+ return list;
}
}
--
Gitblit v1.8.0