feat：完成点检、保养列表及导出接口。修改维修单添加维修结果。
HuangHuiKang
2 weeks ago
parent
4cdc999867
commit
5e97c443be
@ -0,0 +1,48 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@Schema(description = "管理后台 - 设备维修记录子表/修改 Request VO")
|
||||
@Data
|
||||
public class DvRepairLineSaveReqVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "维修单ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long repairId;
|
||||
|
||||
@Schema(description = "项目ID")
|
||||
private Long subjectId;
|
||||
|
||||
@Schema(description = "项目编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "6979")
|
||||
private String subjectCode;
|
||||
|
||||
@Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String subjectName;
|
||||
|
||||
@Schema(description = "项目类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
|
||||
private String subjectType;
|
||||
|
||||
@Schema(description = "项目内容")
|
||||
private String subjectContent;
|
||||
|
||||
@Schema(description = "标准")
|
||||
private String subjectStandard;
|
||||
|
||||
@Schema(description = "故障描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "1622")
|
||||
private String malfunction;
|
||||
|
||||
@Schema(description = "故障描述资源")
|
||||
private String malfunctionUrl;
|
||||
|
||||
@Schema(description = "维修情况")
|
||||
private String repairDes;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
@Schema(description = "维修结果 0-待维修 1-通过 2-不通过")
|
||||
private Integer result;
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo;
|
||||
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Schema(description = "管理后台 - 设备维修更新子记录 Req VO")
|
||||
@Data
|
||||
public class DvRepirUpdateReqVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809")
|
||||
@NotNull
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "报修日期")
|
||||
@NotNull(message = "报修日期不能为空")
|
||||
private LocalDateTime requireDate;
|
||||
|
||||
@Schema(description = "完成日期")
|
||||
@NotNull(message = "完成日期不能为空")
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
@Schema(description = "验收日期")
|
||||
@NotNull(message = "验收日期不能为空")
|
||||
private LocalDateTime confirmDate;
|
||||
|
||||
@Schema(description = "维修结果")
|
||||
@NotBlank(message = "维修结果不能为空")
|
||||
private String repairResult;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "子列表")
|
||||
@NotNull(message = "子列表不能为空")
|
||||
private List<DvRepairLineSaveReqVO> updateReqVOList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum InspectionResultEnum {
|
||||
OK(1, "OK"),
|
||||
NG(2, "NG");
|
||||
|
||||
private final Integer code;
|
||||
private final String label;
|
||||
|
||||
InspectionResultEnum(Integer code, String label) {
|
||||
this.code = code;
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public static String getLabelByCode(Integer code) {
|
||||
for (InspectionResultEnum value : values()) {
|
||||
if (value.code.equals(code)) {
|
||||
return value.getLabel();
|
||||
}
|
||||
}
|
||||
return String.valueOf(code);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class TicketInspectionExportVO {
|
||||
|
||||
// @ExcelProperty("设备编号")
|
||||
// private String deviceCode;
|
||||
//
|
||||
// @ExcelProperty("设备名称")
|
||||
// private String deviceName;
|
||||
|
||||
@ExcelProperty("检验项名称")
|
||||
private String inspectionItemName;
|
||||
|
||||
@ExcelProperty("检验方式")
|
||||
private String inspectionMethod;
|
||||
|
||||
@ExcelProperty("判定基准")
|
||||
private String judgmentCriteria;
|
||||
|
||||
@ExcelProperty("点检时间")
|
||||
@ColumnWidth(20)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonSerialize(using = LocalDateTimeSerializer.class)
|
||||
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
||||
private LocalDateTime taskTime;
|
||||
|
||||
@ExcelProperty("作业结果")
|
||||
private String result;
|
||||
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
private Integer inspectionResult;
|
||||
|
||||
@ExcelProperty("作业人")
|
||||
private String operator;
|
||||
|
||||
@ExcelProperty("创建时间")
|
||||
@ColumnWidth(20)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonSerialize(using = LocalDateTimeSerializer.class)
|
||||
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue