转运附件数据不对

sinake

4 天以前 c121dc8d2d5b56c17efe7e53e7ef3505387169c7

转运附件数据不对

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java

@@ -72,8 +72,7 @@
            //补充 附件
            ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
            serviceTransportFile.setDelFlag(0);
            serviceTransportFile.setTransportId(transport.getReportId());
            serviceTransportFile.setCaseNo(transport.getCaseNo());
            serviceTransportFile.setTransportId(transport.getId());
            List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
            transport.setAnnexfilesList(serviceTransportFiles);
        }
@@ -107,7 +106,7 @@
    public AjaxResult edit(@RequestBody ServiceTransport serviceTransport) {
        boolean b = serviceTransportService.updateById(serviceTransport);
        if (b) {
            serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getReportId(), serviceTransport.getCaseNo(), getNickName());
            serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getId(), serviceTransport.getCaseNo(), getNickName());
        }
        return toAjax(b);
    }

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java

@@ -77,9 +77,9 @@

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long reportId,String caseNo,String updateName) {
    public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long transportId,String caseNo,String updateName) {
        // 先将数据查出来
        List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, reportId));
        List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, transportId));

        // 提取现有记录的路径集合，用于高效比较
        Set<String> existingPaths = list.stream().map(file -> file.getFileName() != null ? file.getPath().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());
@@ -103,7 +103,7 @@
        for (ServiceTransportFile serviceTransportFile : annexfilesList) {
            if (StringUtils.isNotEmpty(serviceTransportFile.getFileName()) && !existingPaths.contains(serviceTransportFile.getFileName().trim())) {
                serviceTransportFile.setId(null);
                serviceTransportFile.setTransportId(reportId);
                serviceTransportFile.setTransportId(transportId);
                serviceTransportFile.setCreateBy(updateName);
                serviceTransportFile.setUpdateTime(new Date());
                result &= save(serviceTransportFile);

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java

@@ -58,7 +58,6 @@
                ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
                serviceTransportFile.setDelFlag(0);
                serviceTransportFile.setTransportId(serviceTransport1.getId());
                serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
                List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);

                serviceTransport1.setAnnexfilesList(serviceTransportFiles);

 ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml

@@ -209,7 +209,8 @@
        sdc.AssessAnnex AS assessannex,
        sdc.DonateOrgan AS donateorgan,
        sdc.complete_state as completeState,
        sdc.signfamilyrelations
        sdc.signfamilyrelations,
        sdc.relationname
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID