From b7a38ea941e0ffdf7e7cad62a7d7e07bcfb884fc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 四月 2025 12:38:39 +0800
Subject: [PATCH] art: 设备管理-点检工单-点检状态修改为枚举
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionStatus.java | 26 ++++--------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 67 ++++++++++++---------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 4 -
3 files changed, 34 insertions(+), 63 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionStatus.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionStatus.java
index b90a87c..5c8be10 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionStatus.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionStatus.java
@@ -1,21 +1,13 @@
package org.jeecg.modules.eam.constant;
+import lombok.Getter;
+
+@Getter
public enum InspectionStatus {
- INIT("1", "寰呯偣妫�"),
- IN_PROGRESS("2", "鐐规涓�"),
- COMPLETED("3", "鐐规瀹屾垚" ),
- CONFIRMED("4", "宸茬‘璁�" );
-
- private final String code;
- private final String desc;
-
- InspectionStatus(String code, String desc) {
-
- this.code = code;
- this.desc = desc;
- }
-
- // Getters
- public String getCode() { return code; }
- public String getDesc() { return desc; }
+ WAIT_INSPECTION, //寰呯偣妫�
+ UNDER_INSPECTION, //鐐规涓�
+ WAIT_CONFIRM, //寰呯‘璁�
+ COMPLETE, //宸插畬鎴�
+ ABOLISH, //宸蹭綔搴�
+ EXPIRED; //宸茶繃鏈�
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index 428905e..efe8da6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -15,7 +15,6 @@
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -40,8 +39,7 @@
private IEamInspectionOrderService eamInspectionOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
- private IEamMaintenanceStandardService eamMaintenanceStandardService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 3642513..fc599b0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -12,14 +12,17 @@
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.constant.InspectionStatus;
-import org.jeecg.modules.eam.constant.ReportRepairEnum;
-import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
-import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
+import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -65,8 +68,6 @@
private IMdcUserProductionService mdcUserProductionService;
@Autowired
private IEamReportRepairService eamReportRepairService;
- @Autowired
- private IEamEquipmentFaultReasonService eamEquipmentFaultReasonService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -75,9 +76,9 @@
BeanUtils.copyProperties(eamInspectionOrderRequest,eamInspectionOrder);
//淇敼鐘舵��
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
- eamInspectionOrder.setInspectionStatus(InspectionStatus.IN_PROGRESS.getCode());
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
}else {
- eamInspectionOrder.setInspectionStatus(InspectionStatus.INIT.getCode());
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
}
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
@@ -143,9 +144,9 @@
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())){
- eamInspectionOrder.setInspectionStatus(InspectionStatus.IN_PROGRESS.getCode());
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
}
- updateById(eamInspectionOrder);
+ super.updateById(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
@@ -173,7 +174,7 @@
}else {
eamInspectionOrder.setOperator(user.getUsername());
//淇敼鐘舵��
- eamInspectionOrder.setInspectionStatus(InspectionStatus.IN_PROGRESS.getCode());
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
this.triggerProcess(eamInspectionOrder);
this.updateById(eamInspectionOrder);
return true;
@@ -191,7 +192,7 @@
if (eamInspectionOrder == null) {
return false;
}else {
- eamInspectionOrder.setInspectionStatus("5");
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.ABOLISH.name());
return updateById(eamInspectionOrder);
}
}
@@ -251,7 +252,7 @@
updateEamInspectionOrder(eamInspectionOrder);
//鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
- if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.CONFIRMED.getCode())){
+ if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())){
updateEamInspectionOrderDetail(eamInspectionOrder);
}
@@ -302,7 +303,7 @@
private void setupProcessVariables(EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
Map<String, Object> values = new HashMap<>();
- if (InspectionStatus.IN_PROGRESS.getCode().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) {
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) {
// 鐐规浜虹偣妫�缁撴潫
String orgId = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId()))
.map(equipment -> equipment.getOrgId())
@@ -331,7 +332,7 @@
// 鐝粍闀块┏鍥�
List<String> usernames = new ArrayList<>();
usernames.add(order.getOperator());
- order.setInspectionStatus("2");
+ order.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
values.put("NextAssignee", usernames);
}
}
@@ -340,15 +341,15 @@
private void updateOrderStatus(Result result, EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
if (result.isSuccess()) {
- if (InspectionStatus.IN_PROGRESS.getCode().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
// 鐐规瀹屾垚
- order.setInspectionStatus("3");
+ order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
order.setOperateTime(new Date());
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
- } else if (InspectionStatus.COMPLETED.getCode().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getDealType())) {
+ } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getDealType())) {
// 鐝粍闀跨‘璁や换鍔�
- order.setInspectionStatus("4");
+ order.setInspectionStatus(InspectionStatus.COMPLETE.name());
order.setConfirmUser(user.getUsername());
order.setConfirmTime(new Date());
}
@@ -364,30 +365,10 @@
* @param eamInspectionOrder
*/
private void updateEamInspectionOrderDetail(EamInspectionOrder eamInspectionOrder) {
- EamEquipmentFaultReason eamEquipmentFaultReason=eamEquipmentFaultReasonService.
- getOne(new QueryWrapper<EamEquipmentFaultReason>().eq("fault_code","EFR20250003"));
List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
.list(new QueryWrapper<EamInspectionOrderDetail>()
- .eq("order_id", eamInspectionOrder.getId()).eq("report_flag","1"));
- List<EamReportRepair> eamReportRepairs = new ArrayList<>();
- if (!eamInspectionOrderDetails.isEmpty()) {
- eamInspectionOrderDetails.forEach(item->{
- EamReportRepair eamReportRepair=new EamReportRepair();
- eamReportRepair.setEquipmentId(eamInspectionOrder.getEquipmentId());
- eamReportRepair.setFaultName(eamEquipmentFaultReason.getFaultName());
- eamReportRepair.setFaultType(eamEquipmentFaultReason.getFaultCategory());
- eamReportRepair.setFaultDescription(eamEquipmentFaultReason.getFaultDescription());
- eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
- eamReportRepair.setBreakdownFlag("1");
- eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
- eamReportRepair.setFaultStartTime(new Date());
- eamReportRepair.setRemark(item.getExceptionDescription());
- eamReportRepairs.add(eamReportRepair);
- });
- }
- if (!eamReportRepairs.isEmpty()) {
- eamReportRepairService.saveBatch(eamReportRepairs);
- }
+ .eq("order_id", eamInspectionOrder.getId()).eq("report_flag","1").eq("inspection_result", "2"));
+ eamReportRepairService.reportRepairFromInspection(eamInspectionOrder.getEquipmentId(), eamInspectionOrder.getOperator(), eamInspectionOrderDetails);
}
/**
@@ -406,12 +387,12 @@
List<String> list = Arrays.asList(ids.split(","));
QueryWrapper<EamInspectionOrder> queryWrapper =new QueryWrapper<>();
queryWrapper.in("id", list);
- queryWrapper.eq("inspection_status", "1");
+ queryWrapper.eq("inspection_status", InspectionStatus.WAIT_INSPECTION.name());
List<EamInspectionOrder> eamInspectionOrderList =this.list(queryWrapper);
if (!eamInspectionOrderList.isEmpty()){
eamInspectionOrderList.forEach(eamInspectionOrder -> {
eamInspectionOrder.setInspectionStatus(type);
- if (type.equals("2")){
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(type)){
eamInspectionOrder.setOperator(loginUser.getUsername());
this.triggerProcess(eamInspectionOrder);
}else {
--
Gitblit v1.9.3