推送邮箱

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/orderreport/OrderReportServiceImpl.java

@@ -312,30 +312,36 @@ public class OrderReportServiceImpl extends ServiceImpl<OrderReportMapper, Order
                 if (ObjectUtil.isEmpty(taskOrderDO)) {
                     throw exception(new ErrorCode(1001, "任务单不存在"));
                 }
-                //区分是受理单还是服务单
-                if (taskOrderDO.getEquipMainType() == 200){
-                    if (Integer.valueOf(100).equals(taskOrderDO.getCheckType())) {
-                        templateParams.put("projectName", "锅炉定期检验受理单");
-                        attachmentName = "锅炉定期检验受理单.pdf";
-                    } else if (Integer.valueOf(200).equals(taskOrderDO.getCheckType())) {
-                        templateParams.put("projectName", "锅炉年度检查服务单");
-                        attachmentName = "锅炉年度检查服务单.pdf";
-                    }
-                }else{
-                    if (Integer.valueOf(100).equals(taskOrderDO.getCheckType())) {
-                        templateParams.put("projectName", "压力管道定期检验受理单");
-                        attachmentName = "压力管道定期检验受理单.pdf";
-                    } else if (Integer.valueOf(200).equals(taskOrderDO.getCheckType())) {
-                        templateParams.put("projectName", "压力管道年度检查服务单");
-                        attachmentName = "压力管道年度检查服务单.pdf";
-                    }
-                }
                 if (pageReqVO.getReportId() != null){
                     OrderReportDO orderReportDO = orderReportMapper.selectById(pageReqVO.getReportId());
                     if (orderReportDO != null){
                         pdf = pdfService.pdf(orderReportDO.getTemplateId(), orderReportDO.getInsId());
+                        DynamicTbDO dynamicTbDO = dynamicTbService.getById(orderReportDO.getTemplateId());
+                        templateParams.put("projectName", dynamicTbDO.getTbName());
+                        attachmentName = dynamicTbDO.getTbName() + ".pdf";
                     }
                 }
+//                if (taskOrderDO.getEquipMainType() == 200){
+//                    if (Integer.valueOf(100).equals(taskOrderDO.getCheckType())) {
+//
+//                        templateParams.put("projectName", "锅炉内部检验受理单");
+//                        attachmentName = "锅炉内部检验受理单.pdf";
+//                    } else if (Integer.valueOf(200).equals(taskOrderDO.getCheckType())) {
+//                        templateParams.put("projectName", "锅炉外部检验受理单");
+//                        attachmentName = "锅炉外部检验受理单.pdf";
+//                    } else if (Integer.valueOf(300).equals(taskOrderDO.getCheckType())) {
+//                        templateParams.put("projectName", "锅炉耐压检验受理单");
+//                        attachmentName = "锅炉耐压检验受理单.pdf";
+//                    }
+//                }else{
+//                    if (Integer.valueOf(100).equals(taskOrderDO.getCheckType())) {
+//                        templateParams.put("projectName", "压力管道定期检验受理单");
+//                        attachmentName = "压力管道定期检验受理单.pdf";
+//                    } else if (Integer.valueOf(200).equals(taskOrderDO.getCheckType())) {
+//                        templateParams.put("projectName", "压力管道年度检查服务单");
+//                        attachmentName = "压力管道年度检查服务单.pdf";
+//                    }
+//                }
             } else if (Integer.valueOf(200).equals(pageReqVO.getBusinessType())) {
                 templateParams.put("projectName", "承压类特种设备检验情况告知单");
                 attachmentName = "承压类特种设备检验情况告知单.pdf";