From 6eb74a8815cefd832fbef19c32fa772fa711e3b4 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期四, 31 八月 2023 14:26:58 +0800
Subject: [PATCH] 基础加班管理功能代码
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java | 154 +++++++++++++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java | 18 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java | 19 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml | 5
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java | 63 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 60 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java | 15 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java | 15 ++
9 files changed, 353 insertions(+), 2 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
new file mode 100644
index 0000000..2d8f11e
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
@@ -0,0 +1,154 @@
+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.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.modules.mdc.entity.MdcEquipmentOvertime;
+import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 璁惧鍔犵彮绠＄悊
+ * @Author: Lius
+ * @Date: 2023-08-25
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "璁惧鍔犵彮绠＄悊")
+@RestController
+@RequestMapping("/mdc/mdcEquipmentOvertime")
+public class MdcEquipmentOvertimeController extends JeecgController<MdcEquipmentOvertime, IMdcEquipmentOvertimeService> {
+
+ @Resource
+ private IMdcEquipmentOvertimeService mdcEquipmentOvertimeService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcEquipmentOvertime
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧鍔犵彮绠＄悊-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧鍔犵彮绠＄悊-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鍔犵彮绠＄悊-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcEquipmentOvertime mdcEquipmentOvertime,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MdcEquipmentOvertime> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipmentOvertime, req.getParameterMap());
+ Page<MdcEquipmentOvertime> page = new Page<MdcEquipmentOvertime>(pageNo, pageSize);
+ IPage<MdcEquipmentOvertime> pageList = mdcEquipmentOvertimeService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcEquipmentOvertime
+ * @return
+ */
+ @AutoLog(value = "璁惧鍔犵彮绠＄悊-娣诲姞")
+ @ApiOperation(value = "璁惧鍔犵彮绠＄悊-娣诲姞", notes = "璁惧鍔犵彮绠＄悊-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) {
+ mdcEquipmentOvertimeService.save(mdcEquipmentOvertime);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcEquipmentOvertime
+ * @return
+ */
+ @AutoLog(value = "璁惧鍔犵彮绠＄悊-缂栬緫")
+ @ApiOperation(value = "璁惧鍔犵彮绠＄悊-缂栬緫", notes = "璁惧鍔犵彮绠＄悊-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) {
+ mdcEquipmentOvertimeService.updateById(mdcEquipmentOvertime);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鍔犵彮绠＄悊-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "璁惧鍔犵彮绠＄悊-閫氳繃id鍒犻櫎", notes = "璁惧鍔犵彮绠＄悊-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcEquipmentOvertimeService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧鍔犵彮绠＄悊-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "璁惧鍔犵彮绠＄悊-鎵归噺鍒犻櫎", notes = "璁惧鍔犵彮绠＄悊-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcEquipmentOvertimeService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鍔犵彮绠＄悊-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧鍔犵彮绠＄悊-閫氳繃id鏌ヨ", notes = "璁惧鍔犵彮绠＄悊-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcEquipmentOvertime mdcEquipmentOvertime = mdcEquipmentOvertimeService.getById(id);
+ return Result.OK(mdcEquipmentOvertime);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcEquipmentOvertime
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcEquipmentOvertime mdcEquipmentOvertime) {
+ return super.exportXls(request, mdcEquipmentOvertime, MdcEquipmentOvertime.class, "璁惧鍔犵彮绠＄悊");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, MdcEquipmentOvertime.class);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
index 495ae4d..46f902d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
@@ -115,9 +115,13 @@
* @param mdcVacationManagement
* @return
*/
+ @AutoLog(value = "鍋囨湡绠＄悊-瀵煎嚭excel")
+ @ApiOperation(value = "鍋囨湡绠＄悊-瀵煎嚭excel",notes = "鍋囨湡绠＄悊-瀵煎嚭excel")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcVacationManagement mdcVacationManagement) {
- return super.exportXls(request, mdcVacationManagement, MdcVacationManagement.class, "鍋囨湡绠＄悊瀵煎嚭");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcVacationManagementService.exportXls(userId, mdcVacationManagement);
}
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
new file mode 100644
index 0000000..8e07728
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -0,0 +1,60 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 璁惧鍔犵彮绠＄悊
+ * @Author: Lius
+ * @Date: 2023-08-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("mdc_equipment_overtime")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_equipment_overtime瀵硅薄", description = "璁惧鍔犵彮绠＄悊")
+public class MdcEquipmentOvertime extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -7163039765166584824L;
+
+ /**
+ * 璁惧缂栫爜
+ */
+ @Excel(name = "璁惧缂栫爜", width = 15)
+ @ApiModelProperty(value = "璁惧缂栫爜")
+ private String equipmentId;
+ /**
+ * 鐢熸晥鏃ユ湡
+ */
+ @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
+ @ApiModelProperty(value = "鐢熸晥鏃ユ湡")
+ private String effectiveDate;
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @Excel(name = "寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private java.util.Date startTime;
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @Excel(name = "缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private java.util.Date endTime;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java
new file mode 100644
index 0000000..2824391
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentOvertimeMapper.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.mdc.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
+
+/**
+ * @Description: 璁惧鍔犵彮绠＄悊
+ * @Author: Lius
+ * @Date: 2023-08-25
+ * @Version: V1.0
+ */
+public interface MdcEquipmentOvertimeMapper extends BaseMapper<MdcEquipmentOvertime> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
new file mode 100644
index 0000000..edd1eae
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.MdcEquipmentOvertimeMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java
new file mode 100644
index 0000000..1c2fc7a
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.mdc.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
+
+/**
+ * @Description: 璁惧鍔犵彮绠＄悊
+ * @Author: Lius
+ * @Date: 2023-08-25
+ * @Version: V1.0
+ */
+public interface IMdcEquipmentOvertimeService extends IService<MdcEquipmentOvertime> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
index acc60c2..168835f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcVacationManagement;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -17,6 +18,7 @@
/**
* 鏍规嵁id鏌ヨ
+ *
* @param id
* @return
*/
@@ -24,6 +26,7 @@
/**
* 鏂板鍋囨湡绠＄悊
+ *
* @param mdcVacationManagement
* @return
*/
@@ -31,6 +34,7 @@
/**
* 缂栬緫鍋囨湡绠＄悊
+ *
* @param mdcVacationManagement
* @return
*/
@@ -38,6 +42,7 @@
/**
* 鏍规嵁id鍒犻櫎
+ *
* @param id
* @return
*/
@@ -45,6 +50,7 @@
/**
* 鎵归噺鍒犻櫎
+ *
* @param ids
* @return
*/
@@ -52,17 +58,27 @@
/**
* 鍒嗛〉鏌ヨ
+ *
* @param userId
* @param page
* @param req
* @param mdcVacationManagement
* @return
*/
- IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req,MdcVacationManagement mdcVacationManagement);
+ IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req, MdcVacationManagement mdcVacationManagement);
/**
* 鐢熸垚鍙屼紤鏃ヤ换鍔�
*/
void generateWeekDays();
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcVacationManagement
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcVacationManagement mdcVacationManagement);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
new file mode 100644
index 0000000..42cd183
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.mdc.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
+import org.jeecg.modules.mdc.mapper.MdcEquipmentOvertimeMapper;
+import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 璁惧鍔犵彮绠＄悊
+ * @Author: Lius
+ * @Date: 2023-08-25
+ * @Version: V1.0
+ */
+@Service
+public class MdcEquipmentOvertimeServiceImpl extends ServiceImpl<MdcEquipmentOvertimeMapper, MdcEquipmentOvertime> implements IMdcEquipmentOvertimeService {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
index 32aa32b..33fb1af 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java
@@ -6,15 +6,22 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.saxon.expr.Component;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.entity.MdcVacationManagement;
import org.jeecg.modules.mdc.mapper.MdcVacationManagementMappper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcVacationManagementService;
import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
@@ -145,4 +152,60 @@
}
}
+
+ @Override
+ public ModelAndView exportXls(String userId, MdcVacationManagement mdcVacationManagement) {
+ LambdaQueryWrapper<MdcVacationManagement> queryWrapper = new LambdaQueryWrapper<>();
+ //鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勮澶囦俊鎭�
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcVacationManagement.getParentId()) && StringUtils.isEmpty(mdcVacationManagement.getEquipmentId())) {
+ if ("2".equals(mdcVacationManagement.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = equipmentService.getEquipmentIdsByDepart(userId, mdcVacationManagement.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = equipmentService.getEquipmentIdsProduction(userId, mdcVacationManagement.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcVacationManagement.setMdcSectionIds(Collections.singletonList(mdcVacationManagement.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勮澶囦俊鎭�
+ if ("2".equals(mdcVacationManagement.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = equipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ equipmentIds = equipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+ if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()) {
+ mdcVacationManagement.setMdcSectionIds(equipmentIds);
+ }
+ if (mdcVacationManagement.getMdcSectionIds() == null || mdcVacationManagement.getMdcSectionIds().isEmpty()) {
+ return null;
+ } else {
+ queryWrapper.in(MdcVacationManagement::getEquipmentId, mdcVacationManagement.getMdcSectionIds());
+ }
+ if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentId())) {
+ queryWrapper.like(MdcVacationManagement::getEquipmentId, mdcVacationManagement.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcVacationManagement.getEquipmentName())) {
+ queryWrapper.like(MdcVacationManagement::getEquipmentName, mdcVacationManagement.getEquipmentName());
+ }
+ if (StringUtils.isNotEmpty(mdcVacationManagement.getStartTime()) && StringUtils.isNotEmpty(mdcVacationManagement.getEndTime())) {
+ queryWrapper.between(MdcVacationManagement::getVacationDate, mdcVacationManagement.getStartTime(), mdcVacationManagement.getEndTime());
+ }
+ queryWrapper.orderByAsc(MdcVacationManagement::getVacationDate);
+ // Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<MdcVacationManagement> mdcStandardProcessDurations = this.baseMapper.selectList(queryWrapper);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "鍋囨湡绠＄悊鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, MdcVacationManagement.class);
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍋囨湡绠＄悊鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "鍋囨湡绠＄悊"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, mdcStandardProcessDurations);
+ return mv;
+ }
}
--
Gitblit v1.9.3