From be749e73db377e482b57145188c67ae7cabff359 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期六, 20 二月 2021 23:46:25 +0800
Subject: [PATCH] 智搜条件改为多选
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 11 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 6907163..296a10b 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,22 +1,34 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
-import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
-import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.CastUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.constant.ModuleCode;
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.*;
+import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
+import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
+import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpPhysicalexam
@@ -32,6 +44,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpPhysicalExamServiceImpl extends ServiceImpl<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {
+ private final RedisService redisService;
private final EmpPhysicalExamMapper empPhysicalexamMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -40,15 +53,59 @@
@Override
public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpPhysicalExam::getDelFlag, 0);
+ queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
+ queryWrapper.like(EmpPhysicalExam::getEmpNumb, empPhysicalexam.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpName())) {
+ queryWrapper.like(EmpPhysicalExam::getEmpName, empPhysicalexam.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getCertificateNumb())) {
+ queryWrapper.like(EmpPhysicalExam::getCertificateNumb, empPhysicalexam.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
+ queryWrapper.like(EmpPhysicalExam::getDeptName, empPhysicalexam.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
+ queryWrapper.between(EmpPhysicalExam::getPhysicalExamDate, empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamType())) {
+ queryWrapper.eq(EmpPhysicalExam::getPhysicalExamType, empPhysicalexam.getPhysicalExamType());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEcg())) {
+ queryWrapper.eq(EmpPhysicalExam::getEcg, empPhysicalexam.getEcg());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getConclusion())) {
+ queryWrapper.like(EmpPhysicalExam::getConclusion, empPhysicalexam.getConclusion());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
+ queryWrapper.eq(EmpPhysicalExam::getEmpStatus, empPhysicalexam.getEmpStatus());
+ }
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpPhysicalExam> iPage = this.page(page, queryWrapper);
+ 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
public List<EmpPhysicalExam> findEmpPhysicalExams(EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpPhysicalExam::getDelFlag, 0);
+ queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +154,11 @@
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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0