diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index bed292e1..6155f031 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -147,4 +147,6 @@ public class RepairTask { @ApiModelProperty(value = "导出选中列表") private List dataCondition; + @ApiModelProperty(value = "备注") + private String remark; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java index 4fcf5db4..49aef973 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java @@ -18,6 +18,7 @@ public class RepairTaskDetails extends BaseEntity { */ @ApiModelProperty(value = "id") private Long id; + /** * 任务ID */ @@ -38,6 +39,13 @@ public class RepairTaskDetails extends BaseEntity { */ @ApiModelProperty(value = "规格型号") private String type; + + @ApiModelProperty(value = "物资单位") + private String unitName; + + @ApiModelProperty(value = "管理模式") + private Integer manageType; + /** * 编码 */ @@ -73,5 +81,12 @@ public class RepairTaskDetails extends BaseEntity { @ApiModelProperty(value = "组织id") private Long companyId; + @ApiModelProperty(value = "退料id") private Long backId; + + @ApiModelProperty(value = "维修人员") + private String repairer; + + @ApiModelProperty(value = "关键字") + private String keyword; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 39568b11..1e47370a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -23,7 +23,7 @@ import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.material.task.domain.TmTask; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.service.IRepairAuditDetailsService; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index a3c6e1db..2dc94a4b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -80,15 +80,17 @@