From 07715a7bc338238ad8a14195f3073f3e76ba3a93 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 17 七月 2023 11:33:17 +0800
Subject: [PATCH] 非计划停机导出修改，假期类型加入数据字典
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java | 74 +++++++++++++++++++++++++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcNoplanCloseController.java | 4 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcNoplanCloseService.java | 11 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java | 2 +
4 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcNoplanCloseController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcNoplanCloseController.java
index c4fcfd7..f2db157 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcNoplanCloseController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcNoplanCloseController.java
@@ -165,7 +165,9 @@
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcNoplanClose mdcNoplanClose) {
- return super.exportXls(request, mdcNoplanClose, MdcNoplanClose.class, "闈炶鍒掑仠鏈虹淮鎶よ〃");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return this.mdcNoplanCloseService.exportXls(userId, mdcNoplanClose);
}
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java
index 734ed28..ed5552e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcVacationManagement.java
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -64,6 +65,7 @@
*/
@Excel(name = "绫诲瀷",width = 15)
@ApiModelProperty("绫诲瀷")
+ @Dict(dicCode = "vacation_type")
private String vacationType;
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcNoplanCloseService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcNoplanCloseService.java
index 94f1f58..6026075 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcNoplanCloseService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcNoplanCloseService.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcNoplanClose;
import org.jeecg.modules.mdc.vo.MdcNoplanCloseVo;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -38,8 +39,18 @@
/**
* 缂栬緫
+ *
* @param mdcNoplanClose
* @return
*/
boolean updateMdcNoplan(MdcNoplanClose mdcNoplanClose);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcNoplanClose
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcNoplanClose mdcNoplanClose);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
index f2b6262..4da0d4c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
@@ -6,15 +6,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.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.MdcEquipmentRepair;
import org.jeecg.modules.mdc.entity.MdcNoplanClose;
+import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.mapper.MdcNoplanCloseMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcNoplanCloseService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcNoplanCloseVo;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -243,4 +250,71 @@
}
return result;
}
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcNoplanClose
+ * @return
+ */
+ @Override
+ public ModelAndView exportXls(String userId, MdcNoplanClose mdcNoplanClose) {
+ LambdaQueryWrapper<MdcNoplanClose> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcNoplanClose.getParentId()) && StringUtils.isEmpty(mdcNoplanClose.getEquipmentId())) {
+ if ("2".equals(mdcNoplanClose.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcNoplanClose.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcNoplanClose.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcNoplanClose.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcNoplanClose.setMdcSectionIds(Collections.singletonList(mdcNoplanClose.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcNoplanClose.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+ if (mdcNoplanClose.getMdcSectionIds() == null || mdcNoplanClose.getMdcSectionIds().isEmpty()) {
+ mdcNoplanClose.setMdcSectionIds(equipmentIds);
+ }
+ if (mdcNoplanClose.getMdcSectionIds() == null || mdcNoplanClose.getMdcSectionIds().isEmpty()) {
+ return null;
+ } else {
+ queryWrapper.in(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getMdcSectionIds());
+ }
+ if (StringUtils.isNotEmpty(mdcNoplanClose.getEquipmentId())) {
+ queryWrapper.like(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcNoplanClose.getEquipmentName())) {
+ queryWrapper.like(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getEquipmentId());
+ }
+ if (mdcNoplanClose.getEndTime() != null) {
+ queryWrapper.le(MdcNoplanClose::getStartTime, mdcNoplanClose.getEndTime());
+ }
+ if (mdcNoplanClose.getStartTime() != null) {
+ queryWrapper.ge(MdcNoplanClose::getEndTime, mdcNoplanClose.getStartTime());
+ }
+ queryWrapper.orderByAsc(MdcNoplanClose::getStartTime);
+ // Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<MdcNoplanClose> mdcNoplanCloses = this.baseMapper.selectList(queryWrapper);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "闈炶鍒掑仠鏈虹淮鎶ゅ垪琛�");
+ mv.addObject(NormalExcelConstants.CLASS, MdcNoplanClose.class);
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ //update-begin---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("闈炶鍒掑仠鏈虹淮鎶ゅ垪琛ㄦ暟鎹�", "瀵煎嚭浜�:"+user.getRealname(), "瀵煎嚭淇℃伅"));
+ //update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ mv.addObject(NormalExcelConstants.DATA_LIST, mdcNoplanCloses);
+ return mv;
+ }
}
--
Gitblit v1.9.3