diff --git a/src/main/java/com/heai/modules/sys/controller/SysFileController.java b/src/main/java/com/heai/modules/sys/controller/SysFileController.java index 9c8273f..f283074 100644 --- a/src/main/java/com/heai/modules/sys/controller/SysFileController.java +++ b/src/main/java/com/heai/modules/sys/controller/SysFileController.java @@ -58,14 +58,16 @@ public class SysFileController extends AbstractController { * @return */ @PostMapping("/getInspectionFile") - public R getInspectionFile(@RequestBody SysOssEntity inData){ - List resultList = sysFileService.getInspectionFile(inData); + public R getInspectionFile(@RequestBody SysOssEntity inData, + @RequestParam(name = "attachmentPartNo", required = false) String attachmentPartNo){ + List resultList = sysFileService.getInspectionFile(inData, attachmentPartNo); return R.ok().put("rows", resultList); } @PostMapping("/getFileContentList2") - public R getFileContentList2(@RequestBody QcFAIRecordData inData){ - List resultList = sysFileService.getFileContentList2(inData); + public R getFileContentList2(@RequestBody QcFAIRecordData inData, + @RequestParam(name = "attachmentPartNo", required = false) String attachmentPartNo){ + List resultList = sysFileService.getFileContentList2(inData, attachmentPartNo); return R.ok() .put("code", 200) .put("rows", resultList) diff --git a/src/main/java/com/heai/modules/sys/service/SysFileService.java b/src/main/java/com/heai/modules/sys/service/SysFileService.java index 1ad288a..e5afe17 100644 --- a/src/main/java/com/heai/modules/sys/service/SysFileService.java +++ b/src/main/java/com/heai/modules/sys/service/SysFileService.java @@ -32,9 +32,9 @@ public interface SysFileService { */ List getSysFileByOrderRef2(SysOssEntity inData); - List getInspectionFile(SysOssEntity inData); + List getInspectionFile(SysOssEntity inData, String attachmentPartNo); - List getFileContentList2(QcFAIRecordData inData); + List getFileContentList2(QcFAIRecordData inData, String attachmentPartNo); List getPartAttributeFileList(SysOssEntity inData); } diff --git a/src/main/java/com/heai/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/heai/modules/sys/service/impl/SysFileServiceImpl.java index bba77aa..fa63bce 100644 --- a/src/main/java/com/heai/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/heai/modules/sys/service/impl/SysFileServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -109,34 +110,31 @@ public class SysFileServiceImpl implements SysFileService { } @Override - public List getInspectionFile(SysOssEntity inData) { - List files1 = sysOssDao.getSysFileByOrderRef2(inData); - // mes文件 -// List list = sysOssDao.searchPartSopListFather(inData); -// for (SysOssEntity p : list) { -// if (p.getSopType().equals("SOP-ST")) { -// p.setSopType("物料SOP"); -// } -// // 正斜杠改为反斜杠 -// p.setUrl(p.getUrl().replaceAll("/", "\\\\")); -// // 获取文件类型 -// int lastDotIndex = p.getUrl().lastIndexOf('.'); -// String fileType = p.getUrl().substring(lastDotIndex + 1); -// p.setFileName(p.getFileName() + "." + fileType); -// p.setFileType(fileType); -// } -// files1.addAll(list); - return files1; + public List getInspectionFile(SysOssEntity inData, String attachmentPartNo) { + List files = sysOssDao.getSysFileByOrderRef2(inData); + addPartAttachments(files, inData.getOrderRef1(), attachmentPartNo); + return files; } @Override - public List getFileContentList2(QcFAIRecordData inData) { + public List getFileContentList2(QcFAIRecordData inData, String attachmentPartNo) { List list1 = sysOssDao.getFileContentList1(inData); List list2 = sysOssDao.getFileContentList2(inData); list1.addAll(list2); + addPartAttachments(list1, inData.getSite(), attachmentPartNo); return list1; } + private void addPartAttachments(List files, String site, String partNo) { + if (!StringUtils.hasText(site) || !StringUtils.hasText(partNo)) { + return; + } + SysOssEntity criteria = new SysOssEntity(); + criteria.setOrderRef1(site); + criteria.setOrderRef2(partNo); + files.addAll(sysOssDao.getAttachmentListByPart(criteria)); + } + @Override public List getPartAttributeFileList(SysOssEntity inData) { List fileList = sysOssDao.getSysFileByOrderRef2(inData);