From 09e22d89710364548fa896917506a372795a7bd3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 26 一月 2024 09:37:36 +0800
Subject: [PATCH] 加班管理功能调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
index 2d8f11e..b69c725 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
@@ -1,16 +1,16 @@
package org.jeecg.modules.mdc.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
import org.springframework.web.bind.annotation.*;
@@ -52,9 +52,10 @@
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcEquipmentOvertime> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipmentOvertime, req.getParameterMap());
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
Page<MdcEquipmentOvertime> page = new Page<MdcEquipmentOvertime>(pageNo, pageSize);
- IPage<MdcEquipmentOvertime> pageList = mdcEquipmentOvertimeService.page(page, queryWrapper);
+ IPage<MdcEquipmentOvertime> pageList = mdcEquipmentOvertimeService.pageList(userId, page, mdcEquipmentOvertime, req);
return Result.OK(pageList);
}
@@ -68,7 +69,13 @@
@ApiOperation(value = "璁惧鍔犵彮绠＄悊-娣诲姞", notes = "璁惧鍔犵彮绠＄悊-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) {
- mdcEquipmentOvertimeService.save(mdcEquipmentOvertime);
+ if (org.apache.commons.lang3.StringUtils.isBlank(mdcEquipmentOvertime.getEquipmentId())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
+ }
+ boolean result = mdcEquipmentOvertimeService.addOvertime(mdcEquipmentOvertime);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -136,7 +143,9 @@
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcEquipmentOvertime mdcEquipmentOvertime) {
- return super.exportXls(request, mdcEquipmentOvertime, MdcEquipmentOvertime.class, "璁惧鍔犵彮绠＄悊");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcEquipmentOvertimeService.exportXls(userId, mdcEquipmentOvertime);
}
/**
--
Gitblit v1.9.3