From 00c11e16ac27b31c8d29b3c64afa88082010c33e Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期一, 17 五月 2021 22:37:08 +0800
Subject: [PATCH] 合同信息增加到处备注
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index cd5f7b8..28f3e4f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -79,7 +79,7 @@
queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
}
if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
- queryWrapper.like("a.DeptName", empOccupational.getDeptName());
+ queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
}
if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
@@ -100,7 +100,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "injuredTime", FebsConstant.ORDER_ASC, true);
IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
List<EmpOccupational> list = pageList.getRecords();
//处理数据字典
@@ -210,7 +210,7 @@
returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empOccupational.setDelFlag(2);
+ empOccupational.setDelFlag(0);
empOccupational.setEmpId(empBaseInfo.getEmpId());
empOccupational.setDeptName(list.get(1).toString());
empOccupational.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0