From 32098219223b01253dc8d51cb077809fa43d50b6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 22 一月 2025 14:24:27 +0800
Subject: [PATCH] 故障停机和维修时长维护功能
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java | 9 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java | 68 ++++++++++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java | 9 ++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java | 10 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java | 8 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java | 69 +++++++++++++++++++++++
7 files changed, 168 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java
index 957c33a..c9f697f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java
@@ -141,11 +141,13 @@
* 瀵煎嚭excel
*
* @param request
- * @param mdcDownTime
+ * @param mdcDownTimeVo
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MdcDownTime mdcDownTime) {
- return super.exportXls(request, mdcDownTime, MdcDownTime.class, "璁惧鏁呴殰鍋滄満鏃堕暱琛�");
+ public ModelAndView exportXls(HttpServletRequest request, MdcDownTimeVo mdcDownTimeVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcDownTimeService.exportXls(userId, mdcDownTimeVo);
}
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java
index adc1ca4..ee39266 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java
@@ -141,11 +141,14 @@
* 瀵煎嚭excel
*
* @param request
- * @param mdcRepairInfo
+ * @param mdcRepairInfoVo
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MdcRepairInfo mdcRepairInfo) {
- return super.exportXls(request, mdcRepairInfo, MdcRepairInfo.class, "璁惧缁翠慨鏃堕暱琛�");
+ public ModelAndView exportXls(HttpServletRequest request, MdcRepairInfoVo mdcRepairInfoVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcRepairInfoService.exportXls(userId, mdcRepairInfoVo);
+// return super.exportXls(request, mdcRepairInfo, MdcRepairInfo.class, "璁惧缁翠慨鏃堕暱琛�");
}
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java
index 151eaf8..3ff6a09 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcDownTime;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -33,4 +34,13 @@
* @return
*/
boolean addDownTime(MdcDownTimeVo mdcDownTimeVo);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcDownTimeVo
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcDownTimeVo mdcDownTimeVo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java
index 40baab0..97e4594 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcRepairInfo;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -34,4 +35,12 @@
*/
boolean addRepair(MdcRepairInfoVo mdcRepairInfoVo);
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcRepairInfoVo
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcRepairInfoVo mdcRepairInfoVo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java
index 9c05682..ad61e02 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java
@@ -1,16 +1,24 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.MdcDownTime;
+import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.mapper.MdcDownTimeMapper;
import org.jeecg.modules.mdc.service.IMdcDownTimeService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
+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.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -83,4 +91,65 @@
this.saveBatch(downTimeList);
return true;
}
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcDownTimeVo
+ * @return
+ */
+ @Override
+ public ModelAndView exportXls(String userId, MdcDownTimeVo mdcDownTimeVo) {
+ LambdaQueryWrapper<MdcDownTime> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcDownTimeVo.getParentId()) && StringUtils.isEmpty(mdcDownTimeVo.getEquipmentId())) {
+ if ("2".equals(mdcDownTimeVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDownTimeVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDownTimeVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcDownTimeVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcDownTimeVo.setEquipmentIdList(Collections.singletonList(mdcDownTimeVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcDownTimeVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcDownTimeVo.getEquipmentIdList() == null || mdcDownTimeVo.getEquipmentIdList().isEmpty()) {
+ mdcDownTimeVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcDownTimeVo.getEquipmentIdList() == null || mdcDownTimeVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ } else {
+ queryWrapper.in(MdcDownTime::getEquipmentId, mdcDownTimeVo.getEquipmentIdList());
+ }
+ if (StringUtils.isNotEmpty(mdcDownTimeVo.getEquipmentId())) {
+ queryWrapper.eq(MdcDownTime::getEquipmentId, mdcDownTimeVo.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcDownTimeVo.getStartTime()) && StringUtils.isNotEmpty(mdcDownTimeVo.getEndTime())) {
+ queryWrapper.between(MdcDownTime::getTheDate, mdcDownTimeVo.getStartTime(), mdcDownTimeVo.getEndTime());
+ }
+ queryWrapper.orderByDesc(MdcDownTime::getTheDate).orderByDesc(MdcDownTime::getEquipmentId);
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<MdcDownTime> downTimes = this.baseMapper.selectList(queryWrapper);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鏁呴殰鍋滄満鏃堕暱鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, MdcDownTime.class);
+ 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, downTimes);
+ return mv;
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
index a8ec2dc..3486a28 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
@@ -102,7 +102,7 @@
*/
@Override
public ModelAndView exportXls(String userId, MdcOeeInfoVo mdcOeeInfoVo) {
- LambdaQueryWrapper<MdcOeeInfo> queryWrapper = new LambdaQueryWrapper();
+ LambdaQueryWrapper<MdcOeeInfo> queryWrapper = new LambdaQueryWrapper<>();
List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotEmpty(mdcOeeInfoVo.getParentId()) && StringUtils.isEmpty(mdcOeeInfoVo.getEquipmentId())) {
if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java
index 3acd269..e41073a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java
@@ -1,17 +1,24 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.MdcDownTime;
import org.jeecg.modules.mdc.entity.MdcRepairInfo;
import org.jeecg.modules.mdc.mapper.MdcRepairInfoMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcRepairInfoService;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
+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.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -93,4 +100,65 @@
this.saveBatch(repairInfoList);
return true;
}
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcRepairInfoVo
+ * @return
+ */
+ @Override
+ public ModelAndView exportXls(String userId, MdcRepairInfoVo mdcRepairInfoVo) {
+ LambdaQueryWrapper<MdcRepairInfo> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcRepairInfoVo.getParentId()) && StringUtils.isEmpty(mdcRepairInfoVo.getEquipmentId())) {
+ if ("2".equals(mdcRepairInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcRepairInfoVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcRepairInfoVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcRepairInfoVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcRepairInfoVo.setEquipmentIdList(Collections.singletonList(mdcRepairInfoVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcRepairInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcRepairInfoVo.getEquipmentIdList() == null || mdcRepairInfoVo.getEquipmentIdList().isEmpty()) {
+ mdcRepairInfoVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcRepairInfoVo.getEquipmentIdList() == null || mdcRepairInfoVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ } else {
+ queryWrapper.in(MdcRepairInfo::getEquipmentId, mdcRepairInfoVo.getEquipmentIdList());
+ }
+ if (StringUtils.isNotEmpty(mdcRepairInfoVo.getEquipmentId())) {
+ queryWrapper.eq(MdcRepairInfo::getEquipmentId, mdcRepairInfoVo.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcRepairInfoVo.getStartTime()) && StringUtils.isNotEmpty(mdcRepairInfoVo.getEndTime())) {
+ queryWrapper.between(MdcRepairInfo::getTheDate, mdcRepairInfoVo.getStartTime(), mdcRepairInfoVo.getEndTime());
+ }
+ queryWrapper.orderByDesc(MdcRepairInfo::getTheDate).orderByDesc(MdcRepairInfo::getEquipmentId);
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<MdcRepairInfo> repairInfos = this.baseMapper.selectList(queryWrapper);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧缁翠慨鏃堕暱鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, MdcRepairInfo.class);
+ 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, repairInfos);
+ return mv;
+ }
}
--
Gitblit v1.9.3