From d6dc4fa6ee7cf3aa860bd4e06312f230db168da7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 四月 2025 10:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
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 a9ac0fc..bc99d22 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
@@ -5,9 +5,12 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
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;
@@ -76,7 +79,7 @@
}else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.INIT.getCode());
}
- save(eamInspectionOrder);
+
//澶勭悊鏄庣粏鏁版嵁
if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
@@ -85,6 +88,18 @@
});
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
}
+ //澶勭悊闄勪欢
+ if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
+ FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResult);
+ eamInspectionOrder.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ save(eamInspectionOrder);
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
triggerProcess(eamInspectionOrder);
}
@@ -363,6 +378,7 @@
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());
@@ -397,6 +413,7 @@
eamInspectionOrder.setInspectionStatus(type);
if (type.equals("2")){
eamInspectionOrder.setOperator(loginUser.getUsername());
+ this.triggerProcess(eamInspectionOrder);
}else {
eamInspectionOrder.setOperator(null);
}
--
Gitblit v1.9.3