报告出具标志生成

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

@@ -47,6 +47,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemuser.Boile
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerelectronicreportauditrecord.BoilerElectronicReportAuditRecordMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderfollowrecord.BoilerTaskOrderFollowRecordMapper;
@@ -59,6 +60,7 @@ import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemuser.BoilerTask
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderuser.BoilerTaskOrderUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
+import cn.start.tz.module.pressure2.dal.mysql.reporttemplate.ReportTemplateMapper;
 import cn.start.tz.module.pressure2.framework.thread.CommonThread;
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 import cn.start.tz.module.pressure2.service.boilertaskorderitemreportrecord.BoilerTaskOrderItemReportRecordService;
@@ -73,6 +75,8 @@ import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitPageDTO;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.mail.MailSendApi;
 import cn.start.tz.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -177,6 +181,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private BoilerTaskOrderSignFileService taskOrderSignFileService;
 
+    @Resource
+    private ReportTemplateMapper reportTemplateMapper;
+
     @Resource
     private BoilerTaskOrderItemReportVersionService taskOrderItemReportVersionService;
 
@@ -186,6 +193,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Resource
     private ClientUnitApi clientUnitApi;
 
@@ -616,16 +626,16 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                             String useRegisterNo = equipBoilerDO.getUseRegisterNo();
                             if(StringUtils.isNotBlank(useRegisterNo) && useRegisterNo.length() > 5){
                                 //TODO 标志
-//                                ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                if (Objects.equals(env, "uat")) {
-//                                    useLogoUrl = minioHostouter + useLogoUrl;
-//                                } else {
-//                                    useLogoUrl = minioHost + useLogoUrl;
-//                                }
-//                                reportUrlList.add(useLogoUrl);
-//                                String useLogoFileName =  String.format("%s-%s-%s",taskOrderItemDO.getEquipCode(),equipBoilerDO.getEquipName() , "标志.pdf");
-//                                attachmentNames.add(useLogoFileName);
+                                ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                if (Objects.equals(env, "uat")) {
+                                    useLogoUrl = minioHostouter + useLogoUrl;
+                                } else {
+                                    useLogoUrl = minioHost + useLogoUrl;
+                                }
+                                reportUrlList.add(useLogoUrl);
+                                String useLogoFileName =  String.format("%s-%s-%s",taskOrderItemDO.getEquipCode(),equipBoilerDO.getEquipName() , "标志.pdf");
+                                attachmentNames.add(useLogoFileName);
                             }
                         }
 
@@ -726,10 +736,10 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                                     && equipBoilerDO.getUseRegisterNo().length() > 5){
                                 if(checkType != null && checkType != 200){
                                     //TODO 标志
-//                                    ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                    String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                    updateOb.setUseLogoTime(LocalDateTime.now());
-//                                    updateOb.setUseLogo(useLogoUrl);
+                                    ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                    String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                    updateOb.setUseLogoTime(LocalDateTime.now());
+                                    updateOb.setUseLogo(useLogoUrl);
                                 }
                             }
                             taskOrderItemMapper.updateById(updateOb);
