From 18c13ba8900911f41a60df49125b4570b3852e0b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 20 六月 2021 18:16:16 +0800
Subject: [PATCH] fix(bug修复): 证件查询从或改为与
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 267 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 220 insertions(+), 47 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index c50e256..ec1462f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -1,70 +1,243 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+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.core.utils.SortUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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 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;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpPhysicalexam
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工体检信息服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:19
-* @since JDK1.8
-*/
+ * name:EmpPhysicalexam
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工体检信息服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 09:11:00
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpPhysicalExamServiceImpl extends ServiceImpl
-<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {
+class EmpPhysicalExamServiceImpl extends ServiceImpl<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {
-private final EmpPhysicalExamMapper empPhysicalexamMapper;
+ private final RedisService redisService;
+ private final EmpPhysicalExamMapper empPhysicalexamMapper;
+ 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<EmpPhysicalExam> findEmpPhysicalexams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
-LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
+ QueryWrapper<EmpPhysicalExam> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empPhysicalexam.getDelFlag());
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empPhysicalexam.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpName())) {
+ queryWrapper.like("a.EmpName", empPhysicalexam.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empPhysicalexam.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empPhysicalexam.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
+ queryWrapper.between("a.PhysicalExamDate", empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamType())) {
+ queryWrapper.eq("a.PhysicalExamType", empPhysicalexam.getPhysicalExamType());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEcg())) {
+ queryWrapper.eq("a.Ecg", empPhysicalexam.getEcg());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getConclusion())) {
+ queryWrapper.like("a.Conclusion", empPhysicalexam.getConclusion());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
-@Override
-public List<EmpPhysicalExam> findEmpPhysicalexams(EmpPhysicalExam empPhysicalexam) {
-LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "physicalExamDate", FebsConstant.ORDER_ASC, true);
+ IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) {
-this.save(empPhysicalexam);
-}
+ List<EmpPhysicalExam> list = iPage.getRecords();
+ //设置字典数据
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setPhysicalExamTypeName(dicItems.stream()
+ .filter(k -> DicCode.PHYSICALEXAMTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPhysicalExamType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("普通体检"));
+ p.setEcgName(dicItems.stream()
+ .filter(k -> DicCode.ECG.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPhysicalExamType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("正常"));
+ });
+ iPage.setRecords(list);
+ return iPage;
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) {
-this.saveOrUpdate(empPhysicalexam);
-}
+ @Override
+ public List<EmpPhysicalExam> findEmpPhysicalExams(EmpPhysicalExam empPhysicalexam) {
+ LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) {
-LambdaQueryWrapper<EmpPhysicalExam> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
+ empPhysicalexam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if ("1".equals(empPhysicalexam.getSex())) {
+ empPhysicalexam.setSex("男");
+ } else if ("2".equals(empPhysicalexam.getSex())) {
+ empPhysicalexam.setSex("女");
+ }
+ empPhysicalexam.setCreator(operatorId);
+ empPhysicalexam.setModifier(operatorId);
+ this.save(empPhysicalexam);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
+ EmpPhysicalExam dbData = this.getById(empPhysicalexam.getPhysicalExamId());
+ empPhysicalexam.setCreateTime(dbData.getCreateTime());
+ empPhysicalexam.setCreator(dbData.getCreator());
+ empPhysicalexam.setDelFlag(dbData.getDelFlag());
+ empPhysicalexam.setModifyTime(new Date());
+ empPhysicalexam.setModifier(operatorId);
+ this.saveOrUpdate(empPhysicalexam);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
+ LambdaQueryWrapper<EmpPhysicalExam> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpPhysicalExam(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empPhysicalexamMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empPhysicalexamMapper.momentToNormal(list, operatorId) > 0;
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpPhysicalExam(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;
+ }
+ EmpPhysicalExam physicalExam = new EmpPhysicalExam();
+ physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ physicalExam.setEmpNumb(list.get(0).toString());
+ physicalExam.setDeptName(list.get(1).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;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId) {
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+ physicalExam.setDelFlag(0);
+ physicalExam.setEmpId(empId);
+ physicalExam.setDeptName(list.get(1).toString());
+ physicalExam.setDeptId(dept.getDeptId());
+ physicalExam.setJobName(list.get(2).toString());
+ physicalExam.setEmpName(list.get(3).toString());
+ physicalExam.setCertificateNumb(list.get(4).toString());
+ physicalExam.setSex(list.get(5).toString());
+ physicalExam.setHospital(list.get(6).toString());
+ try {
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ physicalExam.setPhysicalExamDate(DateUtil.parse(list.get(7).toString()));
+ }
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+
+ //体检
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "physicalExamType") && StrUtil.equals(j.getDicItemName(), list.get(8).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
+ physicalExam.setPhysicalExamType(dicItem.getDicItemCode());
+ }
+
+ physicalExam.setBloodPressure(list.get(9).toString());
+ physicalExam.setTransaminase(list.get(10).toString());
+ //心电图
+
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "ecg") && StrUtil.equals(j.getDicItemName(), list.get(11).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
+ physicalExam.setEcg(dicItem.getDicItemCode());
+
+ }
+ physicalExam.setConclusion(list.get(12).toString());
+ physicalExam.setReviewRecord(list.get(13).toString());
+ physicalExam.setRemark(list.get(14).toString());
+ this.save(physicalExam);
+ }
+ }
}
--
Gitblit v1.8.0