From 50c9692f448343777dd0dcd4fee00fe2baf7dec0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 28 二月 2021 15:02:34 +0800
Subject: [PATCH] 首页查询修复bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java | 137 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
index 95a940c..76f0750 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
@@ -25,15 +25,14 @@
import java.util.Map;
/**
-*
-* name:EmpAccidentcases
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工意外险案件控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:27
-* @since JDK1.8
-*/
+ * name:EmpAccidentcases
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工意外险案件控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:27
+ * @since JDK1.8
+ */
@Api(tags = "人员意外险案件录入接口")
@Slf4j
@Validated
@@ -42,80 +41,82 @@
@RequiredArgsConstructor
public class EmpAccidentCasesController {
-private final IEmpAccidentCasesService empAccidentCasesService;
+ private final IEmpAccidentCasesService empAccidentCasesService;
-@GetMapping
-@PreAuthorize("hasAuthority('empAccidentcases:list')")
-public FebsResponse getAllEmpAccidentCases(EmpAccidentCases empAccidentcases) {
-return new FebsResponse().data(empAccidentCasesService.findEmpAccidentcasess(empAccidentcases));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:list')")
+ public FebsResponse getAllEmpAccidentCases(EmpAccidentCases empAccidentcases) {
+ return new FebsResponse().data(empAccidentCasesService.findEmpAccidentcasess(empAccidentcases));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empAccidentcases:list')")
-public FebsResponse empAccidentCasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentCasesService.findEmpAccidentcasess(request, empAccidentcases));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empAccidentcases:list')")
+ public FebsResponse empAccidentCasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentCasesService.findEmpAccidentcasess(request, empAccidentcases));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpAccidentCases empBaseinfo, HttpServletResponse response) {
-
+ request.setPageSize(this.empAccidentCasesService.count());
List<EmpAccidentCases> records = this.empAccidentCasesService.findEmpAccidentcasess(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpAccidentCases.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empAccidentcases:add')")
-public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
-try {
-this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
-} catch (Exception e) {
-String message = "新增员工意外险案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empAccidentcases:delete')")
-public void deleteEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
-try {
-this.empAccidentCasesService.deleteEmpAccidentcases(empAccidentcases);
-} catch (Exception e) {
-String message = "删除员工意外险案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:add')")
+ public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
+ try {
+ this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
+ } catch (Exception e) {
+ String message = "新增员工意外险案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empAccidentcases:delete')")
-public void logicDeleteEmpAccidentCases(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empAccidentCasesService.logicDelEmpAccidentCases(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工意外险案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:delete')")
+ public void deleteEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
+ try {
+ this.empAccidentCasesService.deleteEmpAccidentcases(empAccidentcases);
+ } catch (Exception e) {
+ String message = "删除员工意外险案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empAccidentcases:update')")
-public void updateEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
-try {
-this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
-} catch (Exception e) {
-String message = "修改员工意外险案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empAccidentcases:delete')")
+ public void logicDeleteEmpAccidentCases(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empAccidentCasesService.logicDelEmpAccidentCases(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工意外险案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:update')")
+ public void updateEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
+ try {
+ this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
+ } catch (Exception e) {
+ String message = "修改员工意外险案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "意外险案件信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empAccidentcases:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empAccidentCasesService.momentToNormal(ids);
} catch (Exception e) {
--
Gitblit v1.8.0