art: 点检 详情添加字段

zhangherong

2025-06-02 c113f78cdc23b0da774c91cab418784f156ee7d3

 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("数据转译失败！");