From f813d91421ff6a24b30ef3d1b5d123c08e8331a5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 14 五月 2025 10:21:46 +0800
Subject: [PATCH] art: 设备管理-数据库设计文件修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index faf446f..17d614b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -1,5 +1,7 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -15,12 +17,20 @@
import org.jeecg.modules.eam.mapper.EamReportRepairMapper;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
+import org.jeecg.modules.eam.service.IEamEquipmentFaultReasonService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.vo.EquipmentRepairListVO;
+import org.jeecg.modules.eam.vo.EquipmentRepairStatistics;
+import org.jeecg.modules.eam.vo.EquipmentRepairStatusStatistics;
+import org.jeecg.modules.eam.vo.FaultTypeStatisticsVO;
+import org.jeecg.modules.system.service.IMdcProductionService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.util.*;
/**
@@ -33,6 +43,10 @@
@Resource
private IEamEquipmentExtendService eamEquipmentExtendService;
+ @Autowired
+ private IMdcProductionService mdcProductionService;
+ @Autowired
+ private IEamEquipmentFaultReasonService eamEquipmentFaultReasonService;
/**
* 鍒嗛〉鍒楄〃
@@ -65,15 +79,20 @@
sb.append(detail.getItemCode()).append("銆�");
sb.append(detail.getExceptionDescription()).append(";");
});
+ EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250009);
EamReportRepair entity = new EamReportRepair();
entity.setEquipmentId(equipmentId);
entity.setCreateBy(reportUser);
entity.setFaultStartTime(new Date());
entity.setBreakdownFlag(CommonConstant.DEFAULT_0);
entity.setDelFlag(CommonConstant.DEL_FLAG_0);
- entity.setFaultName("鍛ㄤ繚鎵ц鎶ヤ慨澶勭悊");
- entity.setFaultDescription(sb.toString());
- entity.setFaultType(CommonConstant.DEFAULT_1);
+ if(reason == null){
+ entity.setFaultName("鍛ㄤ繚鎵ц鎶ヤ慨澶勭悊");
+ entity.setFaultDescription(sb.toString());
+ }else {
+ entity.setFaultName(reason.getFaultName());
+ entity.setFaultType(reason.getFaultCategory());
+ }
entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
this.baseMapper.insert(entity);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -90,15 +109,20 @@
sb.append(detail.getItemCode()).append("銆�");
sb.append(detail.getExceptionDescription()).append(";");
});
+ EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250010);
EamReportRepair entity = new EamReportRepair();
entity.setEquipmentId(equipmentId);
entity.setCreateBy(reportUser);
entity.setFaultStartTime(new Date());
entity.setBreakdownFlag(CommonConstant.DEFAULT_0);
entity.setDelFlag(CommonConstant.DEL_FLAG_0);
- entity.setFaultName("鐐规鎵ц鎶ヤ慨澶勭悊");
- entity.setFaultDescription(sb.toString());
- entity.setFaultType(CommonConstant.DEFAULT_1);
+ if(reason == null){
+ entity.setFaultName("鐐规鎵ц鎶ヤ慨澶勭悊");
+ entity.setFaultDescription(sb.toString());
+ }else {
+ entity.setFaultName(reason.getFaultName());
+ entity.setFaultType(reason.getFaultCategory());
+ }
entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
this.baseMapper.insert(entity);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -148,4 +172,40 @@
this.baseMapper.updateById(eamReportRepair);
return true;
}
+
+ @Override
+ public List<EquipmentRepairStatistics> equipmentRepairStatistics(String productionId, LocalDate firstOfMonth, LocalDate today) {
+ if (StringUtils.isNotBlank(productionId)) {
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(productionId);
+ if (CollectionUtil.isEmpty(productIds)) {
+ return Collections.emptyList();
+ }
+ List<EquipmentRepairStatistics> list = this.baseMapper.equipmentRepairStatistics(productIds, firstOfMonth.toString(), today.plusDays(1).toString());
+ if (CollectionUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ return list;
+ }
+ List<EquipmentRepairStatistics> list = this.baseMapper.equipmentRepairStatistics(null, firstOfMonth.toString(), today.plusDays(1).toString());
+ if (CollectionUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ return list;
+ }
+
+ @Override
+ public EquipmentRepairStatusStatistics repairStatusStatistics() {
+ return this.baseMapper.repairStatusStatistics();
+ }
+
+ @Override
+ public List<EquipmentRepairListVO> repairList() {
+ return this.baseMapper.repairList();
+ }
+
+ @Override
+ public List<FaultTypeStatisticsVO> faultTypeStatistics(String start, String end) {
+ return this.baseMapper.faultTypeStatistics(start, end);
+ }
}
--
Gitblit v1.9.3