art: 点检 详情添加字段

zhangherong

2025-06-02 c113f78cdc23b0da774c91cab418784f156ee7d3

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java

@@ -10,7 +10,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -197,18 +196,19 @@
            if(order == null) {
                errorMsg.append("工单ID：");
                errorMsg.append(workTaskDataVo.getDataId());
                errorMsg.append(",不存在或已被删除!\r\n");
                errorMsg.append(",不存在或已被删除!\n");
                continue;
            }
            if(!InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus())) {
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",状态无法批量审批!\r\n");
                errorMsg.append(",状态无法批量审批!\n");
                continue;
            }
            List<EamInspectionOrderDetail> tableDetailList = eamInspectionOrderDetailService.queryListByOrderId(order.getId());
            try {
                BeanUtils.copyProperties(orderRequest, order);
                orderRequest.setId(order.getId());
                orderRequest.setEquipmentId(order.getEquipmentId());
                //审批信息
                orderRequest.setConfirmComment(request.getConfirmComment());
                orderRequest.setConfirmDealType(request.getConfirmDealType());
@@ -223,7 +223,7 @@
                if(result == null) {
                    errorMsg.append("工单号：");
                    errorMsg.append(order.getOrderNum());
                    errorMsg.append(",审批失败!\r\n");
                    errorMsg.append(",审批失败!\n");
                    continue;
                }
                n++;
@@ -232,12 +232,12 @@
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",审批失败,错误原因:");
                errorMsg.append(e.getMessage() + "\r\n");
                errorMsg.append(e.getMessage() + "\n");
            }

        }
        if(n > 0) {
            String message = "成功审批通过" + n + "条记录！\r\n" + errorMsg;
            String message = "成功审批通过" + n + "条记录！\n" + errorMsg;
            return Result.OK(message);
        }
        return Result.error(errorMsg.toString());
@@ -293,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("数据转译失败！");