工单过程图接口更换

xiangpei

2024-08-29 3e9a6da99aae968123ee7bca352fc08becd7f1f2

工单过程图接口更换

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java

@@ -37,6 +37,4 @@
    @ApiModelProperty("审核备注")
    @TableField("remark")
    private String remark;


}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java

New file
@@ -0,0 +1,27 @@
package com.ycl.platform.domain.vo;

import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import lombok.Data;

import java.util.List;

/**
 * 工单过程图
 *
 * @author：xp
 * @date：2024/8/29 17:05
 */
@Data
public class WorkOrderProcessVO {

    /**
     * 运维记录
     */
    private List<WorkOrderYwConditionRecordVO> ywList;

    /**
     * 审核记录
     */
    private List<WorkOrderAuditingRecord> auditingList;

}

 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java

@@ -35,6 +35,13 @@

    private final WorkOrderService workOrderService;

    @GetMapping("/process/{workOrderNo}")
    @ApiOperation(value = "过程图", notes = "过程图")
    @PreAuthorize("@ss.hasPermi('work:order:process')")
    public Result processImg(@PathVariable("workOrderNo") String workOrderNo) {
        return workOrderService.processImg(workOrderNo);
    }

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("@ss.hasPermi('work:order:add')")
@@ -67,18 +74,6 @@
    @ApiOperation(value = "运维情况", notes = "运维情况")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
        return workOrderService.ywCondition(form);
    }

    @GetMapping("/yw-condition/{workOrderNo}")
    @ApiOperation(value = "运维情况", notes = "运维情况")
    public Result ywCondition(@PathVariable String workOrderNo) {
        return workOrderService.selectYwConditionByYwId(workOrderNo);
    }

    @GetMapping("/yw-auditing-list/{workOrderNo}")
    @ApiOperation(value = "运维审核记录", notes = "运维审核记录")
    public Result ywAuditingByYwId(@PathVariable String workOrderNo) {
        return workOrderService.selectYwAuditingListByYwId(workOrderNo);
    }

    @PutMapping("/yw-result")

 ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java

@@ -2,10 +2,12 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DeviceInfoVO;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
import com.ycl.system.Result;
@@ -133,14 +135,14 @@
     * @param workOrderNo 工单号
     * @return 工单运维情况
     */
    Result selectYwConditionByYwId(String workOrderNo);
    List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo);

    /**
     * 获取工单运维审核记录
     * @param workOrderNo 工单号
     * @return 工单运维审核记录
     */
    Result selectYwAuditingListByYwId(String workOrderNo);
    List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo);

    /**
     * 批量下发
@@ -203,4 +205,12 @@
     * @return 数据
     */
    void updateImgById(Integer workOrderId, String imgPath);

    /**
     * 工单过程图
     *
     * @param workOrderNo
     * @return
     */
    Result processImg(String workOrderNo);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -13,10 +13,7 @@
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DeviceInfoVO;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.*;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
@@ -395,23 +392,22 @@
    }

    @Override
    public Result selectYwConditionByYwId(String workOrderNo) {
    public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
        ywConditionList.stream().forEach(item -> {
            if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
                item.setCommitUserName("系统消息");
            }
        });
        return Result.ok().data(ywConditionList);
        return ywConditionList;
    }

    @Override
    public Result selectYwAuditingListByYwId(String workOrderNo) {
        return Result.ok().data(
                new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
    public List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo) {
        return new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
                        .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
                        .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
                        .list());
                        .list();
    }

    @Override
@@ -730,4 +726,16 @@
                .set(WorkOrder::getYwCheckResult, imgPath)
                .update();
    }

    @Override
    public Result processImg(String workOrderNo) {
        // 运维记录
        List<WorkOrderYwConditionRecordVO> workOrderYwConditionRecordVOS = this.selectYwConditionByYwId(workOrderNo);
        // 审核记录
        List<WorkOrderAuditingRecord> workOrderAuditingRecords = this.selectYwAuditingListByYwId(workOrderNo);
        WorkOrderProcessVO process = new WorkOrderProcessVO();
        process.setYwList(workOrderYwConditionRecordVOS);
        process.setAuditingList(workOrderAuditingRecords);
        return Result.ok().data(process);
    }
}