@@ -748,7 +758,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
 
     @Override
     public ByteArrayOutputStream getUseLogoOutputStream(String id, Integer fileType) throws Exception {
-        // 设置默认 fileType 为 100 (PDF)
+        /// 设置默认 fileType 为 100 (PDF)
         if (fileType == null) {
             fileType = 100;
         }
@@ -761,9 +771,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
         EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectOne(new LambdaQueryWrapperX<EquipBoilerDO>().
                 eq(EquipBoilerDO::getEquipCode, taskOrderItemDO.getEquipCode()), false);
 
-        DynamicTbDO dynamicTbDO = dynamicTbMapper.selectOne(new LambdaQueryWrapperX<DynamicTbDO>().
-                eq(DynamicTbDO::getTbName, "压力容器使用标志"), false);
-        if (dynamicTbDO == null){
+        ReportTemplateDO reportTemplateDO = reportTemplateMapper.selectOne(new LambdaQueryWrapperX<ReportTemplateDO>().
+                eq(ReportTemplateDO::getName, "压力容器使用标志"), false);
+        if (reportTemplateDO == null){
             throw exception0(502,"模版不存在");
         }
 
@@ -783,9 +793,13 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
         //实体
         Map<String,String> dataMap = new HashMap<>();
 
-        String equipCategory =  equipBoilerDO.getBoilerType();
+        String equipCategory = "";
+        DictDataRespDTO boilerTypeDTO = dictDataApi.getDictData("system_equip_boiler_type",equipBoilerDO.getType().toString()).getData();
+        if (boilerTypeDTO != null){
+            equipCategory = boilerTypeDTO.getLabel();
+        }
         //String equipType = loadByDict("system_equip_container_equip_type", equipContainerDO.getEquipType());
-        dataMap.put("equipmentType","压力容器");
+        dataMap.put("equipmentType","锅炉");
         dataMap.put("equipCategory",equipCategory);
         dataMap.put("unitName",equipBoilerDO.getUnitName());
 //        dataMap.put("unitInnerNo",equipBoilerDO.getUnitInnerNo());
@@ -818,10 +832,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
 
         String dataJson = objectMapper.writeValueAsString(dataMap);
 
-
-        byte[] bytes = pdfService.pdf(dynamicTbDO.getId(), "");
-
-//        byte[] bytes = fileApi.getFileByPath(reportTemplateDO.getRecordTemplateUrl()).getCheckedData();
+        byte[] bytes = fileApi.getFileByPath(reportTemplateDO.getRecordTemplateUrl()).getCheckedData();
         GrapeCityReqDTO grapeCityReqDTO = new GrapeCityReqDTO();
         grapeCityReqDTO.setCode(TEMPLATE_NON_TAX);
 
@@ -835,6 +846,12 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
         if(env.equals("uat")){
             qrcode = String.format("https://tjt.gzsei.cn/mp/pagesSub/reportInfoList/index?id=%s&type=0",id);
         }
+//        if(StringUtils.isNotBlank(qrcode)){
+//            ByteArrayOutputStream byteArrayOutputStream = ImageUtils.generateQRCode(qrcode, 80, 80);
+//            grapeCityReqDTO.setImageData(byteArrayOutputStream.toByteArray());
+//        }
+//        grapeCityReqDTO.setImageWidth(53);
+//        grapeCityReqDTO.setImageHeight(50);
         grapeCityReqDTO.setIsShrinkToFit(false);
         bytes = grapeCityApi.getByteArrayOutputStream(grapeCityReqDTO).getData();
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -863,7 +880,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
             byteArrayOutputStream = new ByteArrayOutputStream();
             byteArrayOutputStream.write(resultByte);
         } catch (Exception e) {
-            log.error("签章异常, 记录ID: {}, 错误信息: {}", id, e.getMessage());
+            log.error("签章异常, 记录ID: {}, 错误信息: {}", id, e.getMessage(), e);
         }
 
         if(fileType == 100){
@@ -1382,10 +1399,10 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                                         && equipBoilerDO.getUseRegisterNo().length() > 5) {
                                     if (checkType != null && checkType != 200) {
                                         //TODO 标志
-//                                        ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                        String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                        updateOb.setUseLogoTime(LocalDateTime.now());
-//                                        updateOb.setUseLogo(useLogoUrl);
+                                        ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                        String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                        updateOb.setUseLogoTime(LocalDateTime.now());
+                                        updateOb.setUseLogo(useLogoUrl);
                                     }
                                 }
                                 taskOrderItemMapper.updateById(updateOb);

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

@@ -40,6 +40,7 @@ import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreportvers
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreportversion.vo.PipeTaskOrderItemReportVersionRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
@@ -53,6 +54,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeT
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemuser.PipeTaskOrderItemUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderuser.PipeTaskOrderUserDO;
+import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipeelectronicreportauditrecord.PipeElectronicReportAuditRecordMapper;
@@ -66,6 +68,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemuser.PipeTaskOrderItemUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderuser.PipeTaskOrderUserMapper;
+import cn.start.tz.module.pressure2.dal.mysql.reporttemplate.ReportTemplateMapper;
 import cn.start.tz.module.pressure2.framework.thread.CommonThread;
 import cn.start.tz.module.pressure2.service.boilertaskorderissuereport.BoilerTaskOrderIssueReportServiceImpl;
 import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
@@ -81,6 +84,8 @@ import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitPageDTO;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.mail.MailSendApi;
 import cn.start.tz.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -182,6 +187,9 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private DynamicTbMapper dynamicTbMapper;
 
+    @Resource
+    private ReportTemplateMapper reportTemplateMapper;
+
     @Resource
     private BoilerTaskOrderSignFileService taskOrderSignFileService;
 
@@ -197,6 +205,9 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private ClientUnitApi clientUnitApi;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Resource
     private PipeTaskOrderService taskOrderService;
 
@@ -626,16 +637,16 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                             String useRegisterNo = equipPipeDO.getCertificateNo();
                             if(StringUtils.isNotBlank(useRegisterNo) && useRegisterNo.length() > 5){
                                 //TODO 标志
-//                                ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                if (Objects.equals(env, "uat")) {
-//                                    useLogoUrl = minioHostouter + useLogoUrl;
-//                                } else {
-//                                    useLogoUrl = minioHost + useLogoUrl;
-//                                }
-//                                reportUrlList.add(useLogoUrl);
-//                                String useLogoFileName =  String.format("%s-%s-%s",taskOrderItemDO.getEquipCode(),equipPipeDO.getProjectName() , "标志.pdf");
-//                                attachmentNames.add(useLogoFileName);
+                                ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                if (Objects.equals(env, "uat")) {
+                                    useLogoUrl = minioHostouter + useLogoUrl;
+                                } else {
+                                    useLogoUrl = minioHost + useLogoUrl;
+                                }
+                                reportUrlList.add(useLogoUrl);
+                                String useLogoFileName =  String.format("%s-%s-%s",taskOrderItemDO.getEquipCode(),equipPipeDO.getProjectName() , "标志.pdf");
+                                attachmentNames.add(useLogoFileName);
                             }
                         }
 
