报告归档调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportServiceImpl.java

@@ -2171,18 +2171,16 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 //判断是否有签名后的PDF
                 list.forEach(x -> {
                     if (x.getSignFilePdf() == null || x.getSignFilePdf().isEmpty()){
-                        if (x.getSecurityCheckId() != null){
-                            OrderReportDO orderReportDO = orderReportMapper.selectOne(new LambdaQueryWrapperX<OrderReportDO>()
-                                    .eq(OrderReportDO::getTaskOrderId, x.getOrderId()),false);;
-                            if (orderReportDO != null){
-                                try {
-                                    byte[] bytes = pdfService.pdf(orderReportDO.getTemplateId(), orderReportDO.getInsId());
-                                    String fileUrl = fileApi.createFile(bytes);
-                                    x.setSignFilePdf(fileUrl);
-                                    updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
-                                } catch (Exception e) {
-                                    log.error("生成服务单/受理单PDF错误,{}", e.getMessage());
-                                }
+                        OrderReportDO orderReportDO = orderReportMapper.selectOne(new LambdaQueryWrapperX<OrderReportDO>()
+                                .eq(OrderReportDO::getTaskOrderId, x.getOrderId()),false);;
+                        if (orderReportDO != null){
+                            try {
+                                byte[] bytes = pdfService.pdf(orderReportDO.getTemplateId(), orderReportDO.getInsId());
+                                String fileUrl = fileApi.createFile(bytes);
+                                x.setSignFilePdf(fileUrl);
+                                updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
+                            } catch (Exception e) {
+                                log.error("生成服务单/受理单PDF错误,{}", e.getMessage());
                             }
                         }
                     }
@@ -2209,18 +2207,16 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 //判断是否有签名后的PDF
                 list.forEach(x -> {
                     if (x.getSignFilePdf() == null || x.getSignFilePdf().isEmpty()){
-                        if (x.getSecurityCheckId() != null){
-                            NotificationformReportDO notificationformReportDO = notificationformReportMapper.selectOne(new LambdaQueryWrapperX<NotificationformReportDO>()
-                                    .eq(NotificationformReportDO::getTaskOrderId, x.getOrderId()),false);;
-                            if (notificationformReportDO != null){
-                                try {
-                                    byte[] bytes = pdfService.pdf(notificationformReportDO.getTemplateId(), notificationformReportDO.getInsId());
-                                    String fileUrl = fileApi.createFile(bytes);
-                                    x.setSignFilePdf(fileUrl);
-                                    updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
-                                } catch (Exception e) {
-                                    log.error("生成检验情况告知单PDF错误,{}", e.getMessage());
-                                }
+                        NotificationformReportDO notificationformReportDO = notificationformReportMapper.selectOne(new LambdaQueryWrapperX<NotificationformReportDO>()
+                                .eq(NotificationformReportDO::getTaskOrderId, x.getOrderId()),false);;
+                        if (notificationformReportDO != null){
+                            try {
+                                byte[] bytes = pdfService.pdf(notificationformReportDO.getTemplateId(), notificationformReportDO.getInsId());
+                                String fileUrl = fileApi.createFile(bytes);
+                                x.setSignFilePdf(fileUrl);
+                                updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
+                            } catch (Exception e) {
+                                log.error("生成检验情况告知单PDF错误,{}", e.getMessage());
                             }
                         }
                     }
@@ -2249,22 +2245,20 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 //判断是否有签名后的PDF
                 list.forEach(x -> {
                     if (x.getSignFilePdf() == null || x.getSignFilePdf().isEmpty()){
-                        if (x.getSecurityCheckId() != null){
-                            BoilerTaskOrderItemReportDO itemReportDO = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>()
-                                    .eq(BoilerTaskOrderItemReportDO::getOrderItemId, x.getOrderItemId()),false);
-                            if (itemReportDO != null){
-                                try {
-                                    DynamicTbInsDO dynamicTbInsDO = dynamicTbInsMapper.selectOne(new LambdaQueryWrapperX<DynamicTbInsDO>()
-                                            .eq(DynamicTbInsDO::getRefId, itemReportDO.getId()),false);
-                                    if (dynamicTbInsDO != null){
-                                        byte[] bytes = pdfService.pdf(itemReportDO.getTemplateId(), dynamicTbInsDO.getId());
-                                        String fileUrl = fileApi.createFile(bytes);
-                                        x.setSignFilePdf(fileUrl);
-                                        updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
-                                    }
-                                } catch (Exception e) {
-                                    log.error("生成重大问题线索PDF错误,{}", e.getMessage());
+                        BoilerTaskOrderItemReportDO itemReportDO = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>()
+                                .eq(BoilerTaskOrderItemReportDO::getOrderItemId, x.getOrderItemId()),false);
+                        if (itemReportDO != null){
+                            try {
+                                DynamicTbInsDO dynamicTbInsDO = dynamicTbInsMapper.selectOne(new LambdaQueryWrapperX<DynamicTbInsDO>()
+                                        .eq(DynamicTbInsDO::getRefId, itemReportDO.getId()),false);
+                                if (dynamicTbInsDO != null){
+                                    byte[] bytes = pdfService.pdf(itemReportDO.getTemplateId(), dynamicTbInsDO.getId());
+                                    String fileUrl = fileApi.createFile(bytes);
+                                    x.setSignFilePdf(fileUrl);
+                                    updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
                                 }
+                            } catch (Exception e) {
+                                log.error("生成重大问题线索PDF错误,{}", e.getMessage());
                             }
                         }
                     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -2153,18 +2153,16 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 //判断是否有签名后的PDF
                 list.forEach(x -> {
                     if (x.getSignFilePdf() == null || x.getSignFilePdf().isEmpty()){
-                        if (x.getSecurityCheckId() != null){
-                            OrderReportDO orderReportDO = orderReportMapper.selectOne(new LambdaQueryWrapperX<OrderReportDO>()
-                                    .eq(OrderReportDO::getTaskOrderId, x.getOrderId()),false);;
-                            if (orderReportDO != null){
-                                try {
-                                    byte[] bytes = pdfService.pdf(orderReportDO.getTemplateId(), orderReportDO.getInsId());
-                                    String fileUrl = fileApi.createFile(bytes);
-                                    x.setSignFilePdf(fileUrl);
-                                    updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
-                                } catch (Exception e) {
-                                    log.error("生成服务单/受理单PDF错误,{}", e.getMessage());
-                                }
+                        OrderReportDO orderReportDO = orderReportMapper.selectOne(new LambdaQueryWrapperX<OrderReportDO>()
+                                .eq(OrderReportDO::getTaskOrderId, x.getOrderId()),false);;
+                        if (orderReportDO != null){
+                            try {
+                                byte[] bytes = pdfService.pdf(orderReportDO.getTemplateId(), orderReportDO.getInsId());
+                                String fileUrl = fileApi.createFile(bytes);
+                                x.setSignFilePdf(fileUrl);
+                                updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
+                            } catch (Exception e) {
+                                log.error("生成服务单/受理单PDF错误,{}", e.getMessage());
                             }
                         }
                     }
@@ -2192,18 +2190,16 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 //判断是否有签名后的PDF
                 list.forEach(x -> {
                     if (x.getSignFilePdf() == null || x.getSignFilePdf().isEmpty()){
-                        if (x.getSecurityCheckId() != null){
-                            NotificationformReportDO notificationformReportDO = notificationformReportMapper.selectOne(new LambdaQueryWrapperX<NotificationformReportDO>()
-                                    .eq(NotificationformReportDO::getTaskOrderId, x.getOrderId()),false);;
-                            if (notificationformReportDO != null){
-                                try {
-                                    byte[] bytes = pdfService.pdf(notificationformReportDO.getTemplateId(), notificationformReportDO.getInsId());
-                                    String fileUrl = fileApi.createFile(bytes);
-                                    x.setSignFilePdf(fileUrl);
-                                    updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
-                                } catch (Exception e) {
-                                    log.error("生成检验情况告知单PDF错误,{}", e.getMessage());
-                                }
+                        NotificationformReportDO notificationformReportDO = notificationformReportMapper.selectOne(new LambdaQueryWrapperX<NotificationformReportDO>()
+                                .eq(NotificationformReportDO::getTaskOrderId, x.getOrderId()),false);;
+                        if (notificationformReportDO != null){
+                            try {
+                                byte[] bytes = pdfService.pdf(notificationformReportDO.getTemplateId(), notificationformReportDO.getInsId());
+                                String fileUrl = fileApi.createFile(bytes);
+                                x.setSignFilePdf(fileUrl);
+                                updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
+                            } catch (Exception e) {
+                                log.error("生成检验情况告知单PDF错误,{}", e.getMessage());
                             }
                         }
                     }
@@ -2226,29 +2222,51 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             pageReqVO4.setOrderItemId(orderItemId);
             PageResult<BoilerTaskOrderSignFileRespVO> taskOrderSignFilePage4 = taskOrderSignFileService.getTaskOrderSignFilePage(pageReqVO4);
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage4) && CollUtil.isNotEmpty(taskOrderSignFilePage4.getList())) {
-                List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage4.getList().stream().filter(x -> StringUtils.isNotEmpty(x.getSignFilePdf())).toList();
-                if (CollUtil.isNotEmpty(list)) {
-                    PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
-                    taskListFile.setCountNum(list.size());
-                    taskListFile.setFileType(4);
-                    taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
-                    taskListFile.setOrderItemId(orderItemId);
-                    taskListFile.setFilePdf(list.stream().map(BoilerTaskOrderSignFileRespVO::getSignFilePdf).toList());
-                    List<PipeTaskOrderItemReportDO> list1 = taskOrderItemReportDOS.stream().filter(x -> Integer.valueOf(500).equals(x.getReportType())).toList();
-                    if (CollUtil.isNotEmpty(list1)) {
-                        //获取审核记录处理时间
-                        List<BpmTaskRespVO> bpmTaskRespVOS = taskOrderService.approveOpinionNoticeCirculationRecord(list1.get(0).getId(), list1.get(0).getReportType());
-                        if (CollUtil.isNotEmpty(bpmTaskRespVOS)) {
-                            BpmTaskRespVO bpmTaskRespVO = bpmTaskRespVOS.stream()
-                                    .max(Comparator.comparing(BpmTaskRespVO::getCreateTime))
-                                    .orElse(null);
-                            if (bpmTaskRespVO != null) {
-                                taskListFile.setCompletionTime(bpmTaskRespVO.getCreateTime());
+
+                List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage4.getList();
+                //判断是否有签名后的PDF
+                list.forEach(x -> {
+                    if (x.getSignFilePdf() == null || x.getSignFilePdf().isEmpty()){
+                        PipeTaskOrderItemReportDO itemReportDO = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>()
+                                .eq(PipeTaskOrderItemReportDO::getOrderId, x.getOrderId()),false);
+                        if (itemReportDO != null){
+                            try {
+                                DynamicTbInsDO dynamicTbInsDO = dynamicTbInsMapper.selectOne(new LambdaQueryWrapperX<DynamicTbInsDO>()
+                                        .eq(DynamicTbInsDO::getRefId, itemReportDO.getId()),false);
+                                if (dynamicTbInsDO != null){
+                                    byte[] bytes = pdfService.pdf(itemReportDO.getTemplateId(), dynamicTbInsDO.getId());
+                                    String fileUrl = fileApi.createFile(bytes);
+                                    x.setSignFilePdf(fileUrl);
+                                    updateList.add(new BoilerTaskOrderSignFileDO().setId(x.getId()).setSignFilePdf(fileUrl));
+                                }
+                            } catch (Exception e) {
+                                log.error("生成重大问题线索PDF错误,{}", e.getMessage());
                             }
                         }
                     }
-                    taskListFiles.add(taskListFile);
+                });
+
+                PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
+                taskListFile.setCountNum(list.size());
+                taskListFile.setFileType(4);
+                taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
+                taskListFile.setOrderItemId(orderItemId);
+                taskListFile.setFilePdf(list.stream().map(BoilerTaskOrderSignFileRespVO::getSignFilePdf).toList());
+                List<PipeTaskOrderItemReportDO> list1 = taskOrderItemReportDOS.stream().filter(x -> Integer.valueOf(500).equals(x.getReportType())).toList();
+                if (CollUtil.isNotEmpty(list1)) {
+                    //获取审核记录处理时间
+                    List<BpmTaskRespVO> bpmTaskRespVOS = taskOrderService.approveOpinionNoticeCirculationRecord(list1.get(0).getId(), list1.get(0).getReportType());
+                    if (CollUtil.isNotEmpty(bpmTaskRespVOS)) {
+                        BpmTaskRespVO bpmTaskRespVO = bpmTaskRespVOS.stream()
+                                .max(Comparator.comparing(BpmTaskRespVO::getCreateTime))
+                                .orElse(null);
+                        if (bpmTaskRespVO != null) {
+                            taskListFile.setCompletionTime(bpmTaskRespVO.getCreateTime());
+                        }
+                    }
                 }
+                taskListFiles.add(taskListFile);
+
             }
 
             //非税缴费单