From 67255cb08c9038ffc960f91da5171cffbbe794a5 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 03 三月 2021 00:58:18 +0800
Subject: [PATCH] 修改bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 0fbe628..6af90f9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -1,9 +1,14 @@
 package cc.mrbird.febs.server.hr.service.impl;
 
 import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
 import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
 import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
 import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
+import cn.hutool.core.date.DateUtil;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Propagation;
@@ -13,8 +18,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.entity.system.Dept;
+import cc.mrbird.febs.common.core.utils.CastUtil;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
 
 import java.util.*;
 
@@ -32,6 +40,7 @@
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 class EmpRemarkInfoServiceImpl extends ServiceImpl<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkinfoService {
 
+	private final RedisService redisService;
     private final EmpRemarkInfoMapper empRemarkinfoMapper;
     private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
             .map(u -> u.getUserId().toString())
@@ -40,7 +49,26 @@
     @Override
     public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
         LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+        queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
+        if (StringUtils.isNotBlank(empRemarkinfo.getEmpNumb())) {
+			queryWrapper.like(EmpRemarkInfo::getEmpNumb, empRemarkinfo.getEmpNumb());
+		}
+		if (StringUtils.isNotBlank(empRemarkinfo.getEmpName())) {
+			queryWrapper.like(EmpRemarkInfo::getEmpName, empRemarkinfo.getEmpName());
+		}
+		if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
+			queryWrapper.like(EmpRemarkInfo::getCertificateNumb, empRemarkinfo.getCertificateNumb());
+		}
+		if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
+			queryWrapper.like(EmpRemarkInfo::getDeptName, empRemarkinfo.getDeptName());
+		}
+		if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
+			queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
+					empRemarkinfo.getRemarkDateStr().split(",")[1]);
+		}
+		if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
+			queryWrapper.like(EmpRemarkInfo::getRemarkContent, empRemarkinfo.getRemarkContent());
+		}
         Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
         return this.page(page, queryWrapper);
     }
@@ -48,7 +76,7 @@
     @Override
     public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
         LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+        queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
         return this.baseMapper.selectList(queryWrapper);
     }
 
@@ -97,4 +125,34 @@
         List<String> list = new ArrayList<>(Arrays.asList(str));
         empRemarkinfoMapper.logicDeleteByIds(list, operatorId);
     }
+
+    @Override
+    public boolean momentToNormal(String ids) {
+        String[] str = ids.split(",");
+        List<String> list = new ArrayList<>(Arrays.asList(str));
+        return empRemarkinfoMapper.momentToNormal(list, operatorId)>0;
+    }
+
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void importEmpRemarkInfo(List<List<Object>> listObject) {
+    	for (List<Object> list : listObject) {
+    		EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
+    		empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+    		empRemarkinfo.setEmpNumb(list.get(0).toString());
+			List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+			Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
+					.getDeptId();
+			empRemarkinfo.setDeptName(list.get(1).toString());
+			empRemarkinfo.setDeptId(deptId);
+			empRemarkinfo.setJobName(list.get(2).toString());
+			empRemarkinfo.setEmpName(list.get(3).toString());
+			empRemarkinfo.setCertificateNumb(list.get(4).toString());
+			if (StringUtils.isNotBlank(list.get(5).toString())) {
+				empRemarkinfo.setRemarkDate(DateUtil.parseDateTime(list.get(5).toString()));
+			}
+			empRemarkinfo.setRemarkContent(list.get(6).toString());
+			this.save(empRemarkinfo);
+    	}
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0