xiang13487 1 ماه پیش
والد
کامیت
0f99ad8f43
15فایلهای تغییر یافته به همراه644 افزوده شده و 1 حذف شده
  1. 101 0
      pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/manhole/WorkOrderController.java
  2. 178 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrder.java
  3. 70 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrderLog.java
  4. 20 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/mapper/WorkOrderLogMapper.java
  5. 20 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/mapper/WorkOrderMapper.java
  6. 13 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/WorkOrderLogService.java
  7. 22 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/WorkOrderService.java
  8. 1 1
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/CaseInfoServiceImpl.java
  9. 24 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/WorkOrderLogServiceImpl.java
  10. 51 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/WorkOrderServiceImpl.java
  11. 30 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/in/WorkOrderPageInDTO.java
  12. 19 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/WorkOrderLogOutDTO.java
  13. 29 0
      pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/WorkOrderOutDTO.java
  14. 22 0
      pipe-network-service/zksy-system/src/main/resources/mapper/WorkOrderLogMapper.xml
  15. 44 0
      pipe-network-service/zksy-system/src/main/resources/mapper/WorkOrderMapper.xml

+ 101 - 0
pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/manhole/WorkOrderController.java

@@ -0,0 +1,101 @@
+package com.zksy.web.controller.manhole;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.base.domain.*;
+import com.zksy.base.service.*;
+import com.zksy.common.annotation.Anonymous;
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.common.core.domain.AjaxResult2;
+import com.zksy.manhole.dto.in.WorkOrderPageInDTO;
+import com.zksy.manhole.dto.out.EquipmentStatusOutDTO;
+import com.zksy.manhole.dto.out.WorkOrderLogOutDTO;
+import com.zksy.manhole.dto.out.WorkOrderOutDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 窨井盖监测系统-工单处置管理Controller
+ * 
+ * @author xianggx
+ * @date 2026-05-06
+ */
+@RestController
+@RequestMapping("/manhole/workOrder")
+@Api(tags = "窨井盖监测系统-工单处置管理")
+public class WorkOrderController extends BaseController
+{
+    @Autowired
+    private WorkOrderService workOrderService;
+
+    @Autowired
+    private WorkOrderLogService workOrderLogService;
+
+    @Autowired
+    private EquipmentBaseService equipmentBaseService;
+
+    @Autowired
+    private EquipmentStatusService equipmentStatusService;
+
+    @Autowired
+    private EquipmentTypeService equipmentTypeService;
+
+    /**
+     * 分页查询工单信息列表
+     */
+    @Anonymous
+    @GetMapping(value = "/findByPage")
+    @ApiOperation(value = "分页查询工单信息列表")
+    public AjaxResult2<Page<WorkOrderOutDTO>> findByPage(@RequestBody WorkOrderPageInDTO pageInDTO)
+    {
+        return AjaxResult2.success(workOrderService.findByPage(pageInDTO));
+    }
+
+    /**
+     * 获取工单信息详情
+     */
+    @Anonymous
+    @GetMapping(value = "/getById/{id}")
+    @ApiOperation(value = "获取工单信息详情")
+    public AjaxResult2<WorkOrderOutDTO> getById(@PathVariable("id") Long id)
+    {
+        WorkOrder workOrder = workOrderService.getById(id);
+        if(workOrder == null){
+            return AjaxResult2.error("工单ID不存在");
+        }
+        WorkOrderOutDTO outDTO = BeanUtil.copyProperties(workOrder, WorkOrderOutDTO.class);
+        // 查询设备状态
+        EquipmentStatus equipmentStatus = equipmentStatusService.lambdaQuery()
+                .eq(EquipmentStatus::getEquipmentId, outDTO.getDeviceId())
+                .one();
+        if(equipmentStatus != null){
+            EquipmentStatusOutDTO equipmentStatusOutDTO = BeanUtil.copyProperties(equipmentStatus, EquipmentStatusOutDTO.class);
+            outDTO.setEquipmentStatus(equipmentStatusOutDTO);
+        }
+        // 查询设备类别名称
+        EquipmentBase equipmentBase = equipmentBaseService.getById(outDTO.getDeviceId());
+        if(equipmentBase != null){
+            outDTO.setDeviceCode(equipmentBase.getEquipmentCode());
+            EquipmentType equipmentType = equipmentTypeService.getById(equipmentBase.getEquipmentTypeId());
+            if(equipmentType != null){
+                outDTO.setEquipmentTypeName(equipmentType.getTypeName());
+            }
+        }
+        // 查询工单操作日志
+        List<WorkOrderLog> workOrderLogList = workOrderLogService.list(new LambdaQueryWrapper<WorkOrderLog>()
+                .eq(WorkOrderLog::getOrderId, outDTO.getOrderId())
+                .orderByAsc(WorkOrderLog::getOperTime));
+        if(CollUtil.isNotEmpty(workOrderLogList)){
+            List<WorkOrderLogOutDTO> workOrderLogOutDTOList = BeanUtil.copyToList(workOrderLogList, WorkOrderLogOutDTO.class);
+            outDTO.setWorkOrderLogList(workOrderLogOutDTOList);
+        }
+        return AjaxResult2.success(outDTO);
+    }
+}

