xiangpei
2024-04-07 644b9db1f4dc6716496c1f14f27391ebaf41ef72
工单状态完善
3个文件已修改
14 ■■■■ 已修改文件
ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java
@@ -15,7 +15,10 @@
    WAIT_DISTRIBUTE("WAIT_DISTRIBUTE", "等待下发"),
    DISTRIBUTED("DISTRIBUTED", "已下发"),
    YW_HANDLE("YW_HANDLE", "运维已处理"),
    AUDITING("AUDITING", "审核中"),
    AUDITING_SUCCESS("AUDITING_SUCCESS", "审核通过"),
    AUDITING_FAIL("AUDITING_FAIL", "审核不通过"),
    FINISH("FINISH", "已完成"),
    ;
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.form;
import com.ycl.platform.base.AbsForm;
import enumeration.general.WorkOrderStatusEnum;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@@ -17,7 +18,7 @@
     * 审核结果
     */
    @NotBlank(message = "审核结果不能为空")
    private String auditingResult;
    private WorkOrderStatusEnum auditingResult;
    /**
     * 审核说明
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -89,17 +89,13 @@
            throw new ServiceException("工单不存在");
        }
        // 工单状态
        if ("pass".equals(form.getAuditingResult())) {
            workOrder.setStatus(WorkOrderStatusEnum.FINISH);
        } else {
            workOrder.setStatus(WorkOrderStatusEnum.AUDITING);
        }
        workOrder.setStatus(form.getAuditingResult());
        baseMapper.updateById(workOrder);
        // 添加一条审核记录
        WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
        workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
        workOrderAuditingRecord.setAuditingUser(1);
        workOrderAuditingRecord.setResult(form.getAuditingResult());
        workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
        workOrderAuditingRecord.setRemark(form.getAuditingRemark());
        workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
        return Result.ok("操作成功");