龚焕茏
2024-04-16 c139302858be79aa5ca1f823c3ae3d8b1b16d6f5
工单处理:过程图
5个文件已修改
68 ■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -62,9 +62,9 @@
    @TableField("yw_condition")
    private String ywCondition;
    @ApiModelProperty("运维检测结果")
    @TableField("yw_check_result")
    private String ywCheckResult;
    @ApiModelProperty("处理期限")
    @TableField("processing_period")
    private Integer processingPeriod;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -2,16 +2,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import enumeration.general.WorkOrderStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
 * 工单查询
@@ -46,5 +42,9 @@
     */
    private String errorType;
    /**
     * 状态
     */
    private WorkOrderStatusEnum status = WorkOrderStatusEnum.DISTRIBUTED;
}
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -63,6 +63,18 @@
        return workOrderService.selectYwConditionByYwId(id);
    }
    @GetMapping("/yw-condition-list/{id}")
    @ApiOperation(value = "运维情况记录", notes = "运维情况记录")
    public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
        return workOrderService.selectYwConditionListByYwId(id);
    }
    @GetMapping("/yw-auditing-list/{id}")
    @ApiOperation(value = "运维审核记录", notes = "运维审核记录")
    public Result ywAuditingByYwId(@PathVariable @Validated(Update.class) String id) {
        return workOrderService.selectYwAuditingListByYwId(id);
    }
    @PutMapping("/yw-result")
    @ApiOperation(value = "运维结果", notes = "运维结果")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -113,4 +113,18 @@
     * @return 工单运维情况
     */
    Result selectYwConditionByYwId(String id);
    /**
     * 获取工单运维情况记录
     * @param id 工单id
     * @return 工单运维情况记录
     */
    Result selectYwConditionListByYwId(String id);
    /**
     * 获取工单运维审核记录
     * @param id 工单id
     * @return 工单运维审核记录
     */
    Result selectYwAuditingListByYwId(String id);
}
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -134,9 +134,27 @@
        return Result.ok().data(
                new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
                        .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
                        .orderByDesc(WorkOrderYwConditionRecord::getCreateTime)
                        .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
                        .last("limit 1")
                        .one());
    }
    @Override
    public Result selectYwConditionListByYwId(String id) {
        return Result.ok().data(
                new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
                        .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
                        .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
                        .list());
    }
    @Override
    public Result selectYwAuditingListByYwId(String id) {
        return Result.ok().data(
                new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
                        .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
                        .orderByDesc(WorkOrderAuditingRecord::getCreateTime)
                        .list());
    }
    @Override
@@ -184,7 +202,7 @@
    public Result page(WorkOrderQuery query) {
        IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
                .in(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED, WorkOrderStatusEnum.YW_HANDLE)
                .eq(StringUtils.hasText(query.getStatus().getValue()), WorkOrder::getStatus, query.getStatus())
                .eq(StringUtils.hasText(query.getErrorType()), WorkOrder::getErrorType, query.getErrorType())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        WorkOrder::getYwHandleTime,