+ 178 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrder.java

@@ -0,0 +1,178 @@
+package com.zksy.base.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 运维工单表
+ * @TableName work_order
+ */
+@TableName(value ="work_order")
+@Data
+@ApiModel(value = "运维工单入参", description = "运维工单入参")
+public class WorkOrder implements Serializable {
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工单ID
+     */
+    @ApiModelProperty(value = "工单ID")
+    @TableId(type = IdType.AUTO)
+    private Long orderId;
+
+    /**
+     * 工单编号
+     */
+    @ApiModelProperty(value = "工单编号")
+    private String orderNo;
+
+    /**
+     * 关联报警ID
+     */
+    @ApiModelProperty(value = "报警ID")
+    private String alarmId;
+
+    /**
+     * 关联案件ID
+     */
+    @ApiModelProperty(value = "案件ID")
+    private Long caseId;
+
+    /**
+     * 案件编号
+     */
+    @ApiModelProperty(value = "案件编号")
+    private String caseNo;
+
+    /**
+     * 关联设备ID
+     */
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+
+    /**
+     * 设备编码
+     */
+    @ApiModelProperty(value = "设备编码")
+    private String deviceCode;
+
+    /**
+     * 工单类型:1-故障维修 2-日常巡检 3-设备保养
+     */
+    @ApiModelProperty(value = "工单类型:1-故障维修 2-日常巡检 3-设备保养")
+    private Integer orderType;
+
+    /**
+     * 工单优先级:1-紧急 2-一般 3-低
+     */
+    @ApiModelProperty(value = "工单优先级:1-紧急 2-一般 3-低")
+    private Integer orderLevel;
+
+    /**
+     * 工单问题描述
+     */
+    @ApiModelProperty(value = "工单问题描述")
+    private String orderDesc;
+
+    /**
+     * 负责部门ID
+     */
+    @ApiModelProperty(value = "负责部门ID")
+    private Long deptId;
+
+    /**
+     * 派单人ID
+     */
+    @ApiModelProperty(value = "派单人ID")
+    private Long dispatchUser;
+
+    /**
+     * 派单时间
+     */
+    @ApiModelProperty(value = "派单时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date dispatchTime;
+
+    /**
+     * 接单运维人员ID
+     */
+    @ApiModelProperty(value = "接单运维人员ID")
+    private Long receiveUser;
+
+    /**
+     * 工单状态:1-待派单 2-待接单 3-已接单 4-处理中 5-待验收 6-已结案 7-已驳回 8-延期审核 9-已延期
+     */
+    @ApiModelProperty(value = "工单状态:1-待派单 2-待接单 3-已接单 4-处理中 5-待验收 6-已结案 7-已驳回 8-延期审核 9-已延期")
+    private Integer orderStatus;
+
+    /**
+     * 延期原因
+     */
+    @ApiModelProperty(value = "延期原因")
+    private String delayedReason;
+
+    /**
+     * 延期截止时间
+     */
+    @ApiModelProperty(value = "延期截止时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date delayedDeadline;
+
+    /**
+     * 计划完成时间
+     */
+    @ApiModelProperty(value = "计划完成时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date planFinishTime;
+
+    /**
+     * 实际完成时间
+     */
+    @ApiModelProperty(value = "实际完成时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date realFinishTime;
+
+    /**
+     * 维修处置结果
+     */
+    @ApiModelProperty(value = "维修处置结果")
+    private String repairResult;
+
+    /**
+     * 验收人ID
+     */
+    @ApiModelProperty(value = "验收人ID")
+    private Long verifyUser;
+
+    /**
+     * 验收时间
+     */
+    @ApiModelProperty(value = "验收时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date verifyTime;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date updateTime;
+}

+ 70 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/WorkOrderLog.java

@@ -0,0 +1,70 @@
+package com.zksy.base.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工单操作日志表
+ * @TableName work_order_log
+ */
+@TableName(value ="work_order_log")
+@Data
+@ApiModel(value = "工单操作日志入参", description = "工单操作日志入参")
+public class WorkOrderLog implements Serializable {
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志ID
+     */
+    @ApiModelProperty(value = "日志ID")
+    @TableId(type = IdType.AUTO)
+    private Long logId;
+
+    /**
+     * 关联工单ID
+     */
+    @ApiModelProperty(value = "工单ID")
+    private Long orderId;
+
+    /**
+     * 操作类型:1-创建工单 2-派单 3-接单 4-开始维修 5-提交验收 6-验收通过 7-驳回工单 8-申请延期
+     */
+    @ApiModelProperty(value = "操作类型:1-创建工单 2-派单 3-接单 4-开始维修 5-提交验收 6-验收通过 7-驳回工单 8-申请延期")
+    private Integer operType;
+
+    /**
+     * 操作详情描述
+     */
+    @ApiModelProperty(value = "操作详情描述")
+    private String operDesc;
+
+    /**
+     * 操作人ID
+     */
+    @ApiModelProperty(value = "操作人ID")
+    private Long operUserId;
+
+    /**
+     * 操作人姓名
+     */
+    @ApiModelProperty(value = "操作人姓名")
+    private String operUserName;
+
+    /**
+     * 操作时间
+     */
+    @ApiModelProperty(value = "操作时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date operTime;
+}

+ 20 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/mapper/WorkOrderLogMapper.java

@@ -0,0 +1,20 @@
+package com.zksy.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.base.domain.WorkOrderLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【work_order_log(工单操作日志表)】的数据库操作Mapper
+* @createDate 2026-06-11 11:51:09
+* @Entity com.zksy.base.domain.WorkOrderLog
+*/
+@Mapper
+public interface WorkOrderLogMapper extends BaseMapper<WorkOrderLog> {
+
+}
+
+
+
+

+ 20 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/mapper/WorkOrderMapper.java

@@ -0,0 +1,20 @@
+package com.zksy.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.base.domain.WorkOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【work_order(运维工单表)】的数据库操作Mapper
+* @createDate 2026-06-11 11:50:08
+* @Entity com.zksy.base.domain.WorkOrder
+*/
+@Mapper
+public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+
+}
+
+
+
+

+ 13 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/WorkOrderLogService.java

@@ -0,0 +1,13 @@
+package com.zksy.base.service;
+
+import com.zksy.base.domain.WorkOrderLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【work_order_log(工单操作日志表)】的数据库操作Service
+* @createDate 2026-06-11 11:51:09
+*/
+public interface WorkOrderLogService extends IService<WorkOrderLog> {
+
+}

+ 22 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/WorkOrderService.java

@@ -0,0 +1,22 @@
+package com.zksy.base.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.base.domain.WorkOrder;
+import com.zksy.manhole.dto.in.WorkOrderPageInDTO;
+import com.zksy.manhole.dto.out.WorkOrderOutDTO;
+
+/**
+* @author Administrator
+* @description 针对表【work_order(运维工单表)】的数据库操作Service
+* @createDate 2026-06-11 11:50:08
+*/
+public interface WorkOrderService extends IService<WorkOrder> {
+
+    /**
+     * 分页查询工单信息列表
+     * @param pageInDTO
+     * @return
+     */
+    Page<WorkOrderOutDTO> findByPage(WorkOrderPageInDTO pageInDTO);
+}

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/CaseInfoServiceImpl.java

@@ -66,7 +66,7 @@ public class CaseInfoServiceImpl extends ServiceImpl<CaseInfoMapper, CaseInfo>
         }
         Page<CaseInfo> page = new Page<>(pageInDTO.getPageNum(), pageInDTO.getPageSize());
         LambdaQueryWrapper<CaseInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotEmpty(pageInDTO.getCaseNo()), CaseInfo::getCaseNo, pageInDTO.getCaseNo())
+        queryWrapper.like(StringUtils.isNotEmpty(pageInDTO.getCaseNo()), CaseInfo::getCaseNo, pageInDTO.getCaseNo())
                 .in(CollUtil.isNotEmpty(equipmentIds), CaseInfo::getDeviceId, equipmentIds)
                 .orderByDesc(CaseInfo::getUpdateTime);
         Page<CaseInfo> rs = this.page(page, queryWrapper);

+ 24 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/WorkOrderLogServiceImpl.java

@@ -0,0 +1,24 @@
+package com.zksy.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.base.domain.WorkOrderLog;
+import com.zksy.base.mapper.WorkOrderLogMapper;
+import com.zksy.base.service.WorkOrderLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【work_order_log(工单操作日志表)】的数据库操作Service实现
+* @createDate 2026-06-11 11:51:09
+*/
+@Slf4j
+@Service
+public class WorkOrderLogServiceImpl extends ServiceImpl<WorkOrderLogMapper, WorkOrderLog>
+    implements WorkOrderLogService{
+
+}
+
+
+
+

+ 51 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/WorkOrderServiceImpl.java

@@ -0,0 +1,51 @@
+package com.zksy.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.base.domain.WorkOrder;
+import com.zksy.base.mapper.WorkOrderMapper;
+import com.zksy.base.service.WorkOrderService;
+import com.zksy.manhole.dto.in.WorkOrderPageInDTO;
+import com.zksy.manhole.dto.out.WorkOrderOutDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【work_order(运维工单表)】的数据库操作Service实现
+* @createDate 2026-06-11 11:50:08
+*/
+@Slf4j
+@Service
+public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder>
+    implements WorkOrderService{
+
+    /**
+     * 分页查询工单信息列表
+     * @param pageInDTO
+     * @return
+     */
+    @Override
+    public Page<WorkOrderOutDTO> findByPage(WorkOrderPageInDTO pageInDTO) {
+        log.info("分页查询工单信息列表-入参:{}", pageInDTO);
+        Page<WorkOrder> page = new Page<>(pageInDTO.getPageNum(), pageInDTO.getPageSize());
+        LambdaQueryWrapper<WorkOrder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(pageInDTO.getOrderNo()), WorkOrder::getOrderNo, pageInDTO.getOrderNo())
+                .like(StringUtils.isNotEmpty(pageInDTO.getCaseNo()), WorkOrder::getCaseNo, pageInDTO.getCaseNo())
+                .orderByDesc(WorkOrder::getUpdateTime);
+        Page<WorkOrder> rs = this.page(page, queryWrapper);
+        List<WorkOrderOutDTO> outDTOList = BeanUtil.copyToList(rs.getRecords(), WorkOrderOutDTO.class);
+        Page<WorkOrderOutDTO> outPage = new Page<>(pageInDTO.getPageNum(), pageInDTO.getPageSize(), rs.getTotal());
+        outPage.setRecords(outDTOList);
+        return outPage;
+    }
+}
+
+
+
+

+ 30 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/in/WorkOrderPageInDTO.java

@@ -0,0 +1,30 @@
+package com.zksy.manhole.dto.in;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分页查询工单信息列表-入参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "分页查询工单信息列表-入参", description = "分页查询工单信息列表-入参")
+public class WorkOrderPageInDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "工单编号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "案件编号")
+    private String caseNo;
+
+    @ApiModelProperty(value = "当前记录起始索引", required = true)
+    private Long pageNum;
+
+    @ApiModelProperty(value = "每页显示记录数", required = true)
+    private Long pageSize;
+}

