From e15b6fa57d933172fd3091296042f114986dc6ab Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期二, 23 二月 2021 00:15:24 +0800
Subject: [PATCH] 修复主要工作内容无法模糊查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index b6b62da..6638c39 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -210,7 +210,7 @@
empOccupationalService.importEmpOccupational(listObject.get(10));
empLaborTroubleService.importEmpLaborTrouble(listObject.get(11));
empBadRecordService.importEmpBadRecord(listObject.get(12));
- empRemarkinfoService.importEmpBadRecord(listObject.get(13));
+ empRemarkinfoService.importEmpRemarkInfo(listObject.get(13));
}
} catch (Exception e) {
log.error("导入员工", e);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
index eb0d8be..4115672 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpBadRecord(List<List<Object>> listObject);
+ void importEmpRemarkInfo(List<List<Object>> listObject);
}
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 8047a05..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
@@ -135,7 +135,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpBadRecord(List<List<Object>> listObject) {
+ public void importEmpRemarkInfo(List<List<Object>> listObject) {
for (List<Object> list : listObject) {
EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index 3b85814..f8d1e83 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -58,7 +58,7 @@
queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
- queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
+ queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
--
Gitblit v1.8.0