From bd56825b00f131000b721f4fa2e4619c56a612a0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 20:57:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 ab94a57..334fffc 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
@@ -31,7 +31,6 @@
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.util.DateUtils;
-import org.jeecg.modules.eam.vo.InspectionVo;
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;
@@ -39,19 +38,18 @@
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysDictService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
/**
* @Description: 鐐规宸ュ崟
@@ -90,6 +88,8 @@
private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
@Resource
private ISysDictService sysDictService;
+ @Resource
+ private ISysUserService sysUserService;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -598,8 +598,13 @@
throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
}
+ EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
// 璁剧疆娴佺▼鍙橀噺
- setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user);
+ setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user, equipment);
// 瀹屾垚娴佺▼浠诲姟
Result result = flowTaskService.complete(eamInspectionOrderRequest);
@@ -661,13 +666,17 @@
return true;
}
- private void setupProcessVariables(EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
+ private void setupProcessVariables(EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user, EamEquipment equipment) {
Map<String, Object> values = new HashMap<>();
if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) {
// 鐐规浜虹偣妫�缁撴潫
values.put("dataId", order.getId());
values.put("organization", "鐐规浜虹偣妫�缁撴潫");
values.put("comment", "鐐规浜虹偣妫�缁撴潫");
+ // 鑾峰彇涓嬩竴姝ユ墽琛屼汉
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), null, BusinessCodeConst.PCR0002);
+ List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
request.setComment("鐐规浜虹偣妫�缁撴潫");
} else {
// 缁翠慨宸ョ‘璁�
@@ -696,10 +705,17 @@
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
+ //璁剧疆鍛ㄧ偣妫�
if (request.getTableWeekDetailList() != null && !request.getTableWeekDetailList().isEmpty()) {
- // 璁剧疆鍛ㄧ偣妫�
-// eamWeekInspectionDetailService.remove(new QueryWrapper<EamWeekInspectionDetail>().eq("order_id", order.getId()));
- eamWeekInspectionDetailService.saveOrUpdateBatch(request.getTableWeekDetailList());
+ List<EamWeekInspectionDetail> tableWeekDetailList = request.getTableWeekDetailList();
+ for (EamWeekInspectionDetail eamWeekInspectionDetail : tableWeekDetailList) {
+ if (StringUtils.isEmpty(eamWeekInspectionDetail.getInspectionResult())) {
+ break;
+ }
+ eamWeekInspectionDetail.setInspector(user.getUsername());
+ eamWeekInspectionDetail.setInspectTime(new Date());
+ }
+ eamWeekInspectionDetailService.saveOrUpdateBatch(tableWeekDetailList);
}
} else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
// 鐝粍闀跨‘璁や换鍔�
@@ -723,8 +739,10 @@
*/
private void updateEamInspectionOrderDetail(EamInspectionOrder eamInspectionOrder) {
List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
- .list(new QueryWrapper<EamInspectionOrderDetail>()
- .eq("order_id", eamInspectionOrder.getId()).eq("report_flag", "1").eq("inspection_result", "2"));
+ .list(new LambdaQueryWrapper<EamInspectionOrderDetail>()
+ .eq(EamInspectionOrderDetail::getOrderId, eamInspectionOrder.getId()).eq(EamInspectionOrderDetail::getReportFlag, "1"));
+
+ // TODO 鐐规瀹屾垚鍚庤嚜鍔ㄤ繚淇�
eamReportRepairService.reportRepairFromInspection(eamInspectionOrder.getEquipmentId(), eamInspectionOrder.getOperator(), eamInspectionOrderDetails);
}
--
Gitblit v1.9.3