zhangherong
2025-04-21 ebc4996578cc06cacda5561a45a4dfc2c951d070
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
@@ -79,6 +80,7 @@
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.WEEK_MAINTENANCE_CODE_RULE);
        request.setOrderNum(codeSeq);
        request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
        boolean b = eamWeekMaintenanceOrderService.addWeekMaintenance(request);
        if (!b) {
            return Result.error("添加失败!");
@@ -228,8 +230,8 @@
        if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
            return Result.error("审批任务错误或不存在!");
        }
        boolean b = eamWeekMaintenanceOrderService.approval(request);
        if(!b) {
        EamWeekMaintenanceOrder b = eamWeekMaintenanceOrderService.approval(request);
        if(b == null) {
            return Result.error("操作失败!");
        }
        return Result.ok("操作成功!");