rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pqc示例图返回值修改

This commit is contained in:
yf001217 2026-05-29 15:55:30 +08:00
parent 8913b8d94b
commit a221c38fcf
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -613,9 +613,9 @@ public class QmsIssueTicketControllerService {
itemVO.setInspectionContent(finalItemMap.get(detail.getInspectionPointItemId()) != null itemVO.setInspectionContent(finalItemMap.get(detail.getInspectionPointItemId()) != null
? finalItemMap.get(detail.getInspectionPointItemId()).getInspectionContent() ? finalItemMap.get(detail.getInspectionPointItemId()).getInspectionContent()
: null); : null);
itemVO.setInspectionExampleFiles(finalItemMap.get(detail.getInspectionPointItemId()) != null itemVO.setInspectionExampleImage(finalItemMap.get(detail.getInspectionPointItemId()) != null
? parseCommonFileList(finalItemMap.get(detail.getInspectionPointItemId()).getInspectionImgUrl(), fileMap) ? parseFirstFileUrl(finalItemMap.get(detail.getInspectionPointItemId()).getInspectionImgUrl(), fileMap)
: List.of()); : null);
itemVO.setSelfTestData(detail.getSelfTestData()); itemVO.setSelfTestData(detail.getSelfTestData());
itemVO.setSelfTestFiles(parseCommonFileList(detail.getSelfTestAttachments(), fileMap)); itemVO.setSelfTestFiles(parseCommonFileList(detail.getSelfTestAttachments(), fileMap));
itemVO.setSelfTesterName(taskRecord.getSelfTesterName()); itemVO.setSelfTesterName(taskRecord.getSelfTesterName());
@ -2567,6 +2567,22 @@ public class QmsIssueTicketControllerService {
.forEach(collector::add); .forEach(collector::add);
} }
private String parseFirstFileUrl(String fileIdsStr, Map<Long, FileUploadRecord> fileMap) {
if (StrUtil.isBlank(fileIdsStr)) {
return null;
}
return Arrays.stream(fileIdsStr.split(","))
.filter(StrUtil::isNotBlank)
.map(String::trim)
.map(Long::valueOf)
.map(fileMap::get)
.filter(Objects::nonNull)
.map(FileUploadRecord::getUrl)
.filter(StrUtil::isNotBlank)
.findFirst()
.orElse(null);
}
/** /**
* 转换措施列表 * 转换措施列表
*/ */

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcCreateTicketUnqualifiedItemVO.java
View File

@ -32,9 +32,9 @@ public class QmsPqcCreateTicketUnqualifiedItemVO {
private String inspectionContent; private String inspectionContent;
/** /**
* 检测示例附件 * 检测示例
*/ */
private List<CommonFileDetailVO> inspectionExampleFiles; private String inspectionExampleImage;
/** /**
* 自检数据 * 自检数据