From 22c80021ea82ed5954aee912ce7c3bb39a11d9c0 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 21 四月 2025 10:20:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java | 31 ++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 33 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 29 ++++++---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 5 -
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 23 ++++---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java | 14 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 3
12 files changed, 115 insertions(+), 32 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index 1bde718..9c166d0 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
@@ -1,14 +1,19 @@
package org.jeecg.modules.eam.aspect;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.*;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
+import org.jeecg.modules.eam.constant.InspectionStatus;
+import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentHistoryLog;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.service.IEamEquipmentHistoryLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -54,7 +59,9 @@
log.setBusinessTable(syslog.businessTable());
log.setOperationTag(syslog.operationTag().name());
convertResult(log, syslog.operationTag(), result);
- equipmentHistoryLogService.save(log);
+ if (StringUtils.isNotBlank(log.getEquipmentId())) {
+ equipmentHistoryLogService.save(log);
+ }
}
}
@@ -62,7 +69,7 @@
private void convertResult(EamEquipmentHistoryLog log, EquipmentOperationTagEnum operationTag, Object result) {
switch (operationTag) {
case ACCEPTANCE:
- if(result instanceof EamEquipment) {
+ if (result instanceof EamEquipment) {
EamEquipment equipment = (EamEquipment) result;
log.setEquipmentId(equipment.getId());
log.setBusinessId(equipment.getId());
@@ -72,6 +79,28 @@
}
break;
case POINT_INSPECTION:
+ if (result instanceof EamInspectionOrder) {
+ EamInspectionOrder order = (EamInspectionOrder) result;
+ if (InspectionStatus.COMPLETE.name().equals(order.getInspectionStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getConfirmComment());
+ log.setCreateTime(order.getInspectionDate());
+ }
+ }
+ break;
+ case WEEK_MAINTENANCE:
+ if (result instanceof EamWeekMaintenanceOrder) {
+ EamWeekMaintenanceOrder order = (EamWeekMaintenanceOrder) result;
+ if (WeekMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getFinalAcceptanceComment());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case SECOND_MAINTENANCE:
break;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java
index d68826d..abc88f2 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java
@@ -6,6 +6,7 @@
public enum EquipmentOperationTagEnum {
ACCEPTANCE, //楠屾敹
POINT_INSPECTION, //鐐规
+ WEEK_MAINTENANCE, //鍛ㄤ繚
SECOND_MAINTENANCE, //浜屼繚
THIRD_MAINTENANCE, //涓変繚
REPORT_REPAIR, //鎶ヤ慨
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
similarity index 96%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 540a563..863aa72 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -13,7 +13,6 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
* @Description: 鐐规宸ュ崟
@@ -137,10 +136,6 @@
/**璁惧缂栧彿*/
@ApiModelProperty(value = "璁惧缂栧彿")
private transient String equipmentCode;
-
- /**鍒楄〃 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
- private transient List<EamInspectionOrderDetail> tableDetailList;
@ApiModelProperty(value = "璁惧鍚嶇О")
@TableField(exist = false)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java
index f24e398..c886331 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java
@@ -10,5 +10,19 @@
* @Version: V1.0
*/
public interface IEamEquipmentExtendService extends IService<EamEquipmentExtend> {
+ /**
+ * 鏇存柊璁惧淇濆吇鐘舵��
+ * @param equipmentId 璁惧id
+ * @param status 鐘舵��
+ * @return
+ */
+ boolean updateEquipmentMaintenanceStatus(String equipmentId, String status);
+ /**
+ * 鏇存柊璁惧缁翠慨鐘舵��
+ * @param equipmentId 璁惧id
+ * @param status 鐘舵��
+ * @return
+ */
+ boolean updateEquipmentRepairStatus(String equipmentId, String status);
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
index eceed0f..b7c322d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
@@ -6,14 +6,43 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
/**
* @Description: 璁惧鍙拌处鎵╁睍琛�
* @Author: jeecg-boot
- * @Date: 2025-03-19
+ * @Date: 2025-03-19
* @Version: V1.0
*/
@Service
public class EamEquipmentExtendServiceImpl extends ServiceImpl<EamEquipmentExtendMapper, EamEquipmentExtend> implements IEamEquipmentExtendService {
+ @Resource
+ private EamEquipmentExtendMapper eamEquipmentExtendMapper;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateEquipmentMaintenanceStatus(String equipmentId, String status) {
+ EamEquipmentExtend entity = eamEquipmentExtendMapper.selectById(equipmentId);
+ if (entity == null) {
+ return false;
+ }
+ entity.setMaintenanceStatus(status);
+ eamEquipmentExtendMapper.updateById(entity);
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateEquipmentRepairStatus(String equipmentId, String status) {
+ EamEquipmentExtend entity = eamEquipmentExtendMapper.selectById(equipmentId);
+ if (entity == null) {
+ return false;
+ }
+ entity.setRepairStatus(status);
+ eamEquipmentExtendMapper.updateById(entity);
+ return true;
+ }
}
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 3360136..644b781 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
@@ -154,7 +154,8 @@
@ApiOperation(value="鐐规宸ュ崟-鐐规娴佺▼", notes="鐐规宸ュ崟-鐐规娴佺▼")
@PostMapping("/approval")
public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
- return eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
+ eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
+ return Result.OK("鎿嶄綔鎴愬姛");
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 42d5d10..388807e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -230,8 +230,8 @@
if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
}
- boolean b = eamWeekMaintenanceOrderService.approval(request);
- if(!b) {
+ EamWeekMaintenanceOrder b = eamWeekMaintenanceOrderService.approval(request);
+ if(b == null) {
return Result.error("鎿嶄綔澶辫触锛�");
}
return Result.ok("鎿嶄綔鎴愬姛锛�");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index db9c878..7999fa1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -66,7 +66,7 @@
* @param eamInspectionOrderRequest
* @return
*/
- Result<?> inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest);
+ EamInspectionOrder inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest);
/**
* 鍒嗛〉鏌ヨ
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
index 4b56eb4..2a69318 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
@@ -51,7 +51,7 @@
* @param request
* @return
*/
- boolean approval(EamWeekMaintenanceRequest request);
+ EamWeekMaintenanceOrder approval(EamWeekMaintenanceRequest request);
/**
* 鑾峰彇浠婂ぉ涔嬪墠鏈繚鍏诲畬鎴愮殑宸ュ崟
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 6a381ad..9d99aa3 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
@@ -18,8 +18,11 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
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.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
@@ -281,40 +284,42 @@
* @return
*/
@Override
- public Result<?> inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.POINT_INSPECTION, businessTable = "eam_inspection_order")
+ public EamInspectionOrder inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest) {
try {
// 妫�鏌ヨ姹傚弬鏁�
if (!isValidRequest(eamInspectionOrderRequest)) {
- return Result.error("闈炴硶鍙傛暟");
+ throw new JeecgBootException("闈炴硶鍙傛暟");
}
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
LoginUser user = getCurrentUser();
if (user == null || StrUtil.isBlank(user.getId())) {
- return Result.error("璐﹀彿涓嶅瓨鍦�");
+ throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
}
eamInspectionOrderRequest.setAssignee(user.getUsername());
// 鑾峰彇鐐规宸ュ崟淇℃伅
EamInspectionOrder eamInspectionOrder = getEamInspectionOrder(eamInspectionOrderRequest.getDataId());
if (eamInspectionOrder == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
+ throw new JeecgBootException("鏈壘鍒板搴旀暟鎹�");
}
// 鑾峰彇娴佺▼涓氬姟璁板綍
FlowMyBusiness flowMyBusiness = getFlowMyBusiness(eamInspectionOrderRequest.getInstanceId());
if (flowMyBusiness == null) {
- return Result.error("娴佺▼璁板綍涓嶅瓨鍦�");
+ throw new JeecgBootException("娴佺▼璁板綍涓嶅瓨鍦�");
}
// 妫�鏌ョ敤鎴锋槸鍚︽湁鏉冮檺鎿嶄綔浠诲姟
if (!isUserAuthorized(flowMyBusiness, user)) {
- return Result.error("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
}
// 璁ら浠诲姟
if (!claimTask(flowMyBusiness.getTaskId(), user)) {
- return Result.error("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
}
// 璁剧疆娴佺▼鍙橀噺
@@ -334,9 +339,9 @@
updateEamInspectionOrderDetail(eamInspectionOrder);
}
- return Result.OK("鎿嶄綔鎴愬姛");
+ return eamInspectionOrder;
} catch (Exception e) {
- return Result.error("鎿嶄綔澶辫触锛�" + e.getMessage());
+ throw new JeecgBootException("鎿嶄綔澶辫触锛�" + e.getMessage());
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index 8c41f9a..31fa8f9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -21,19 +21,15 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
-import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
import org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderMapper;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderDetailService;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -82,6 +78,8 @@
private IEamEquipmentService eamEquipmentService;
@Autowired
private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -133,6 +131,8 @@
eamWeekMaintenanceOrderMapper.updateById(order);
return result.isSuccess();
}
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
}
return true;
@@ -253,6 +253,8 @@
eamWeekMaintenanceOrderMapper.updateById(entity);
return result.isSuccess();
}
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
}
return true;
}
@@ -291,6 +293,8 @@
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
if (result != null) {
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
return result.isSuccess();
}
return true;
@@ -298,7 +302,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean approval(EamWeekMaintenanceRequest request) {
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.WEEK_MAINTENANCE, businessTable = "eam_week_maintenance_order")
+ public EamWeekMaintenanceOrder approval(EamWeekMaintenanceRequest request) {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderMapper.selectById(request.getId());
if (entity == null) {
throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
@@ -331,7 +336,7 @@
WeekMaintenanceStatusEnum status = WeekMaintenanceStatusEnum.getInstance(entity.getMaintenanceStatus());
if (status == null) {
- return false;
+ return null;
}
//娴佺▼鍙橀噺
Map<String, Object> values = new HashMap<>();
@@ -366,6 +371,8 @@
if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
eamWeekMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
}
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.WAIT_CONFIRM.name());
break;
case WAIT_CONFIRM:
if(StringUtils.isBlank(equipment.getEquipmentManager())) {
@@ -448,6 +455,8 @@
log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
}
}
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
break;
}
request.setValues(values);
@@ -459,7 +468,7 @@
}
//淇濆瓨宸ュ崟
eamWeekMaintenanceOrderMapper.updateById(entity);
- return true;
+ return entity;
}
@Override
--
Gitblit v1.9.3