diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectEntity.java index e681cdd..e2e40e4 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectEntity.java @@ -122,16 +122,16 @@ public class OperDefectEntity extends TenantEntity { @TableField(exist = false) private YearMonth yearMonth; /** - * 计划处理人 + * 消缺处理人 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "计划处理人") + @ApiModelProperty(value = "消缺处理人") private String planHandler; /** - * 处理人 + * 检修任务处理人 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "处理人") + @ApiModelProperty(value = "检修任务处理人") private Long handler; /** @@ -211,4 +211,26 @@ public class OperDefectEntity extends TenantEntity { @QueryField(condition = SqlCondition.LIKE) @ApiModelProperty(value = "故障名称") private String faultName; + + /** + * 操作票负责人 + */ + @ApiModelProperty("操作票负责人") + private Long principal; + /** + * 手填值班负责人 + */ + @ApiModelProperty(value = "手填操作票负责人") + private String principalManual; + /** + * 操作票 + */ + @ApiModelProperty(value = "操作票") + private String ticketId; + /** + * 处理任务Id + */ + @ApiModelProperty(value = "处理任务Id") + private Long handleTaskId; + } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectStatisticsEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectStatisticsEntity.java index 1d10af1..cc38585 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectStatisticsEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectStatisticsEntity.java @@ -128,11 +128,11 @@ public class OperDefectStatisticsEntity extends TenantEntity { @ApiModelProperty(value = "甄别描述") private String discriminateDesc; /** - * 计划处理人 + * 检修任务处理人 */ @JsonSerialize(nullsUsing = NullSerializer.class) @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "计划处理人") + @ApiModelProperty(value = "检修任务处理人") private Long handler; /** * 计划工时 @@ -233,10 +233,10 @@ public class OperDefectStatisticsEntity extends TenantEntity { @ApiModelProperty(value = "是否为缺陷,0 否,1是") private Integer isDefect; /** - * 计划处理人 + * 消缺处理人 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "计划处理人") + @ApiModelProperty(value = "消缺处理人") private String planHandler; /** diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperPhenomenonEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperPhenomenonEntity.java index 4a7f135..8fb64ee 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperPhenomenonEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperPhenomenonEntity.java @@ -211,10 +211,10 @@ public class OperPhenomenonEntity extends TenantEntity { private Long handleTaskId; /** - * 处理人 + * 检修任务处理人 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "处理人") + @ApiModelProperty(value = "检修任务处理人") private Long handler; /** * 处理状态:已处理1,未处理0,默认0 @@ -285,10 +285,10 @@ public class OperPhenomenonEntity extends TenantEntity { @ApiModelProperty(value = "核算工时") private Integer checkHours; /** - * 计划处理人 + * 消缺处理人 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "计划处理人") + @ApiModelProperty(value = "消缺处理人") private String planHandler; /** * 实际开始时间