龚焕茏
2024-04-17 1de0d92e2a630927f391ae080709ae678e5f5618
工单事后报备:新增点位id
6个文件已修改
30 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -34,6 +34,10 @@
    @TableField("error_type")
    private String errorType;
    @ApiModelProperty("点位")
    @TableField("point_id")
    private Integer pointId;
    @ApiModelProperty("工单来源")
    @TableField("source")
    private String source;
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -38,6 +38,10 @@
    @ApiModelProperty("工单来源")
    private String source;
    @NotNull(message = "点位不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("点位")
    private Integer pointId;
    @NotNull(message = "故障类型不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("故障类型")
    private String errorType;
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.platform.base.AbsQuery;
import enumeration.general.FastDistributeTypeEnum;
import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
 * 下发工单查询
@@ -25,8 +27,14 @@
    /**
     * 运维单位
     */
    @JsonProperty("unitId")
    private Integer unitId;
    /**
     * 工单id
     */
    @JsonProperty("ids")
    private List<Integer> ids;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -33,6 +33,11 @@
    /** 工单来源 */
    private String source;
    /**
     * 点位
     */
    private Integer pointId;
    /** 故障类型 */
    private String errorType;
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * 工单 前端控制器
@@ -118,8 +119,8 @@
    @PostMapping("/distribute/ids")
    @ApiOperation(value = "下发选择", notes = "下发选择")
    public Result selectedIdsDistribute(@RequestBody List<Integer> ids, @RequestParam("unitId") Integer unitId) {
        return workOrderService.selectedIdsDistribute(ids, unitId);
    public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
        return workOrderService.selectedIdsDistribute(query.getIds(), query.getUnitId());
    }
    @GetMapping("/{id}")
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -110,8 +110,12 @@
        workOrderAuditingRecord.setRemark(form.getAuditingRemark());
        workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
        // 添加新通知
        try {
        Notify notify = new Notify(NotifyTypeEnum.WORK_ORDER, form.getAuditingResult().getDesc(), workOrder.getYwPeopleId(), "0", "0", workOrder.getId());
        notifyService.save(notify);
        } catch (Exception e) {
            return Result.error("审核成功,通知运维人员失败");
        }
        return Result.ok("操作成功");
    }