From 906f38b1427bd6ee6506723e5d2ae09137dbbe5b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:17 +0800
Subject: [PATCH] 年龄查询改成或的关系
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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 9decba8..edf4290 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
@@ -15,6 +15,7 @@
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -115,7 +116,6 @@
throw new FebsException("已存在此员工编号");
}
try {
- //EmpBaseInfo tempInfo = this.empBaseInfoService.
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
String message = "新增员工基本信息失败";
@@ -177,12 +177,20 @@
throw new FebsException(message);
}
}
-
+ @GetMapping("options")
+ public FebsResponse roles() {
+ QueryWrapper<EmpBaseInfo> wrapper=new QueryWrapper();
+ wrapper.eq("empStatus",0);
+ wrapper.eq("delFlag",0);
+ wrapper.orderByDesc("createTime");
+ List<EmpBaseInfo> allRoles = empBaseInfoService.list(wrapper);
+ return new FebsResponse().data(allRoles);
+ }
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpBaseInfo empBaseinfo, HttpServletResponse response) throws IOException {
-
+ request.setPageSize(this.empBaseInfoService.count());
List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
}
@@ -210,7 +218,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);
@@ -239,4 +247,16 @@
throw new FebsException(message);
}
}
+
+ @GetMapping("image/{empId}")
+ public void getImage(@PathVariable String empId, HttpServletResponse response) throws FebsException {
+ try {
+ this.empBaseInfoService.getImage(empId,response);
+ } catch (Exception e) {
+ String message = "获取员工图片异常";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+
+ }
}
--
Gitblit v1.8.0