From f9c42e6879387bdad34e714d7a91add2bb182934 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 10 七月 2023 11:23:53 +0800
Subject: [PATCH] 扭矩配置导入导出分页列表接口bug修复
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
index 56756e0..5c752ac 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -5,15 +5,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.MdcTorqueConfig;
import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
-import org.jeecg.modules.mdc.util.DateUtils;
-import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+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.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -35,18 +40,18 @@
}
@Override
- public Boolean addTorque(MdcTorqueConfigVo torqueVo) {
+ public Boolean addTorque(MdcTorqueConfig mdcTorqueConfig) {
boolean result = false;
- String[] equipmentIds = torqueVo.getEquipmentIds().split(",");
+ String[] equipmentIds = mdcTorqueConfig.getEquipmentIds().split(",");
for (String equipmentId : equipmentIds) {
MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
- MdcTorqueConfig mdcTorqueConfig = new MdcTorqueConfig();
- mdcTorqueConfig.setEquipmentId(equipmentId);
- mdcTorqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
- mdcTorqueConfig.setTorqueDate(torqueVo.getTorqueDate());
- mdcTorqueConfig.setTorqueValue(torqueVo.getTorqueValue());
- mdcTorqueConfig.setNotes(torqueVo.getNotes());
- boolean b = super.save(mdcTorqueConfig);
+ MdcTorqueConfig torqueConfig = new MdcTorqueConfig();
+ torqueConfig.setEquipmentId(equipmentId);
+ torqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
+ torqueConfig.setTorqueDate(mdcTorqueConfig.getTorqueDate());
+ torqueConfig.setTorqueValue(mdcTorqueConfig.getTorqueValue());
+ torqueConfig.setNotes(mdcTorqueConfig.getNotes());
+ boolean b = super.save(torqueConfig);
if (b) {
result = true;
}
@@ -105,4 +110,69 @@
}
return this.baseMapper.pageList(page, mdcTorqueConfig);
}
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcTorqueConfig
+ * @return
+ */
+ @Override
+ public ModelAndView exportXls(String userId, MdcTorqueConfig mdcTorqueConfig) {
+ // Step.1 缁勮鏌ヨ鏉′欢
+ LambdaQueryWrapper<MdcTorqueConfig> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId()) && StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())) {
+ if ("2".equals(mdcTorqueConfig.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcTorqueConfig.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcTorqueConfig.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcTorqueConfig.setMdcSectionIds(Collections.singletonList(mdcTorqueConfig.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcTorqueConfig.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+ if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
+ mdcTorqueConfig.setMdcSectionIds(equipmentIds);
+ }
+ if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
+ return null;
+ } else {
+ queryWrapper.in(MdcTorqueConfig::getEquipmentId, mdcTorqueConfig.getMdcSectionIds());
+ }
+ if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())) {
+ queryWrapper.like(MdcTorqueConfig::getEquipmentId, mdcTorqueConfig.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentName())) {
+ queryWrapper.like(MdcTorqueConfig::getEquipmentId, mdcTorqueConfig.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcTorqueConfig.getStartTime()) && StringUtils.isNotEmpty(mdcTorqueConfig.getEndTime())) {
+ queryWrapper.between(MdcTorqueConfig::getTorqueDate, mdcTorqueConfig.getStartTime(), mdcTorqueConfig.getEndTime());
+ }
+ queryWrapper.orderByAsc(MdcTorqueConfig::getTorqueDate);
+ // Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<MdcTorqueConfig> mdcTorqueConfigs = this.baseMapper.selectList(queryWrapper);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "鎵煩閰嶇疆鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, MdcTorqueConfig.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, mdcTorqueConfigs);
+ return mv;
+ }
}
--
Gitblit v1.9.3