+ 19 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/WorkOrderLogOutDTO.java

@@ -0,0 +1,19 @@
+package com.zksy.manhole.dto.out;
+
+import com.zksy.base.domain.WorkOrderLog;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 工单操作日志-出参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "工单操作日志-出参", description = "工单操作日志-出参")
+public class WorkOrderLogOutDTO extends WorkOrderLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+}

+ 29 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/WorkOrderOutDTO.java

@@ -0,0 +1,29 @@
+package com.zksy.manhole.dto.out;
+
+import com.zksy.base.domain.WorkOrder;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 获取工单信息详情-出参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "获取工单信息详情-出参", description = "获取工单信息详情-出参")
+public class WorkOrderOutDTO extends WorkOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("设备类别名称")
+    private String equipmentTypeName;
+
+    @ApiModelProperty(value = "设备状态详情")
+    private EquipmentStatusOutDTO equipmentStatus;
+
+    @ApiModelProperty(value = "工单操作日志列表")
+    private List<WorkOrderLogOutDTO> workOrderLogList;
+}

+ 22 - 0
pipe-network-service/zksy-system/src/main/resources/mapper/WorkOrderLogMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.base.mapper.WorkOrderLogMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.base.domain.WorkOrderLog">
+            <id property="logId" column="log_id" jdbcType="BIGINT"/>
+            <result property="orderId" column="order_id" jdbcType="BIGINT"/>
+            <result property="operType" column="oper_type" jdbcType="TINYINT"/>
+            <result property="operDesc" column="oper_desc" jdbcType="VARCHAR"/>
+            <result property="operUserId" column="oper_user_id" jdbcType="BIGINT"/>
+            <result property="operUserName" column="oper_user_name" jdbcType="VARCHAR"/>
+            <result property="operTime" column="oper_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        log_id,order_id,oper_type,
+        oper_desc,oper_user_id,oper_user_name,
+        oper_time
+    </sql>
+</mapper>

