From e5d0fe8cfdc5e171badfa22bac00b0e2e81ee6e6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 07 六月 2025 16:17:59 +0800
Subject: [PATCH] art: 设备管理-设备维修-维修流程审批接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 104 insertions(+), 5 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..4dfe074 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,6 @@
package org.jeecg.modules.eam.service.impl;
+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;
@@ -8,7 +9,9 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
@@ -38,22 +41,68 @@
* 鍒嗛〉鍒楄〃
*
* @param page
- * @param eamReportRepairQuery
+ * @param query
* @return
*/
@Override
- public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery) {
+ public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery query) {
+ QueryWrapper<EamReportRepair> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
return page;
}
- List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
}
- return this.baseMapper.pageList(page, eamReportRepairQuery, sysUser.getId(), equipmentIds);
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentCode())) {
+ queryWrapper.like("e.equipment_code", query.getEquipmentCode());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentName())) {
+ queryWrapper.like("e.equipment_name", query.getEquipmentName());
+ }
+ if (StringUtils.isNotBlank(query.getBreakdownFlag())) {
+ queryWrapper.eq("wmo.breakdown_flag", query.getBreakdownFlag());
+ }
+ if (StringUtils.isNotBlank(query.getReportStatus())) {
+ queryWrapper.eq("wmo.report_status", query.getReportStatus());
+ }
+ if (StringUtils.isNotBlank(query.getFaultDescription())) {
+ queryWrapper.like("wmo.fault_description", query.getFaultDescription());
+ }
+ if(query.getStartTime() != null && query.getEndTime() != null) {
+ queryWrapper.between("wmo.fault_start_time", query.getStartTime(), query.getEndTime());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return baseMapper.queryPageList(page, queryWrapper);
}
@Override
@@ -148,4 +197,54 @@
this.baseMapper.updateById(eamReportRepair);
return true;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.REPORT_REPAIR, businessTable = "eam_report_repair")
+ public EamReportRepair reportRepairFromSecondMaintenance(String equipmentId, String reportUser, List<EamSecondMaintenanceOrderDetail> detailList) {
+ StringBuilder sb = new StringBuilder();
+ detailList.forEach(detail -> {
+ sb.append(detail.getItemCode()).append("銆�");
+ sb.append(detail.getExceptionDescription()).append(";");
+ });
+ 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);
+ entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
+ this.baseMapper.insert(entity);
+ //鏇存柊璁惧缁翠慨鐘舵��
+ eamEquipmentExtendService.updateEquipmentRepairStatus(entity.getEquipmentId(), EquipmentRepairStatus.WAIT_REPAIR.name());
+ return entity;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.REPORT_REPAIR, businessTable = "eam_report_repair")
+ public EamReportRepair reportRepairFromThirdMaintenance(String equipmentId, String reportUser, List<EamThirdMaintenanceOrderDetail> detailList) {
+ StringBuilder sb = new StringBuilder();
+ detailList.forEach(detail -> {
+ sb.append(detail.getItemCode()).append("銆�");
+ sb.append(detail.getExceptionDescription()).append(";");
+ });
+ 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);
+ entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
+ this.baseMapper.insert(entity);
+ //鏇存柊璁惧缁翠慨鐘舵��
+ eamEquipmentExtendService.updateEquipmentRepairStatus(entity.getEquipmentId(), EquipmentRepairStatus.WAIT_REPAIR.name());
+ return entity;
+ }
}
--
Gitblit v1.9.3