Prechádzať zdrojové kódy

perf: 签章任务名称补充

sunbw 1 mesiac pred
rodič
commit
6c650dc6b2

+ 156 - 87
zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/pdf/PDFServiceImpl.java

@@ -133,24 +133,25 @@ public class PDFServiceImpl implements IPDFService {
         Map<String,Object> map ;
         File file ;
         ManageSysFile sysFileDto ;
+        Map<String, String> companyNameMap = new HashMap<>();
         switch (type) {
             case "checkTable":
-                map = modelCheckTemplate(templateType, jobId);
+                map = modelCheckTemplate(templateType, jobId, companyNameMap);
                 file = (File) map.get("file");
                 sysFileDto = (ManageSysFile) map.get("sysFileDto");
                 break;
             case "limitTable":
-                map = modelLimitTemplate(templateType, jobId);
+                map = modelLimitTemplate(templateType, jobId, companyNameMap);
                 file = (File) map.get("file");
                 sysFileDto = (ManageSysFile) map.get("sysFileDto");
                 break;
             case "numerousTable":
-                map = modelNumsTemplate(templateType, jobId);
+                map = modelNumsTemplate(templateType, jobId, companyNameMap);
                 file = (File) map.get("file");
                 sysFileDto = (ManageSysFile) map.get("sysFileDto");
                 break;
             case "nowTable":
-                map = modelImmediately(templateType, jobId);
+                map = modelImmediately(templateType, jobId, companyNameMap);
                 file = (File) map.get("file");
                 sysFileDto = (ManageSysFile) map.get("sysFileDto");
                 break;
@@ -158,7 +159,8 @@ public class PDFServiceImpl implements IPDFService {
                 EnforceJobDTO jobLimitDTO = enforceJobService.get(jobId);
                 String fileLimitName = "限改送达回证-" + jobId + ".pdf";
                 EnforceJobCertificate certificateEntityLimit = jobCertificate(jobId, "DEADLINE");
-                Map<String, Object> limitMap = createCertificatePdf(templateType, jobLimitDTO, fileLimitName, fireDir, certificateEntityLimit);
+                Map<String, Object> limitMap = createCertificatePdf(templateType, jobLimitDTO, fileLimitName, fireDir,
+                        certificateEntityLimit, companyNameMap);
                 file = (File) limitMap.get("file");
                 sysFileDto = (ManageSysFile) limitMap.get("sysFileDto");
                 break;
@@ -166,7 +168,8 @@ public class PDFServiceImpl implements IPDFService {
                 EnforceJobDTO jobDTO = enforceJobService.get(jobId);
                 String fileName = "立改送达回证-" + jobDTO.getId() + ".pdf";
                 EnforceJobCertificate certificateEntity = jobCertificate(jobId, "IMMEDIATELY");
-                Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
+                Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir,
+                        certificateEntity, companyNameMap);
                 file = (File) certificateMap.get("file");
                 sysFileDto = (ManageSysFile) certificateMap.get("sysFileDto");
                 break;
@@ -214,24 +217,26 @@ public class PDFServiceImpl implements IPDFService {
         fileInfo.setFileId(fileId);
         String templateType = TemplateTypeEnum.getMap().get(type);
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
+        Map<String, String> companyNameMap = new HashMap<>();
         switch (type) {
             case "checkTable":
-                newCheckTemplate(templateType, jobId, entity);
+                newCheckTemplate(templateType, jobId, entity, companyNameMap);
                 break;
             case "limitTable":
-                newLimitTemplate(templateType, jobId, entity);
+                newLimitTemplate(templateType, jobId, entity, companyNameMap);
                 break;
             case "numerousTable":
-                newNumsTemplate(templateType, jobId, entity);
+                newNumsTemplate(templateType, jobId, entity, companyNameMap);
                 break;
             case "nowTable":
-                newImmediately(templateType, jobId, entity);
+                newImmediately(templateType, jobId, entity, companyNameMap);
                 break;
             case "certificateLimit":
                 EnforceJobDTO jobLimitDTO = enforceJobService.get(jobId);
                 String fileLimitName = "限改送达回证-" + jobId + ".pdf";
                 EnforceJobCertificate certificateEntityLimit = jobCertificate(jobId, "DEADLINE");
-                Map<String, Object> limitMap = createCertificatePdf(templateType, jobLimitDTO, fileLimitName, fireDir, certificateEntityLimit);
+                Map<String, Object> limitMap = createCertificatePdf(templateType, jobLimitDTO, fileLimitName, fireDir,
+                        certificateEntityLimit, companyNameMap);
                 String certificateLimitFileId = newCertificateSign(limitMap, jobId, entity, fileLimitName, fireDir);
                 EnforceJobDTO newLimitJob = new EnforceJobDTO();
                 newLimitJob.setId(jobId);
@@ -242,7 +247,8 @@ public class PDFServiceImpl implements IPDFService {
                 EnforceJobDTO jobDTO = enforceJobService.get(jobId);
                 String fileName = "立改送达回证-" + jobDTO.getId() + ".pdf";
                 EnforceJobCertificate certificateEntity = jobCertificate(jobId, "IMMEDIATELY");
-                Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
+                Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir,
+                        certificateEntity, companyNameMap);
 //                String fileId = newCertificateSign(certificateMap, jobId, entity, fileName, fireDir);
                 EnforceJobDTO newJobDto = new EnforceJobDTO();
                 newJobDto.setId(jobId);
@@ -254,6 +260,7 @@ public class PDFServiceImpl implements IPDFService {
         }
     }
 
+    private static final String COMPANY_NAME = "companyName";
     /**
      * 100002  ("checkTable","checkTables.ftl",      "简表 检查记录"),之前位置是死的          x:380,y:650  右上
      * 100001  ("numerousTable","numerousTables.ftl","繁表 检查记录"),之前位置是死的          x:380,y:620  右上
@@ -275,25 +282,28 @@ public class PDFServiceImpl implements IPDFService {
         SignatureEntity entity = signatureInfo(false, enforceJob.getEnforceOrgId());
         String templateType = TemplateTypeEnum.getMap().get(type);
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
+        Map<String, String> companyNameMap = new HashMap<>();
         switch (type) {
             case "checkTable":
-                checkTemplate(templateType, jobId, entity);
+                checkTemplate(templateType, jobId, entity, companyNameMap);
                 break;
             case "limitTable":
-                limitTemplate(templateType, jobId, entity);
+                limitTemplate(templateType, jobId, entity, companyNameMap);
                 break;
             case "numerousTable":
-                numsTemplate(templateType, jobId, entity);
+                numsTemplate(templateType, jobId, entity, companyNameMap);
                 break;
             case "nowTable":
-                immediately(templateType, jobId, entity);
+                immediately(templateType, jobId, entity, companyNameMap);
                 break;
             case "certificateLimit":
                 EnforceJobDTO jobLimitDTO = enforceJobService.get(jobId);
                 String fileLimitName = "限改送达回证-" + jobId + ".pdf";
                 EnforceJobCertificate certificateEntityLimit = jobCertificate(jobId, "DEADLINE");
-                Map<String, Object> limitMap = createCertificatePdf(templateType, jobLimitDTO, fileLimitName, fireDir, certificateEntityLimit);
-                String certificateLimitFileId = certificateSign(limitMap, jobId, entity, fileLimitName, fireDir,SignType.DEADLINE_CORRECTION_DELIVERY_RECEIPT);
+                Map<String, Object> limitMap = createCertificatePdf(templateType, jobLimitDTO, fileLimitName, fireDir,
+                        certificateEntityLimit, companyNameMap);
+                String certificateLimitFileId = certificateSign(limitMap, jobId, entity, fileLimitName, fireDir,
+                        SignType.DEADLINE_CORRECTION_DELIVERY_RECEIPT, companyNameMap);
                 EnforceJobDTO newLimitJob = new EnforceJobDTO();
                 newLimitJob.setId(jobId);
                 newLimitJob.setCertificateLimitFileId(Long.parseLong(certificateLimitFileId));
@@ -303,9 +313,10 @@ public class PDFServiceImpl implements IPDFService {
                 EnforceJobDTO jobDTO = enforceJobService.get(jobId);
                 String fileName = "立改送达回证-" + jobDTO.getId() + ".pdf";
                 EnforceJobCertificate certificateEntity = jobCertificate(jobId, "IMMEDIATELY");
-                Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
-                String fileId = certificateSign(certificateMap,
-                        jobId, entity, fileName, fireDir, SignType.IMMEDIATE_CORRECTION_DELIVERY_RECEIPT);
+                Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir,
+                        certificateEntity, companyNameMap);
+                String fileId = certificateSign(certificateMap, jobId, entity, fileName, fireDir,
+                        SignType.IMMEDIATE_CORRECTION_DELIVERY_RECEIPT, companyNameMap);
                 EnforceJobDTO newJobDto = new EnforceJobDTO();
                 newJobDto.setId(jobId);
                 newJobDto.setCertificateNowFileId(Long.parseLong(fileId));
@@ -347,17 +358,18 @@ public class PDFServiceImpl implements IPDFService {
             entity.setSignatoriesList(signatoriesList);
         }
         String templateType = TemplateTypeEnum.getMap().get(type);
+        Map<String, String> companyNameMap = new HashMap<>();
         if (TemplateTypeEnum.CHECKTABLES.getType().equals(type)) {
-            checkTemplate(templateType, jobId, entity);
+            checkTemplate(templateType, jobId, entity, companyNameMap);
         }
         if (TemplateTypeEnum.LIMITTABLES.getType().equals(type)) {
-            limitTemplate(templateType, jobId, entity);
+            limitTemplate(templateType, jobId, entity, companyNameMap);
         }
         if (TemplateTypeEnum.NUMEROUSTABLE.getType().equals(type)) {
-            numsTemplate(templateType, jobId, entity);
+            numsTemplate(templateType, jobId, entity, companyNameMap);
         }
         if (TemplateTypeEnum.NOWTABLE.getType().equals(type)) {
-            immediately(templateType, jobId, entity);
+            immediately(templateType, jobId, entity, companyNameMap);
         }
     }
 
@@ -369,14 +381,17 @@ public class PDFServiceImpl implements IPDFService {
             e.printStackTrace();
         }
         EnforceJobDTO jobDTO = enforceJobService.get(jobId);
+        Map<String, String> companyNameMap = new HashMap<>();
         if (jobDTO.getCertificateLimitFileId() == null) {
             new Thread(() -> {
                 SignatureEntity entity = signatureInfo(false, jobDTO.getEnforceOrgId());
                 String fileName = "限改送达回证-" + jobDTO.getId() + ".pdf";
                 String fireDir = uploadDir + PDFUtils.datePath() + "/";
                 EnforceJobCertificate certificateEntity = jobCertificate(jobId, "DEADLINE");
-                Map<String, Object> certificateMap = createCertificatePdf("certificateTables.ftl", jobDTO, fileName, fireDir, certificateEntity);
-                String certificateLimitFileId = certificateSign(certificateMap, jobId, entity, fileName, fireDir, SignType.DEADLINE_CORRECTION_DELIVERY_RECEIPT);
+                Map<String, Object> certificateMap = createCertificatePdf("certificateTables.ftl", jobDTO, fileName, fireDir,
+                        certificateEntity, companyNameMap);
+                String certificateLimitFileId = certificateSign(certificateMap, jobId, entity, fileName, fireDir,
+                        SignType.DEADLINE_CORRECTION_DELIVERY_RECEIPT, companyNameMap);
                 EnforceJobDTO newJobDto = new EnforceJobDTO();
                 newJobDto.setId(jobId);
                 newJobDto.setCertificateLimitFileId(Long.parseLong(certificateLimitFileId));
@@ -384,7 +399,7 @@ public class PDFServiceImpl implements IPDFService {
             }).start();
         }
         SignatureEntity entity = signatureInfo(false, jobDTO.getEnforceOrgId());
-        limitTablePDF(jobDTO, "limitTables.ftl", jobId, entity);
+        limitTablePDF(jobDTO, "limitTables.ftl", jobId, entity, companyNameMap);
     }
 
     @Override
@@ -396,6 +411,7 @@ public class PDFServiceImpl implements IPDFService {
                 pdfLog.setType(type);
                 pdfLog.setId(id);
                 try {
+                    Map<String, String> companyNameMap = new HashMap<>();
                     String templateType = TemplateTypeEnum.getMap().get(type);
                     if (TemplateTypeEnum.CHECKTABLES.getType().equals(type)) {
                         EnforceJob jobDTO = enforceJobService.getById(id);
@@ -407,7 +423,7 @@ public class PDFServiceImpl implements IPDFService {
                         // 生成未盖章pdf
                         Map<String, Object> map;
                         try {
-                            map = createCheckPDF("checkTablesTest.ftl", jobDTO, fileName, fireDir);
+                            map = createCheckPDF("checkTablesTest.ftl", jobDTO, fileName, fireDir, companyNameMap);
                         } catch (Exception e) {
                             log.error("生成简表pdf失败", e);
                             String detail = null;
@@ -441,7 +457,8 @@ public class PDFServiceImpl implements IPDFService {
                         String storageName;
                         try {
 //                            storageName = getSignature(fireDir, fileName, file, entity);
-                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.SUMMARY_TABLE,String.valueOf(id),appConfig);
+                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.SUMMARY_TABLE,
+                                    String.valueOf(id), appConfig, companyNameMap.get(COMPANY_NAME));
                         } catch (Exception e) {
                             pdfLog.setErrorLog(e.getMessage());
                             pdfLog.setSignatureResult("失败");
@@ -470,7 +487,7 @@ public class PDFServiceImpl implements IPDFService {
                         // 生成未盖章pdf
                         Map<String, Object> map;
                         try {
-                            map = createLimitPdf(templateType, jobDTO, fileName, fireDir);
+                            map = createLimitPdf(templateType, jobDTO, fileName, fireDir, companyNameMap);
                         } catch (Exception e) {
                             log.error("生成限改pdf失败", e);
                             String detail = null;
@@ -526,7 +543,8 @@ public class PDFServiceImpl implements IPDFService {
                         String storageName = null;
                         try {
 //                            storageName = getSignature(fireDir, fileName, file, entity);
-                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.DEADLINE_CORRECTION_NOTICE,String.valueOf(id),appConfig);
+                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.DEADLINE_CORRECTION_NOTICE,
+                                    String.valueOf(id), appConfig, companyNameMap.get(COMPANY_NAME));
                         } catch (Exception e) {
                             log.error("电子签章失败", e);
                             pdfLog.setErrorLog(e.getMessage());
@@ -553,7 +571,7 @@ public class PDFServiceImpl implements IPDFService {
                         // 生成未盖章pdf
                         Map<String, Object> map = null;
                         try {
-                            map = createNumerousPDF("numerousTables.ftl", jobDTO, fileName, fireDir);
+                            map = createNumerousPDF("numerousTables.ftl", jobDTO, fileName, fireDir, companyNameMap);
                         } catch (Exception e) {
                             log.error("生成繁表pdf失败", e);
                             String detail = null;
@@ -589,7 +607,8 @@ public class PDFServiceImpl implements IPDFService {
                         String storageName = null;
                         try {
 //                            storageName = getSignature(fireDir, fileName, file, entity);
-                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.COMPLEX_TABLE,String.valueOf(id),appConfig);
+                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.COMPLEX_TABLE,
+                                    String.valueOf(id), appConfig, companyNameMap.get(COMPANY_NAME));
                         } catch (Exception e) {
                             log.error("电子签章失败", e);
                             // 电子签章失败则保存未签章pdf
@@ -616,7 +635,7 @@ public class PDFServiceImpl implements IPDFService {
                         // 生成未盖章pdf
                         Map<String, Object> map = null;
                         try {
-                            map = createNowPdf(templateType, jobDTO, fileName, fireDir);
+                            map = createNowPdf(templateType, jobDTO, fileName, fireDir, companyNameMap);
                         } catch (Exception e) {
                             log.error("生成立改pdf失败", e);
                             String detail = null;
@@ -669,7 +688,8 @@ public class PDFServiceImpl implements IPDFService {
                         newJobTto.setId(id);
                         try {
 //                            storageName = getSignature(fireDir, fileName, file, entity);
-                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.IMMEDIATE_CORRECTION_NOTICE,String.valueOf(id),appConfig);
+                            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.IMMEDIATE_CORRECTION_NOTICE,
+                                    String.valueOf(id), appConfig, companyNameMap.get(COMPANY_NAME));
                         } catch (Exception e) {
                             log.error("电子签章失败", e);
                             pdfLog.setErrorLog(e.getMessage());
@@ -703,7 +723,8 @@ public class PDFServiceImpl implements IPDFService {
                         Map<String, Object> map = null;
                         try {
                             EnforceJobCertificate certificateEntity = jobCertificate(id, "DEADLINE");
-                            map = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
+                            map = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity,
+                                    companyNameMap);
                         } catch (Exception e) {
                             log.error("限改送达回证", e);
                             String detail = null;
@@ -726,7 +747,8 @@ public class PDFServiceImpl implements IPDFService {
                         // 生成盖章pdf
                         SignatureEntity entity = signatureInfo(false, jobDTO.getEnforceOrgId());
                         try {
-                            String certificateLimitFileId = certificateSign(map, id, entity, fileName, fireDir, SignType.DEADLINE_CORRECTION_DELIVERY_RECEIPT);
+                            String certificateLimitFileId = certificateSign(map, id, entity, fileName, fireDir,
+                                    SignType.DEADLINE_CORRECTION_DELIVERY_RECEIPT, companyNameMap);
                             EnforceJobDTO newLimitJob = new EnforceJobDTO();
                             newLimitJob.setId(id);
                             newLimitJob.setCertificateLimitFileId(Long.parseLong(certificateLimitFileId));
@@ -753,7 +775,8 @@ public class PDFServiceImpl implements IPDFService {
                         Map<String, Object> map = null;
                         try {
                             EnforceJobCertificate certificateEntity = jobCertificate(id, "IMMEDIATELY");
-                            map = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
+                            map = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity,
+                                    companyNameMap);
                         } catch (Exception e) {
                             log.error("限改送达回证", e);
                             String detail = null;
@@ -776,7 +799,8 @@ public class PDFServiceImpl implements IPDFService {
                         // 生成盖章pdf
                         SignatureEntity entity = signatureInfo(false, jobDTO.getEnforceOrgId());
                         try {
-                            String certificateNowFileId = certificateSign(map, id, entity, fileName, fireDir, SignType.IMMEDIATE_CORRECTION_DELIVERY_RECEIPT);
+                            String certificateNowFileId = certificateSign(map, id, entity, fileName, fireDir,
+                                    SignType.IMMEDIATE_CORRECTION_DELIVERY_RECEIPT, companyNameMap);
                             EnforceJobDTO newLimitJob = new EnforceJobDTO();
                             newLimitJob.setId(id);
                             newLimitJob.setCertificateNowFileId(Long.parseLong(certificateNowFileId));
@@ -806,20 +830,22 @@ public class PDFServiceImpl implements IPDFService {
         String templateType = TemplateTypeEnum.getMap().get(type);
         Map<String, Object> resultMap = null;
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
+        Map<String, String> companyNameMap = new HashMap<>();
         if (TemplateTypeEnum.CHECKTABLES.getType().equals(type)) {
             EnforceJob jobDTO = enforceJobService.getById(jobId);
 
             String fileName = "简表记录表-" + jobDTO.getId() + ".pdf";
-            resultMap = createCheckPDF(templateType, jobDTO, fileName, fireDir);
+            resultMap = createCheckPDF(templateType, jobDTO, fileName, fireDir, companyNameMap);
         } else if (TemplateTypeEnum.NUMEROUSTABLE.getType().equals(type)) {
             EnforceJobDTO jobDTO = enforceJobService.get(jobId);
             String fileName = "繁表记录表-" + jobId + ".pdf";
-            resultMap = createNumerousPDF(templateType, jobDTO, fileName, fireDir);
+            resultMap = createNumerousPDF(templateType, jobDTO, fileName, fireDir, companyNameMap);
         } else if (TemplateTypeEnum.CERTIFICATENOW.getType().equals(type)) {
             EnforceJobDTO jobDTO = enforceJobService.get(jobId);
             String fileName = "立改送达回证-" + jobDTO.getId() + ".pdf";
             EnforceJobCertificateDTO certificateEntity = efcJobCertificateService.selectOne(jobId, "IMMEDIATELY");
-            Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
+            Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir,
+                    certificateEntity, companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) certificateMap.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -832,7 +858,8 @@ public class PDFServiceImpl implements IPDFService {
             EnforceJobDTO jobDTO = enforceJobService.get(jobId);
             String fileName = "限改送达回证-" + jobDTO.getId() + ".pdf";
             EnforceJobCertificateDTO certificateEntity = efcJobCertificateService.selectOne(jobId, "DEADLINE");
-            Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir, certificateEntity);
+            Map<String, Object> certificateMap = createCertificatePdf(templateType, jobDTO, fileName, fireDir,
+                    certificateEntity, companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) certificateMap.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -899,7 +926,7 @@ public class PDFServiceImpl implements IPDFService {
     }
 
 
-    private Map<String, Object> modelCheckTemplate(String templateType, Long jobId) {
+    private Map<String, Object> modelCheckTemplate(String templateType, Long jobId, Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ojobDTO = enforceJobService.find(jobId);
         if (!ojobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -908,13 +935,14 @@ public class PDFServiceImpl implements IPDFService {
         redisUtil.setCacheObject(GlobalConstant.COMPLEX_FILE_ID + jobId, 99999, 120L, TimeUnit.SECONDS);
         String fileName = "简表记录表-" + jobDTO.getId() + ".pdf";
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
-        Map<String, Object> map = createCheckPDF(templateType, jobDTO, fileName, fireDir);
+        Map<String, Object> map = createCheckPDF(templateType, jobDTO, fileName, fireDir, companyNameMap);
         ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
         fileRepository.save(sysFileDto);
         return map;
     }
 
-    private Map<String, Object> modelLimitTemplate(String templateType, Long jobId) {
+    private Map<String, Object> modelLimitTemplate(String templateType, Long jobId,
+                                                   Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ojobDTO = enforceJobService.find(jobId);
         if (!ojobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -926,14 +954,15 @@ public class PDFServiceImpl implements IPDFService {
             redisUtil.setCacheObject(GlobalConstant.DEADLINE_FILE_ID + jobId, jobDTO.getDeadlineFileId(), 120L, TimeUnit.SECONDS);
         String fileName = "责令期限改正通知书-" + jobId + ".pdf";
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
-        Map<String, Object> map = createLimitPdf(templateType, jobDTO, fileName, fireDir);
+        Map<String, Object> map = createLimitPdf(templateType, jobDTO, fileName, fireDir, companyNameMap);
 
         ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
         fileRepository.save(sysFileDto);
         return map;
     }
 
-    private void newCheckTemplate(String templateType, Long jobId, NewSigntureEntity entity) {
+    private void newCheckTemplate(String templateType, Long jobId, NewSigntureEntity entity,
+                                  Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ojobDTO = enforceJobService.find(jobId);
         if (!ojobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -943,7 +972,7 @@ public class PDFServiceImpl implements IPDFService {
         new Thread(() -> {
             String fileName = "简表记录表-" + jobDTO.getId() + ".pdf";
             String fireDir = uploadDir + PDFUtils.datePath() + "/";
-            Map<String, Object> map = createCheckPDF(templateType, jobDTO, fileName, fireDir);
+            Map<String, Object> map = createCheckPDF(templateType, jobDTO, fileName, fireDir, companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -964,7 +993,8 @@ public class PDFServiceImpl implements IPDFService {
             newJobDto.setId(jobId);
             try {
 //                storageName = newGetSignature(fireDir, fileName, file, entity);
-                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.SUMMARY_TABLE,appConfig);
+                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.SUMMARY_TABLE,
+                        appConfig, companyNameMap.get(COMPANY_NAME));
             } catch (Exception e) {
                 log.error("电子签章失败", e);
                 // 电子签章失败则保存未签章pdf
@@ -987,7 +1017,8 @@ public class PDFServiceImpl implements IPDFService {
         }).start();
     }
 
-    private void checkTemplate(String templateType, Long jobId, SignatureEntity entity) {
+    private void checkTemplate(String templateType, Long jobId, SignatureEntity entity,
+                               Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ojobDTO = enforceJobService.find(jobId);
         if (!ojobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -997,7 +1028,8 @@ public class PDFServiceImpl implements IPDFService {
         new Thread(() -> {
             String fileName = "简表记录表-" + jobDTO.getId() + ".pdf";
             String fireDir = uploadDir + PDFUtils.datePath() + "/";
-            Map<String, Object> map = createCheckPDF(templateType, jobDTO, fileName, fireDir);
+            Map<String, Object> map = createCheckPDF(templateType, jobDTO, fileName, fireDir,
+                    companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -1018,7 +1050,8 @@ public class PDFServiceImpl implements IPDFService {
             newJobDto.setId(jobId);
             try {
 //                storageName = getSignature(fireDir, fileName, file, entity);
-                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.SUMMARY_TABLE,String.valueOf(jobId),appConfig);
+                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.SUMMARY_TABLE,
+                        String.valueOf(jobId), appConfig, companyNameMap.get(COMPANY_NAME));
             } catch (Exception e) {
                 log.error("电子签章失败", e);
                 // 电子签章失败则保存未签章pdf
@@ -1041,7 +1074,8 @@ public class PDFServiceImpl implements IPDFService {
         }).start();
     }
 
-    private void newLimitTemplate(String templateType, Long jobId, NewSigntureEntity entity) {
+    private void newLimitTemplate(String templateType, Long jobId, NewSigntureEntity entity,
+                                  Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ojobDTO = enforceJobService.find(jobId);
         if (!ojobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -1052,11 +1086,12 @@ public class PDFServiceImpl implements IPDFService {
         if (StringUtils.isNotBlank(jobDTO.getDeadlineFileId()))
             redisUtil.setCacheObject(GlobalConstant.DEADLINE_FILE_ID + jobId, jobDTO.getDeadlineFileId(), 120L, TimeUnit.SECONDS);
         new Thread(() -> {
-            newLimitTablePDF(jobDTO, templateType, jobId, entity);
+            newLimitTablePDF(jobDTO, templateType, jobId, entity, companyNameMap);
         }).start();
     }
 
-    private void limitTemplate(String templateType, Long jobId, SignatureEntity entity) {
+    private void limitTemplate(String templateType, Long jobId, SignatureEntity entity,
+                               Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ojobDTO = enforceJobService.find(jobId);
         if (!ojobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -1067,32 +1102,33 @@ public class PDFServiceImpl implements IPDFService {
         if (StringUtils.isNotBlank(jobDTO.getDeadlineFileId()))
             redisUtil.setCacheObject(GlobalConstant.DEADLINE_FILE_ID + jobId, jobDTO.getDeadlineFileId(), 120L, TimeUnit.SECONDS);
         new Thread(() -> {
-            limitTablePDF(jobDTO, templateType, jobId, entity);
+            limitTablePDF(jobDTO, templateType, jobId, entity, companyNameMap);
         }).start();
     }
 
 
-    private  Map<String, Object> modelNumsTemplate(String templateType, Long jobId) {
+    private  Map<String, Object> modelNumsTemplate(String templateType, Long jobId, Map<String, String> companyNameMap) {
         EnforceJobDTO jobDTO = enforceJobService.get(jobId);
         // 查询时校验是否生成新的pdf。
         redisUtil.setCacheObject(GlobalConstant.COMPLEX_FILE_ID + jobId, 99999, 120L, TimeUnit.SECONDS);
         String fileName = "繁表记录表-" + jobId + ".pdf";
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
-        Map<String, Object> map = createNumerousPDF(templateType, jobDTO, fileName, fireDir);
+        Map<String, Object> map = createNumerousPDF(templateType, jobDTO, fileName, fireDir, companyNameMap);
         ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
         fileRepository.save(sysFileDto);
         return map;
     }
 
 
-    private void newNumsTemplate(String templateType, Long jobId, NewSigntureEntity entity) {
+    private void newNumsTemplate(String templateType, Long jobId, NewSigntureEntity entity,
+                                 Map<String, String> companyNameMap) {
         EnforceJobDTO jobDTO = enforceJobService.get(jobId);
         // 查询时校验是否生成新的pdf。
         redisUtil.setCacheObject(GlobalConstant.COMPLEX_FILE_ID + jobId, 99999, 120L, TimeUnit.SECONDS);
         new Thread(() -> {
             String fileName = "繁表记录表-" + jobId + ".pdf";
             String fireDir = uploadDir + PDFUtils.datePath() + "/";
-            Map<String, Object> map = createNumerousPDF(templateType, jobDTO, fileName, fireDir);
+            Map<String, Object> map = createNumerousPDF(templateType, jobDTO, fileName, fireDir, companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -1116,7 +1152,8 @@ public class PDFServiceImpl implements IPDFService {
             newJobDto.setId(jobId);
             try {
 //                storageName = newGetSignature(fireDir, fileName, file, entity);
-                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.COMPLEX_TABLE,appConfig);
+                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.COMPLEX_TABLE,
+                        appConfig, companyNameMap.get(COMPANY_NAME));
             } catch (Exception e) {
                 log.error("电子签章失败", e);
                 // 电子签章失败则保存未签章pdf
@@ -1139,14 +1176,16 @@ public class PDFServiceImpl implements IPDFService {
     }
 
 
-    private void numsTemplate(String templateType, Long jobId, SignatureEntity entity) {
+    private void numsTemplate(String templateType, Long jobId, SignatureEntity entity,
+                              Map<String, String> companyNameMap) {
         EnforceJobDTO jobDTO = enforceJobService.get(jobId);
         // 查询时校验是否生成新的pdf。
         redisUtil.setCacheObject(GlobalConstant.COMPLEX_FILE_ID + jobId, 99999, 120L, TimeUnit.SECONDS);
         new Thread(() -> {
             String fileName = "繁表记录表-" + jobId + ".pdf";
             String fireDir = uploadDir + PDFUtils.datePath() + "/";
-            Map<String, Object> map = createNumerousPDF(templateType, jobDTO, fileName, fireDir);
+            Map<String, Object> map = createNumerousPDF(templateType, jobDTO, fileName, fireDir,
+                    companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
             sysFileDto.setId(null); // ID 设置为空
             fileRepository.save(sysFileDto);
@@ -1171,7 +1210,8 @@ public class PDFServiceImpl implements IPDFService {
             newJobDto.setId(jobId);
             try {
 //                storageName = getSignature(fireDir, fileName, file, entity);
-                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.COMPLEX_TABLE,String.valueOf(jobId),appConfig);
+                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.COMPLEX_TABLE,
+                        String.valueOf(jobId), appConfig, companyNameMap.get(COMPANY_NAME));
             } catch (Exception e) {
                 log.error("电子签章失败", e);
                 // 电子签章失败则保存未签章pdf
@@ -1772,7 +1812,8 @@ public class PDFServiceImpl implements IPDFService {
         }
     }
 
-    public Map<String, Object> modelImmediately(String type, Long id) {
+    public Map<String, Object> modelImmediately(String type, Long id,
+                                                Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ejobDTO = enforceJobService.find(id);
         if (!ejobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -1783,14 +1824,15 @@ public class PDFServiceImpl implements IPDFService {
         enforceJobService.updateByNew(jobDTO);
         String fileName = "责令立即改正通知书-" + id + ".pdf";
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
-        Map<String, Object> pdfMap = createNowPdf(type, jobDTO, fileName, fireDir);
+        Map<String, Object> pdfMap = createNowPdf(type, jobDTO, fileName, fireDir, companyNameMap);
         ManageSysFile sysFileDto = (ManageSysFile) pdfMap.get("sysFileDto");
         fileRepository.save(sysFileDto);
         return pdfMap;
     }
 
 
-    public void newImmediately(String type, Long id, NewSigntureEntity entity) {
+    public void newImmediately(String type, Long id, NewSigntureEntity entity,
+                               Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ejobDTO = enforceJobService.find(id);
         if (!ejobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -1802,7 +1844,7 @@ public class PDFServiceImpl implements IPDFService {
         new Thread(() -> {
             String fileName = "责令立即改正通知书-" + id + ".pdf";
             String fireDir = uploadDir + PDFUtils.datePath() + "/";
-            Map<String, Object> pdfMap = createNowPdf(type, jobDTO, fileName, fireDir);
+            Map<String, Object> pdfMap = createNowPdf(type, jobDTO, fileName, fireDir, companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) pdfMap.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -1843,7 +1885,8 @@ public class PDFServiceImpl implements IPDFService {
             newJobTto.setId(id);
             try {
 //                storageName = newGetSignature(fireDir, fileName, file, entity);
-                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.IMMEDIATE_CORRECTION_NOTICE,appConfig);
+                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.IMMEDIATE_CORRECTION_NOTICE,
+                        appConfig, companyNameMap.get(COMPANY_NAME));
                 ManageSysFileDTO fileDTO = new ManageSysFileDTO();
                 fileDTO.setFileName(fileName);
                 fileDTO.setPath(fireDir);
@@ -1903,7 +1946,8 @@ public class PDFServiceImpl implements IPDFService {
     /**
      * 立改  暂时放在这里,后期可以放到一个合适的位置
      */
-    public void immediately(String type, Long id, SignatureEntity entity) {
+    public void immediately(String type, Long id, SignatureEntity entity,
+                            Map<String, String> companyNameMap) {
         Optional<EnforceJobDTO> ejobDTO = enforceJobService.find(id);
         if (!ejobDTO.isPresent()) {
             throw new ServiceException("任务不存在!", 404);
@@ -1915,7 +1959,8 @@ public class PDFServiceImpl implements IPDFService {
         new Thread(() -> {
             String fileName = "责令立即改正通知书-" + id + ".pdf";
             String fireDir = uploadDir + PDFUtils.datePath() + "/";
-            Map<String, Object> pdfMap = createNowPdf(type, jobDTO, fileName, fireDir);
+            Map<String, Object> pdfMap = createNowPdf(type, jobDTO, fileName, fireDir,
+                    companyNameMap);
             ManageSysFile sysFileDto = (ManageSysFile) pdfMap.get("sysFileDto");
             fileRepository.save(sysFileDto);
             // 检查记录文件id
@@ -1953,7 +1998,8 @@ public class PDFServiceImpl implements IPDFService {
             newJobTto.setId(id);
             try {
 //                storageName = getSignature(fireDir, fileName, file, entity);
-                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.IMMEDIATE_CORRECTION_NOTICE,String.valueOf(id),appConfig);
+                storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.IMMEDIATE_CORRECTION_NOTICE,
+                        String.valueOf(id), appConfig, companyNameMap.get(COMPANY_NAME));
                 ManageSysFileDTO fileDTO = new ManageSysFileDTO();
                 fileDTO.setFileName(fileName);
                 fileDTO.setPath(fireDir);
@@ -2206,10 +2252,11 @@ public class PDFServiceImpl implements IPDFService {
         return storageName;
     }
 
-    private void newLimitTablePDF(EnforceJob jobDTO, String templateType, Long jobId, NewSigntureEntity entity) {
+    private void newLimitTablePDF(EnforceJob jobDTO, String templateType, Long jobId, NewSigntureEntity entity,
+                                  Map<String, String> companyNameMap) {
         String fileName = "责令期限改正通知书-" + jobId + ".pdf";
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
-        Map<String, Object> map = createLimitPdf(templateType, jobDTO, fileName, fireDir);
+        Map<String, Object> map = createLimitPdf(templateType, jobDTO, fileName, fireDir, companyNameMap);
 
         ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
         fileRepository.save(sysFileDto);
@@ -2251,7 +2298,8 @@ public class PDFServiceImpl implements IPDFService {
 
         try {
 //            storageName = newGetSignature(fireDir, fileName, file, entity);
-            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.DEADLINE_CORRECTION_NOTICE,appConfig);
+            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity, SignType.DEADLINE_CORRECTION_NOTICE,
+                    appConfig, companyNameMap.get(COMPANY_NAME));
             ManageSysFileDTO fileDTO = new ManageSysFileDTO();
             fileDTO.setFileName(fileName);
             fileDTO.setPath(fireDir);
@@ -2283,10 +2331,12 @@ public class PDFServiceImpl implements IPDFService {
         }
     }
 
-    private void limitTablePDF(EnforceJob jobDTO, String templateType, Long jobId, SignatureEntity entity) {
+    private void limitTablePDF(EnforceJob jobDTO, String templateType, Long jobId,
+                               SignatureEntity entity, Map<String, String> companyNameMap) {
         String fileName = "责令期限改正通知书-" + jobId + ".pdf";
         String fireDir = uploadDir + PDFUtils.datePath() + "/";
-        Map<String, Object> map = createLimitPdf(templateType, jobDTO, fileName, fireDir);
+        Map<String, Object> map = createLimitPdf(templateType, jobDTO, fileName,
+                fireDir, companyNameMap);
 
         ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
         fileRepository.save(sysFileDto);
@@ -2327,7 +2377,9 @@ public class PDFServiceImpl implements IPDFService {
 
         try {
 //            storageName = getSignature(fireDir, fileName, file, entity);
-            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,SignType.DEADLINE_CORRECTION_NOTICE,String.valueOf(jobId),appConfig);
+            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file,
+                    entity,SignType.DEADLINE_CORRECTION_NOTICE,String.valueOf(jobId),
+                    appConfig, companyNameMap.get(COMPANY_NAME));
             ManageSysFileDTO fileDTO = new ManageSysFileDTO();
             fileDTO.setFileName(fileName);
             fileDTO.setPath(fireDir);
@@ -2466,7 +2518,9 @@ public class PDFServiceImpl implements IPDFService {
         initData(type, jobId);
     }
 
-    private Map<String, Object> createCheckPDF(String templateType, EnforceJob jobDTO, String fileName, String fireDir) {
+    private Map<String, Object> createCheckPDF(
+            String templateType, EnforceJob jobDTO, String fileName,
+            String fireDir, Map<String, String> companyNameMap) {
         CheckTableTemplate checkTableTemplate = new CheckTableTemplate();
         String enforceOrgName = jobDTO.getEnforceOrgName();
         String orgName = enforceOrgName.replaceAll("重庆市", "");
@@ -2498,6 +2552,7 @@ public class PDFServiceImpl implements IPDFService {
                 checkTableTemplate.setPhone(enforceObj.getString("contactPhone"));
             }
         }
+        companyNameMap.put(COMPANY_NAME, checkTableTemplate.getCompany());
 
         Calendar cal = Calendar.getInstance();
         Date recordTime = jobDTO.getRecordTime();
@@ -2534,7 +2589,9 @@ public class PDFServiceImpl implements IPDFService {
         return map;
     }
 
-    private Map<String, Object> createLimitPdf(String templateType, EnforceJob jobDTO, String fileName, String fireDir) {
+    private Map<String, Object> createLimitPdf(
+            String templateType, EnforceJob jobDTO, String fileName,
+            String fireDir, Map<String, String> companyNameMap) {
         LimitTableTemplate tableTemplate = new LimitTableTemplate();
         String enforceOrgName = jobDTO.getEnforceOrgName();
         String orgName = enforceOrgName.replaceAll("重庆市", "");
@@ -2676,11 +2733,14 @@ public class PDFServiceImpl implements IPDFService {
                 }
             }
         }
+        companyNameMap.put(COMPANY_NAME, tableTemplate.getCompany());
         Map<String, Object> map = PDFUtils.process(fireDir, fileName, templateType, tableTemplate);
         return map;
     }
 
-    private Map<String, Object> createNumerousPDF(String templateType, EnforceJobDTO jobDTO, String fileName, String fireDir) {
+    private Map<String, Object> createNumerousPDF(
+            String templateType, EnforceJobDTO jobDTO, String fileName,
+            String fireDir, Map<String, String> companyNameMap) {
         NumerousTableTemplate template = new NumerousTableTemplate("init");
         String enforceOrgName = jobDTO.getEnforceOrgName();
         String orgName = enforceOrgName.replaceAll("重庆市", "");
@@ -2815,11 +2875,14 @@ public class PDFServiceImpl implements IPDFService {
                 }
             });
         }
+        companyNameMap.put(COMPANY_NAME, template.getCompany());
         Map<String, Object> map = PDFUtils.process(fireDir, fileName, templateType, template);
         return map;
     }
 
-    private Map<String, Object> createNowPdf(String templateType, EnforceJob jobDTO, String fileName, String fireDir) {
+    private Map<String, Object> createNowPdf(
+            String templateType, EnforceJob jobDTO, String fileName,
+            String fireDir, Map<String, String> companyNameMap) {
         String staticNoticeResult = jobDTO.getStaticNoticeResult();
         cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(staticNoticeResult);
         String immediately = getJson("immediately", jsonObject);
@@ -3103,6 +3166,7 @@ public class PDFServiceImpl implements IPDFService {
             map.put("checkbox11", "");
             map.put("checkbox12", "");
         }
+        companyNameMap.put(COMPANY_NAME, map.get("company"));
 
         Map<String, Object> pdfMap = PDFUtils.process(fireDir, fileName, templateType, map);
         return pdfMap;
@@ -3118,7 +3182,9 @@ public class PDFServiceImpl implements IPDFService {
      * @param certificateEntity
      * @return
      */
-    private Map<String, Object> createCertificatePdf(String templateType, EnforceJobDTO jobDTO, String fileName, String fireDir, EnforceJobCertificate certificateEntity) {
+    private Map<String, Object> createCertificatePdf(
+            String templateType, EnforceJobDTO jobDTO, String fileName, String fireDir,
+            EnforceJobCertificate certificateEntity, Map<String, String> companyNameMap) {
         CertificateTableTemplate certificate = new CertificateTableTemplate();
         String enforceOrgName = jobDTO.getEnforceOrgName();
         String orgName = enforceOrgName.replaceAll("重庆市", "");
@@ -3209,6 +3275,7 @@ public class PDFServiceImpl implements IPDFService {
             certificate.setDay1(calendar.get(Calendar.DAY_OF_MONTH));
         }
         certificate.setRemake(certificateEntity.getRemark());
+        companyNameMap.put(COMPANY_NAME, certificate.getCompany());
 
         Map<String, Object> map = PDFUtils.process(fireDir, fileName, templateType, certificate);
         return map;
@@ -3257,7 +3324,8 @@ public class PDFServiceImpl implements IPDFService {
     /**
      * 送达回证pdf获取电子签章
      */
-    private String certificateSign(Map<String, Object> map, Long jobId, SignatureEntity entity, String fileName, String fireDir, SignType signType) {
+    private String certificateSign(Map<String, Object> map, Long jobId, SignatureEntity entity, String fileName, String fireDir,
+                                   SignType signType, Map<String, String> companyNameMap) {
         File file = (File) map.get("file");
         List<SignatureEntity.SignatoriesList> signatoriesList = entity.getSignatoriesList();
         if (CollectionUtils.isNotEmpty(signatoriesList)) {
@@ -3272,7 +3340,8 @@ public class PDFServiceImpl implements IPDFService {
         newJobDto.setId(jobId);
         try {
 //            storageName = getSignature(fireDir, fileName, file, entity);
-            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,signType,String.valueOf(jobId),appConfig);
+            storageName = SealSignUtils.sealSignAndDownLoad(fireDir, fileName, file, entity,
+                    signType,String.valueOf(jobId), appConfig, companyNameMap.get(COMPANY_NAME));
         } catch (Exception e) {
             ManageSysFile sysFileDto = (ManageSysFile) map.get("sysFileDto");
             fileRepository.save(sysFileDto);

+ 8 - 4
zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/utils/seal/SealSignUtils.java

@@ -30,14 +30,15 @@ import java.util.Objects;
 @Slf4j
 public class SealSignUtils {
 
-    public static String sealSignAndDownLoad(String uploadDir, String fileName, File file, NewSigntureEntity signatureEntity, SignType signType,AppConfig appConfig) {
+    public static String sealSignAndDownLoad(String uploadDir, String fileName, File file, NewSigntureEntity signatureEntity,
+                                             SignType signType,AppConfig appConfig, String companyName) {
         log.info("开始签章");
         String storageName = UUID.fastUUID().toString().replace("-", "");
         String downLoadPath=uploadDir +storageName ;
         SignContentReq req=initData(file,fileName);
         fillReqData(req,signatureEntity);
         req.setSignType(signType.getCode());
-        req.setTaskName("");
+        req.setTaskName(companyName);
         sealSignAndDownLoad(appConfig,req,downLoadPath);
         return storageName;
     }
@@ -97,13 +98,16 @@ public class SealSignUtils {
          return contentReq;
     }
 
-    public static String sealSignAndDownLoad(String uploadDir, String fileName, File file, SignatureEntity signatureEntity, SignType signType,String thirdBizId,AppConfig appConfig) {
+    public static String sealSignAndDownLoad(
+            String uploadDir, String fileName, File file,
+            SignatureEntity signatureEntity, SignType signType,String thirdBizId,
+            AppConfig appConfig, String companyName) {
         String storageName = UUID.fastUUID().toString().replace("-", "");
         String downLoadPath=uploadDir +storageName ;
         SignContentReq req=initData(file,fileName);
         fillReqData(req,signatureEntity);
         req.setSignType(signType.getCode());
-        req.setTaskName("");
+        req.setTaskName(companyName);
         req.setBizId(thirdBizId);
         sealSignAndDownLoad(appConfig,req,downLoadPath);
         return storageName;