From 064d686a81d8537cdcb462b2cd0743fbdfa9c663 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 01 九月 2025 16:46:54 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 200 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 641593a..229d553 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -19,6 +19,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
@@ -26,6 +27,8 @@
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport;
import org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport;
+import org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExportYj;
+import org.jeecg.modules.eam.dto.EchartsDto;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper;
import org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse;
@@ -53,7 +56,9 @@
import javax.annotation.Resource;
import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
/**
@@ -598,7 +603,7 @@
* @return
*/
@Override
- public List<EamThirdMaintenanceOrderExport> export(String ids){
+ public List<EamThirdMaintenanceOrderExportYj> export(String ids){
QueryWrapper<EamThirdMaintenanceOrderExport> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("wmo.del_flag",CommonConstant.DEL_FLAG_0.toString());
queryWrapper.eq("wmo.maintenance_status",SecondMaintenanceStatusEnum.COMPLETE.name());
@@ -631,15 +636,23 @@
queryWrapper.orderByDesc("wmo.create_time");
}
List<EamThirdMaintenanceOrderExport> eamThirdMaintenanceOrderExports=this.baseMapper.queryList(queryWrapper);
+ List<EamThirdMaintenanceOrderExportYj> eamThirdMaintenanceOrderExportYjs=new ArrayList<>();
+ if (!eamThirdMaintenanceOrderExports.isEmpty()){
+ for (EamThirdMaintenanceOrderExport eamThirdMaintenanceOrderExport:eamThirdMaintenanceOrderExports) {
+ EamThirdMaintenanceOrderExportYj eamThirdMaintenanceOrderExportYj = new EamThirdMaintenanceOrderExportYj();
+ BeanUtils.copyProperties(eamThirdMaintenanceOrderExport, eamThirdMaintenanceOrderExportYj);
+ eamThirdMaintenanceOrderExportYjs.add(eamThirdMaintenanceOrderExportYj);
+ }
+ }
//濉厖瀵瑰簲淇悊鏇存崲澶囦欢鏄庣粏
- eamThirdMaintenanceOrderExports.forEach(eamThirdMaintenanceOrderExport->{
+ eamThirdMaintenanceOrderExportYjs.forEach(eamThirdMaintenanceOrderExportYj->{
List<EamThirdMaintenanceSpare> eamThirdMaintenanceSpares=eamThirdMaintenanceSpareService.list(
- new QueryWrapper<EamThirdMaintenanceSpare>().eq("order_Id",eamThirdMaintenanceOrderExport.getId()));
+ new QueryWrapper<EamThirdMaintenanceSpare>().eq("order_Id",eamThirdMaintenanceOrderExportYj.getId()));
if (!eamThirdMaintenanceSpares.isEmpty()){
- eamThirdMaintenanceOrderExport.setEamThirdMaintenanceSpareList(eamThirdMaintenanceSpares);
+ eamThirdMaintenanceOrderExportYj.setEamThirdMaintenanceSpareList(eamThirdMaintenanceSpares);
}
});
- return eamThirdMaintenanceOrderExports;
+ return eamThirdMaintenanceOrderExportYjs;
}
/**
@@ -691,6 +704,188 @@
}
/**
+ * 璁惧绠＄悊棣栭〉-涓変繚璁″垝
+ * @return
+ * */
+ @Override
+ public List<EchartsDto> selectList(String productionCode) {
+ // 鎻愬墠鍒濆鍖栧洓涓粺璁￠」瀵硅薄锛岃缃粯璁ゅ��0
+ Map<String, EchartsDto> echartsMap = new LinkedHashMap<>();
+ echartsMap.put("bysbzs", new EchartsDto("bysbzs", "鏈湀涓変繚璁″垝鎬绘暟", "0", null, null));
+ echartsMap.put("bwc", new EchartsDto("bwc", "鏈湀瀹屾垚", "0", null, null));
+ echartsMap.put("xysb", new EchartsDto("xysb", "涓嬫湀涓変繚璁″垝", "0", null, null));
+ echartsMap.put("xxysb", new EchartsDto("xxysb", "涓嬩笅鏈堜笁淇濊鍒�", "0", null, null));
+
+ QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
+ boolean hasValidCondition = false;
+
+ if (StrUtil.isEmpty(productionCode)) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser != null) {
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ hasValidCondition = true;
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.list(
+ new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())
+ );
+ if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
+ Set<String> factoryIds = baseFactoryUserList.stream()
+ .map(BaseFactoryUser::getFactoryId)
+ .collect(Collectors.toSet());
+ Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds).stream()
+ .map(BaseFactory::getOrgCode)
+ .collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ hasValidCondition = true;
+ }
+ }
+ }
+ } else {
+ List<BaseFactory> baseFactoryList = baseFactoryService.list(
+ new LambdaQueryWrapper<BaseFactory>()
+ .like(BaseFactory::getRemark, productionCode)
+ .eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString())
+ );
+ if (!CollectionUtils.isEmpty(baseFactoryList)) {
+ Set<String> factoryCodes = new HashSet<>();
+ for (BaseFactory baseFactory : baseFactoryList) {
+ List<BaseFactory> factoryList = baseFactoryService.queryFactoryByPid(baseFactory.getId());
+ factoryCodes.addAll(factoryList.stream()
+ .map(BaseFactory::getOrgCode)
+ .collect(Collectors.toSet()));
+ }
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ hasValidCondition = true;
+ }
+ }
+
+ // 濡傛灉娌℃湁鏈夋晥鏌ヨ鏉′欢锛岀洿鎺ヨ繑鍥為粯璁ゅ�煎垪琛�
+ if (!hasValidCondition) {
+ return new ArrayList<>(echartsMap.values());
+ }
+
+ // 鑾峰彇褰撳墠骞存湀鍜屼笅涓や釜鏈堢殑骞存湀瀛楃涓�
+ String currentYearMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ String nextMonth = LocalDate.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+
+ // 浠庡瓧鍏歌〃鑾峰彇閰嶇疆鍊�
+ Map<String, String> dictValues = new HashMap<>();
+ dictValues.put("bysbzs", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_bysbzs").get(0).getValue());
+ dictValues.put("bwc", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_bwc").get(0).getValue());
+ dictValues.put("xysb", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_xysb").get(0).getValue());
+ dictValues.put("xxysb", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_xxysb").get(0).getValue());
+
+ // 鏇存柊缁熻椤癸紙浠呭湪閰嶇疆鍊间负"0"鏃舵煡璇㈠疄闄呮暟鎹級
+ updateEchartsValue(echartsMap, "bysbzs", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone().like("maintenance_date", currentYearMonth)).size());
+
+ updateEchartsValue(echartsMap, "bwc", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone()
+ .like("maintenance_date", currentYearMonth)
+ .eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name())
+ ).size());
+
+ updateEchartsValue(echartsMap, "xysb", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone().like("maintenance_date", nextMonth)).size());
+
+ updateEchartsValue(echartsMap, "xxysb", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone().like("maintenance_date", nextNextMonth)).size());
+
+ return new ArrayList<>(echartsMap.values());
+ }
+
+ // 杈呭姪鏂规硶锛氭洿鏂扮粺璁￠」鐨勫��
+ private void updateEchartsValue(Map<String, EchartsDto> echartsMap, String key,
+ Map<String, String> dictValues, Supplier<Integer> valueSupplier) {
+ if ("0".equals(dictValues.get(key))) {
+ int count = valueSupplier.get();
+ echartsMap.get(key).setValue(String.valueOf(count));
+ } else {
+ echartsMap.get(key).setValue(dictValues.get(key));
+ }
+ }
+
+ /**
+ * 璁惧绠＄悊棣栭〉-涓変繚璁″垝鍒楄〃
+ * @param code
+ * @param page
+ * @return
+ */
+ @Override
+ public IPage<EamThirdMaintenanceOrder> maintenanceList(String code,String productionCode, Page<EamThirdMaintenanceOrder> page){
+ IPage<EamThirdMaintenanceOrder> eamThirdMaintenanceOrderIPage=new Page<>();
+ QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
+ if (StrUtil.isEmpty(productionCode)) {
+ // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return eamThirdMaintenanceOrderIPage; // 杩斿洖绌哄垪琛ㄨ�岄潪null
+ }
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
+ if (CollectionUtils.isEmpty(baseFactoryUserList)) {
+ return eamThirdMaintenanceOrderIPage; // 杩斿洖绌哄垪琛ㄨ�岄潪null
+ }
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ }
+ }else {
+ //閫氳繃閫夋嫨鐨勮溅闂磋繃婊ゅ搴斾腑蹇�
+ List<BaseFactory> baseFactoryList = baseFactoryService.list(new LambdaQueryWrapper<BaseFactory>()
+ .like(BaseFactory::getRemark, productionCode).eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
+ if (CollectionUtils.isEmpty(baseFactoryList)) {
+ return eamThirdMaintenanceOrderIPage;
+ }
+ //缁勮EAM鏁版嵁
+ Set<String> factoryCodes= new HashSet<>();
+ baseFactoryList.forEach(baseFactory -> {
+ List<BaseFactory> factoryList=baseFactoryService.queryFactoryByPid(baseFactory.getId());
+ factoryCodes.addAll(factoryList.stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()));
+ });
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ }
+ queryWrapper.orderByDesc("wmo.create_time");
+ // 鑾峰彇褰撳墠骞存湀鍜屼笅涓や釜鏈堢殑骞存湀瀛楃涓�
+ String currentYearMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ switch (code){
+ case "bysbzs":
+ // 鏈湀涓変繚璁″垝鎬绘暟
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth));
+ break;
+ case "bwc":
+ // 鏈湀瀹屾垚
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth)
+ .eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name()));
+ break;
+ case "xysb":
+ // 涓嬫湀涓変繚璁″垝
+ String nextMonth = LocalDate.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextMonth));
+ break;
+ case "xxysb":
+ // 涓嬩笅鏈堜笁淇濊鍒�
+ String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextNextMonth));
+ break;
+ default:
+ break;
+ }
+ eamThirdMaintenanceOrderIPage.getRecords().forEach(eamThirdMaintenanceOrder -> {
+ eamThirdMaintenanceOrder.setTechnologyStatus(eamEquipmentExtendService.getById(eamThirdMaintenanceOrder.getEquipmentId()).getTechnologyStatus());
+ });
+ return eamThirdMaintenanceOrderIPage;
+ }
+
+ /**
* 鏇存柊宸ュ崟鐘舵��
*/
private void updateOrderStatus(Result result, EamThirdMaintenanceRequest request, EamThirdMaintenanceOrder order, LoginUser user) {
--
Gitblit v1.9.3