bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修管理优化 附件

This commit is contained in:
syruan 2024-11-21 18:12:35 +08:00
parent aa1727f025
commit 7437cc4155
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java
View File

@ -1,10 +1,12 @@
package com.bonus.material.repair.domain; package com.bonus.material.repair.domain;
import com.bonus.material.basic.domain.BmFileInfo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* @author syruan * @author syruan
@ -100,6 +102,9 @@ public class RepairPart {
@ApiModelProperty(value = "维修内容") @ApiModelProperty(value = "维修内容")
private String repairContent; private String repairContent;
@ApiModelProperty(value = "附件列表")
private List<BmFileInfo> fileList;
private Long companyId; private Long companyId;
private Long repairer; private Long repairer;

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java
View File

@ -1,6 +1,7 @@
package com.bonus.material.repair.domain.vo; package com.bonus.material.repair.domain.vo;
import com.bonus.common.biz.domain.BaseVO; import com.bonus.common.biz.domain.BaseVO;
import com.bonus.material.basic.domain.BmFileInfo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -69,4 +70,7 @@ public class RepairDeviceListVo extends BaseVO {
@ApiModelProperty(value = "内层物资类型集合") @ApiModelProperty(value = "内层物资类型集合")
private List<RepairDeviceVO> repairDeviceList = new ArrayList<>(); private List<RepairDeviceVO> repairDeviceList = new ArrayList<>();
@ApiModelProperty(value = "报废附件")
private List<BmFileInfo> fileList;
} }

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -129,10 +129,18 @@ public class RepairServiceImpl implements RepairService {
} }
// 查询维修任务详情 // 查询维修任务详情
List<RepairDeviceListVo> repairMaTypeGroupList = getRepairMaTypeList(new RepairTaskDetails(taskId), true); List<RepairDeviceListVo> repairMaTypeGroupList = getRepairMaTypeList(new RepairTaskDetails(taskId), true);
repairMaTypeGroupList.removeIf(Objects::isNull);
repairMaTypeGroupList.forEach(repairDevice -> {
List<BmFileInfo> fileInfos = bmFileInfoMapper.selectBmFileInfoList(new BmFileInfo()
.setTaskId(OptionalLong.of(thisTaskId).orElse(0L))
.setModelId(Optional.ofNullable(repairDevice.getId()).orElse(0L))
.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId())
);
repairDevice.setFileList(fileInfos);
});
List<RepairPart> repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(thisTaskId)); List<RepairPart> repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(thisTaskId));
repairPartList = mergePartsNum(repairPartList); repairPartList = mergePartsNum(repairPartList);
RepairTicketVo result = new RepairTicketVo() RepairTicketVo result = new RepairTicketVo()
.setRepairTaskInfo(repairTaskInfo) .setRepairTaskInfo(repairTaskInfo)
.setRepairDeviceArray(repairMaTypeGroupList) .setRepairDeviceArray(repairMaTypeGroupList)