+ 44 - 0
pipe-network-service/zksy-system/src/main/resources/mapper/WorkOrderMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.base.mapper.WorkOrderMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.base.domain.WorkOrder">
+            <id property="orderId" column="order_id" jdbcType="BIGINT"/>
+            <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+            <result property="alarmId" column="alarm_id" jdbcType="VARCHAR"/>
+            <result property="caseId" column="case_id" jdbcType="BIGINT"/>
+            <result property="caseNo" column="case_no" jdbcType="VARCHAR"/>
+            <result property="deviceId" column="device_id" jdbcType="VARCHAR"/>
+            <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
+            <result property="orderType" column="order_type" jdbcType="TINYINT"/>
+            <result property="orderLevel" column="order_level" jdbcType="TINYINT"/>
+            <result property="orderDesc" column="order_desc" jdbcType="VARCHAR"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+            <result property="dispatchUser" column="dispatch_user" jdbcType="BIGINT"/>
+            <result property="dispatchTime" column="dispatch_time" jdbcType="TIMESTAMP"/>
+            <result property="receiveUser" column="receive_user" jdbcType="BIGINT"/>
+            <result property="orderStatus" column="order_status" jdbcType="TINYINT"/>
+            <result property="delayedReason" column="delayed_reason" jdbcType="VARCHAR"/>
+            <result property="delayedDeadline" column="delayed_deadline" jdbcType="TIMESTAMP"/>
+            <result property="planFinishTime" column="plan_finish_time" jdbcType="TIMESTAMP"/>
+            <result property="realFinishTime" column="real_finish_time" jdbcType="TIMESTAMP"/>
+            <result property="repairResult" column="repair_result" jdbcType="VARCHAR"/>
+            <result property="verifyUser" column="verify_user" jdbcType="BIGINT"/>
+            <result property="verifyTime" column="verify_time" jdbcType="TIMESTAMP"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        order_id,order_no,alarm_id,
+        case_id,case_no,device_id,
+        device_code,order_type,order_level,
+        order_desc,dept_id,dispatch_user,
+        dispatch_time,receive_user,order_status,
+        delayed_reason,delayed_deadline,plan_finish_time,
+        real_finish_time,repair_result,verify_user,
+        verify_time,create_time,update_time
+    </sql>
+</mapper>