质量监督：日常监督检查记录单导出受监督人多人每行一个，更新记录单模板；方法验证：删除时同步清理上岗证与校准证书子表

吴羡

3 天以前 ca6a10efa6bccd9ee2eba96403d6eef48b75f507

质量监督：日常监督检查记录单导出受监督人多人每行一个，更新记录单模板；方法验证：删除时同步清理上岗证与校准证书子表

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java

@@ -199,6 +199,13 @@
        processMethodVerifyMethodFileService.remove(Wrappers.<ProcessMethodVerifyMethodFile>lambdaQuery()
                .eq(ProcessMethodVerifyMethodFile::getMethodVerifyId, methodVerifyId));

        // 删除所有上岗证
        processMethodVerifyWorkFileService.remove(Wrappers.<ProcessMethodVerifyWorkFile>lambdaQuery()
                .eq(ProcessMethodVerifyWorkFile::getMethodVerifyId, methodVerifyId));

        // 删除所有校准证书
        processMethodVerifyCalibrationsFileService.remove(Wrappers.<ProcessMethodVerifyCalibrationsFile>lambdaQuery()
                .eq(ProcessMethodVerifyCalibrationsFile::getMethodVerifyId, methodVerifyId));

        baseMapper.deleteById(methodVerifyId);


 cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java

@@ -654,6 +654,11 @@
        // 监督内容勾选展示串(照纸张表排布)
        recordDto.setSuperviseContentStr(buildSuperviseContentStr(recordDto.getSuperviseContent()));

        // 受监督人多个时每行一个
        if (StringUtils.isNotBlank(recordDto.getTestMember())) {
            recordDto.setTestMember(recordDto.getTestMember().replace("、", "\n"));
        }

        // 获取路径
        InputStream inputStream = this.getClass().getResourceAsStream("/static/daily-supervise-record.docx");
        ConfigureBuilder builder = Configure.builder();

 cnas-process/src/main/resources/static/daily-supervise-record.docx

Binary files differ