From 28187d584b00856bb1961b7ce6ebd168ef1aded7 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期四, 13 五月 2021 18:11:17 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 001c889..28872f5 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
@@ -75,7 +75,7 @@
queryWrapper.like("a.CertificateNumb", empPhysicalexam.getCertificateNumb());
}
if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
- queryWrapper.like("a.DeptName", 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]);
@@ -97,7 +97,7 @@
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "physicalExamDate", FebsConstant.ORDER_ASC, true);
IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);
List<EmpPhysicalExam> list = iPage.getRecords();
@@ -192,6 +192,9 @@
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()));
@@ -202,14 +205,14 @@
returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- physicalExam.setDelFlag(2);
+ 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("男".equals(list.get(5).toString()) ? "1" : "2");
+ physicalExam.setSex(list.get(5).toString());
physicalExam.setHospital(list.get(6).toString());
if (StringUtils.isNotBlank(list.get(7).toString())) {
physicalExam.setPhysicalExamDate(DateUtil.parseDate(list.get(7).toString()));
--
Gitblit v1.8.0