art: 周保，详情添加字段

zhangherong

2025-06-02 0cd305f943dd0f897928a784be5d0124a2faa851

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

@@ -11,7 +11,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;
@@ -261,12 +260,14 @@
            translateDictTextUtils.translateField("equipmentId", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
            translateDictTextUtils.translateField("standardId", eamWeekMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
            translateDictTextUtils.translateField("operator", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("operatorPhone", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,phone,username");
            translateDictTextUtils.translateField("creationMethod", eamWeekMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
            translateDictTextUtils.translateField("maintenanceStatus", eamWeekMaintenanceOrder.getMaintenanceStatus(), item, "week_maintenance_status");
            translateDictTextUtils.translateField("confirmUser", eamWeekMaintenanceOrder.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmDealType", eamWeekMaintenanceOrder.getConfirmDealType(), item, "approved_rejected");
            translateDictTextUtils.translateField("initialAcceptanceUser", eamWeekMaintenanceOrder.getInitialAcceptanceUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("finalAcceptanceUser", eamWeekMaintenanceOrder.getFinalAcceptanceUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("installationPosition", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,installation_position,id");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
@@ -302,19 +303,19 @@
    @ApiOperation(value = "周保工单-批量审批流程", notes = "周保工单-批量审批流程")
    @PostMapping("/batchApproval")
    public Result<?> batchApproval(@RequestBody EamWeekMaintenanceBatchApprovalRequest request) {
        if (request == null || CollectionUtil.isEmpty(request.getTastList())) {
        if (request == null || CollectionUtil.isEmpty(request.getTaskList())) {
            return Result.error("没有需要审批的数据！");
        }
        int n = 0;
        StringBuilder errorMsg = new StringBuilder();
        List<WorkTaskDataVo> tastList = request.getTastList();
        List<WorkTaskDataVo> tastList = request.getTaskList();
        for (WorkTaskDataVo workTaskDataVo : tastList) {
            EamWeekMaintenanceRequest orderRequest = new EamWeekMaintenanceRequest();
            EamWeekMaintenanceOrder order = eamWeekMaintenanceOrderService.getById(workTaskDataVo.getDataId());
            if (order == null) {
                errorMsg.append("工单ID：");
                errorMsg.append(workTaskDataVo.getDataId());
                errorMsg.append(",不存在或已被删除!\r\n");
                errorMsg.append(",不存在或已被删除!\n");
                continue;
            }
            if (!(WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(order.getMaintenanceStatus())
@@ -322,12 +323,13 @@
                    || WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(order.getMaintenanceStatus()))) {
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",状态无法批量审批!\r\n");
                errorMsg.append(",状态无法批量审批!\n");
                continue;
            }
            List<EamWeekMaintenanceOrderDetail> tableDetailList = weekMaintenanceOrderDetailService.queryListByOrderId(order.getId());
            try {
                BeanUtils.copyProperties(orderRequest, order);
                orderRequest.setId(order.getId());
                orderRequest.setEquipmentId(order.getEquipmentId());
                //审批信息
                if (WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(order.getMaintenanceStatus())) {
                    orderRequest.setConfirmComment(request.getConfirmComment());
@@ -350,7 +352,7 @@
                if (result == null) {
                    errorMsg.append("工单号：");
                    errorMsg.append(order.getOrderNum());
                    errorMsg.append(",审批失败!\r\n");
                    errorMsg.append(",审批失败!\n");
                    continue;
                }
                n++;
@@ -359,12 +361,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());