diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java index 336f1fd..0cb25dc 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java @@ -25,16 +25,11 @@ public class OperAccessContentEntity extends TenantEntity { private static final long serialVersionUID = 1L; - /** - * 库ID - */ + @ApiModelProperty(value = "库ID") @JsonSerialize(nullsUsing = NullSerializer.class) private Long libraryId; - /** - * 计划ID - */ @ApiModelProperty(value = "计划ID") @JsonSerialize(nullsUsing = NullSerializer.class) private Long planId; @@ -43,73 +38,48 @@ public class OperAccessContentEntity extends TenantEntity { @JsonSerialize(nullsUsing = NullSerializer.class) private Long ticketTemplateId; - /** - * 计划开始时间 - */ @ApiModelProperty(value = "计划开始时间") private Date planStartTime; - /** - * 计划结束时间 - */ @ApiModelProperty(value = "计划结束时间") private Date planEndTime; - /** - * 设备编码 - */ + @ApiModelProperty("站点编码") + private String stationCode; + + @ApiModelProperty("站点名称") + private String stationName; + + @ApiModelProperty("设备名称") + private String emName; + @ApiModelProperty(value = "设备编码") private String emCode; - /** - * 名称 - */ @ApiModelProperty(value = "名称") private String name; - /** - * 类型 - */ @ApiModelProperty(value = "类型") @JsonSerialize(nullsUsing = NullSerializer.class) private Integer typeCode; - /** - * 检修等级 - */ @ApiModelProperty(value = "检修等级") private String gradeCode; - /** - * 操作规范 - */ @ApiModelProperty(value = "操作规范") private String workStandards; - /** - * 安全警告 - */ @ApiModelProperty(value = "安全警告") private String safeInfos; - /** - * 实际工时 - */ @ApiModelProperty(value = "实际工时") @JsonSerialize(nullsUsing = NullSerializer.class) private Integer actHours; - /** - * 负责人 - */ @ApiModelProperty(value = "负责人") @JsonSerialize(nullsUsing = NullSerializer.class) private Long manager; - /** - * 描述 - */ @ApiModelProperty(value = "描述") private String descripiton; - } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java index d7eaced..9c2a6c5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java @@ -147,6 +147,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ material.setIsDeleted(0); materialService.save(material); } + } /**