@@ -736,10 +747,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                                     && equipPipeDO.getCertificateNo().length() > 5){
                                 if(checkType != null && checkType != 200){
                                     //TODO 标志
-//                                    ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                    String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                    updateOb.setUseLogoTime(LocalDateTime.now());
-//                                    updateOb.setUseLogo(useLogoUrl);
+                                    ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                    String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                    updateOb.setUseLogoTime(LocalDateTime.now());
+                                    updateOb.setUseLogo(useLogoUrl);
                                 }
                             }
                             taskOrderItemMapper.updateById(updateOb);
@@ -758,7 +769,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
 
     @Override
     public ByteArrayOutputStream getUseLogoOutputStream(String id, Integer fileType) throws Exception {
-        // 设置默认 fileType 为 100 (PDF)
+        /// 设置默认 fileType 为 100 (PDF)
         if (fileType == null) {
             fileType = 100;
         }
@@ -771,9 +782,9 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         EquipPipeDO equipPipeDO = equipPipeMapper.selectOne(new LambdaQueryWrapperX<EquipPipeDO>().
                 eq(EquipPipeDO::getProjectNo, taskOrderItemDO.getEquipCode()), false);
 
-        DynamicTbDO dynamicTbDO = dynamicTbMapper.selectOne(new LambdaQueryWrapperX<DynamicTbDO>().
-                eq(DynamicTbDO::getTbName, "压力容器使用标志"), false);
-        if (dynamicTbDO == null){
+        ReportTemplateDO reportTemplateDO = reportTemplateMapper.selectOne(new LambdaQueryWrapperX<ReportTemplateDO>().
+                eq(ReportTemplateDO::getName, "压力容器使用标志"), false);
+        if (reportTemplateDO == null){
             throw exception0(502,"模版不存在");
         }
 
@@ -793,9 +804,13 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         //实体
         Map<String,String> dataMap = new HashMap<>();
 
-        String equipCategory =  equipPipeDO.getPipeCategory();
+        String equipCategory = "";
+        DictDataRespDTO pipeTypeDTO = dictDataApi.getDictData("PIPE_TYPE",equipPipeDO.getPipeCategory().toString()).getData();
+        if (pipeTypeDTO != null){
+            equipCategory = pipeTypeDTO.getLabel();
+        }
         //String equipType = loadByDict("system_equip_container_equip_type", equipContainerDO.getEquipType());
-        dataMap.put("equipmentType","压力容器");
+        dataMap.put("equipmentType","管道");
         dataMap.put("equipCategory",equipCategory);
         dataMap.put("unitName",equipPipeDO.getUnitName());
 //        dataMap.put("unitInnerNo",equipPipeDO.getUnitInnerNo());
@@ -804,7 +819,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         // 查询主报告
 
         PipeTaskOrderItemReportDO mainReport = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>().
-                        eq(PipeTaskOrderItemReportDO::getOrderItemId,id).
+                        eq(PipeTaskOrderItemReportDO::getOrderId,taskOrderItemDO.getOrderId()).
                         eq(PipeTaskOrderItemReportDO::getReportType, 100).
                         eq(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus())
                 , false);
@@ -828,10 +843,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
 
         String dataJson = objectMapper.writeValueAsString(dataMap);
 
-
-        byte[] bytes = pdfService.pdf(dynamicTbDO.getId(), "");
-
-//        byte[] bytes = fileApi.getFileByPath(reportTemplateDO.getRecordTemplateUrl()).getCheckedData();
+        byte[] bytes = fileApi.getFileByPath(reportTemplateDO.getRecordTemplateUrl()).getCheckedData();
         GrapeCityReqDTO grapeCityReqDTO = new GrapeCityReqDTO();
         grapeCityReqDTO.setCode(TEMPLATE_NON_TAX);
 
@@ -845,6 +857,12 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         if(env.equals("uat")){
             qrcode = String.format("https://tjt.gzsei.cn/mp/pagesSub/reportInfoList/index?id=%s&type=0",id);
         }
+//        if(StringUtils.isNotBlank(qrcode)){
+//            ByteArrayOutputStream byteArrayOutputStream = ImageUtils.generateQRCode(qrcode, 80, 80);
+//            grapeCityReqDTO.setImageData(byteArrayOutputStream.toByteArray());
+//        }
+//        grapeCityReqDTO.setImageWidth(53);
+//        grapeCityReqDTO.setImageHeight(50);
         grapeCityReqDTO.setIsShrinkToFit(false);
         bytes = grapeCityApi.getByteArrayOutputStream(grapeCityReqDTO).getData();
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -873,7 +891,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             byteArrayOutputStream = new ByteArrayOutputStream();
             byteArrayOutputStream.write(resultByte);
         } catch (Exception e) {
-            log.error("签章异常, 记录ID: {}, 错误信息: {}", id, e.getMessage());
+            log.error("签章异常, 记录ID: {}, 错误信息: {}", id, e.getMessage(), e);
         }
 
         if(fileType == 100){
@@ -1292,16 +1310,16 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                                 String useRegisterNo = equipPipeDO.getCertificateNo();
                                 if (StringUtils.isNotBlank(useRegisterNo) && useRegisterNo.length() > 5) {
                                     //TODO 标志
-//                                    ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                    useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                    if (Objects.equals(env, "uat")) {
-//                                        useLogoUrl = minioHostouter + useLogoUrl;
-//                                    } else {
-//                                        useLogoUrl = minioHost + useLogoUrl;
-//                                    }
-//                                    reportUrlList.add(useLogoUrl);
-//                                    String useLogoFileName = String.format("%s-%s-%s", taskOrderItemDO.getEquipCode(), equipPipeDO.getProjectName(), "标志.pdf");
-//                                    attachmentNames.add(useLogoFileName);
+                                    ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                    useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                    if (Objects.equals(env, "uat")) {
+                                        useLogoUrl = minioHostouter + useLogoUrl;
+                                    } else {
+                                        useLogoUrl = minioHost + useLogoUrl;
+                                    }
+                                    reportUrlList.add(useLogoUrl);
+                                    String useLogoFileName = String.format("%s-%s-%s", taskOrderItemDO.getEquipCode(), equipPipeDO.getProjectName(), "标志.pdf");
+                                    attachmentNames.add(useLogoFileName);
                                 }
                             }
 
