捐献确认基本信息集合协调员2字段错

sinake

昨天 af9eeec3590806f1e699511be33c892721defc49

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

@@ -59,13 +59,14 @@

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName) {
    public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName,Long reportId) {
        boolean save = false;
        if (CollectionUtils.isNotEmpty(serviceDonatebaseinfoReportFiles)) {
            for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
                serviceDonatebaseinfoReportFile.setCreateTime(new Date());
                serviceDonatebaseinfoReportFile.setCreateBy(createName);
                serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
                serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(reportId);
                serviceDonatebaseinfoReportFile.setCreateTime(new Date());
                save = save(serviceDonatebaseinfoReportFile);
            }
@@ -89,20 +90,24 @@

        // 标记需要删除的记录（存在于数据库但不在新列表中）
        for (ServiceDonatebaseinfoReportFile file : list) {
            if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
                file.setDelFlag(1);
                file.setUpdateTime(new Date());
                file.setUpdateBy(updateName);
                result &= updateById(file);
            }
            //if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
//                file.setDelFlag(1);
//                file.setUpdateTime(new Date());
//                file.setUpdateBy(updateName);
//                result &= updateById(file);
            this.baseMapper.deleteById(file.getId());

           // }
        }

        // 添加新的记录
        for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
            if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) && !existingPaths.contains(serviceDonatebaseinfoReportFile.getFileName().trim())) {
            if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) ) {
                serviceDonatebaseinfoReportFile.setId(null);
                serviceDonatebaseinfoReportFile.setUpdateBy(updateName);
                serviceDonatebaseinfoReportFile.setUpdateTime(new Date());
                serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
                serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(reportId);
                result &= save(serviceDonatebaseinfoReportFile);
            }
        }