From c113f78cdc23b0da774c91cab418784f156ee7d3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 10:49:11 +0800
Subject: [PATCH] art: 点检 详情添加字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 1 deletions(-)
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 c549b7e..b281684 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,11 +15,16 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
+import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +32,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
/**
* @Description: 鐐规宸ュ崟
@@ -47,6 +54,8 @@
private ObjectMapper objectMapper;
@Autowired
private TranslateDictTextUtils translateDictTextUtils;
+ @Autowired
+ private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -172,6 +181,68 @@
return Result.OK("鎿嶄綔鎴愬姛");
}
+ @ApiOperation(value = "鐐规宸ュ崟-鎵归噺瀹℃壒娴佺▼", notes = "鐐规宸ュ崟-鎵归噺瀹℃壒娴佺▼")
+ @PostMapping("/batchApproval")
+ public Result<?> batchApproval(@RequestBody EamInspectionBatchApprovalRequest request) {
+ if(request == null || CollectionUtil.isEmpty(request.getTaskList())) {
+ return Result.error("娌℃湁闇�瑕佸鎵圭殑鏁版嵁锛�");
+ }
+ int n = 0;
+ StringBuilder errorMsg = new StringBuilder();
+ List<WorkTaskDataVo> tastList = request.getTaskList();
+ for(WorkTaskDataVo workTaskDataVo : tastList) {
+ EamInspectionOrderRequest orderRequest = new EamInspectionOrderRequest();
+ EamInspectionOrder order = eamInspectionOrderService.getById(workTaskDataVo.getDataId());
+ if(order == null) {
+ errorMsg.append("宸ュ崟ID锛�");
+ errorMsg.append(workTaskDataVo.getDataId());
+ errorMsg.append(",涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎!\n");
+ continue;
+ }
+ if(!InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus())) {
+ errorMsg.append("宸ュ崟鍙凤細");
+ errorMsg.append(order.getOrderNum());
+ errorMsg.append(",鐘舵�佹棤娉曟壒閲忓鎵�!\n");
+ continue;
+ }
+ List<EamInspectionOrderDetail> tableDetailList = eamInspectionOrderDetailService.queryListByOrderId(order.getId());
+ try {
+ orderRequest.setId(order.getId());
+ orderRequest.setEquipmentId(order.getEquipmentId());
+ //瀹℃壒淇℃伅
+ orderRequest.setConfirmComment(request.getConfirmComment());
+ orderRequest.setConfirmDealType(request.getConfirmDealType());
+ //浠诲姟淇℃伅
+ orderRequest.setDataId(workTaskDataVo.getDataId());
+ orderRequest.setTaskId(workTaskDataVo.getId());
+ orderRequest.setUserId(workTaskDataVo.getAssignee());
+ orderRequest.setInstanceId(workTaskDataVo.getProcInstId());
+ orderRequest.setValues(workTaskDataVo.getVariables());
+ orderRequest.setTableDetailList(tableDetailList);
+ EamInspectionOrder result = eamInspectionOrderService.inspectionProcess(orderRequest);
+ if(result == null) {
+ errorMsg.append("宸ュ崟鍙凤細");
+ errorMsg.append(order.getOrderNum());
+ errorMsg.append(",瀹℃壒澶辫触!\n");
+ continue;
+ }
+ n++;
+
+ } catch (Exception e) {
+ errorMsg.append("宸ュ崟鍙凤細");
+ errorMsg.append(order.getOrderNum());
+ errorMsg.append(",瀹℃壒澶辫触,閿欒鍘熷洜:");
+ errorMsg.append(e.getMessage() + "\n");
+ }
+
+ }
+ if(n > 0) {
+ String message = "鎴愬姛瀹℃壒閫氳繃" + n + "鏉¤褰曪紒\n" + errorMsg;
+ return Result.OK(message);
+ }
+ return Result.error(errorMsg.toString());
+ }
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -222,10 +293,12 @@
translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("operatorPhone", eamInspectionOrder.getOperator(), item, "sys_user,phone,username");
translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
+ translateDictTextUtils.translateField("installationPosition", eamInspectionOrder.getEquipmentId(), item, "eam_equipment,installation_position,id");
return Result.OK(item);
} catch (JsonProcessingException e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
--
Gitblit v1.9.3