@@ -1403,10 +1421,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                                         && equipPipeDO.getCertificateNo().length() > 5) {
                                     if (checkType != null && checkType != 200) {
                                         //TODO 标志
-//                                        ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                                        String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                                        updateOb.setUseLogoTime(LocalDateTime.now());
-//                                        updateOb.setUseLogo(useLogoUrl);
+                                        ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                                        String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                                        updateOb.setUseLogoTime(LocalDateTime.now());
+                                        updateOb.setUseLogo(useLogoUrl);
                                     }
                                 }
                                 taskOrderItemMapper.updateById(updateOb);
@@ -1853,11 +1871,11 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                         String useRegisterNo = equipPipeDO.getCertificateNo();
 
                         if (StringUtils.isNotBlank(useRegisterNo) && useRegisterNo.length() > 5) {
-//                            ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
-//                            String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
-//                            if (taskOrderItemDO.getUseLogoTime() == null && StringUtils.isNotBlank(useLogoUrl)) {
-//                                updateOb.setUseLogoTime(LocalDateTime.now());
-//                            }
+                            ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
+                            String useLogoUrl = fileApi.createFile(outputStream.toByteArray());
+                            if (taskOrderItemDO.getUseLogoTime() == null && StringUtils.isNotBlank(useLogoUrl)) {
+                                updateOb.setUseLogoTime(LocalDateTime.now());
+                            }
                         }
                     }
                     updateOb.setId(taskOrderItemDO.getId());
@@ -1866,7 +1884,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 }
             }
         } catch (Exception e) {
-            log.error("生产任务单设备报告失败", e);
+            log.error("生成任务单设备报告失败", e);
             throw new RuntimeException(e);
         }
     }