diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java index 4c5dd83..b8d882a 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java @@ -135,7 +135,7 @@ public class LetterService { contentText = contentText.replace("我自愿", "我[ "+employeeEntity.getActualName()+" ]自愿"); contentText = contentText.replace("申报年度", "申报"+year + "年度"); // 替换模板中的占位符 - 律师个人承诺书 - contentHtml = contentHtml.replace("承诺人(签字):              日期:  ", "承诺人(签字):" + employeeEntity.getActualName() + "       日期:" + letterEntity.getCreateTime().toLocalDate().toString()); + contentHtml = contentHtml.replace("承诺人(签字):              日期:  ", "承诺人(签字):" + employeeEntity.getActualName() + "    日期:" + letterEntity.getCreateTime().toLocalDate().toString()); contentText = contentText.replace("承诺人(签字): 日期: ", "承诺人(签字):" + employeeEntity.getActualName() + " 日期:" + letterEntity.getCreateTime().toLocalDate().toString()); noticeEntity.setContentHtml(contentHtml); @@ -149,15 +149,15 @@ public class LetterService { String year = String.valueOf(letterEntity.getCreateTime().getYear()); // 替换模板中的占位符 - 律师事务所承诺书 - contentHtml = contentHtml.replace("律师事务所", "[ "+departmentEntity.getDepartmentName()+" ]"); + contentHtml = contentHtml.replace("律师事务所自愿", "[ "+departmentEntity.getDepartmentName()+" ]自愿"); contentHtml = contentHtml.replace("年度", "[ "+year + " ]年度"); contentHtml = contentHtml.replace("主任(签字):", "主任(签字):" + employeeEntity.getActualName()); - contentHtml = contentHtml.replace("日期", " 日期:" + letterEntity.getCreateTime().toLocalDate().toString()); + contentHtml = contentHtml.replace("日期", "日期:" + letterEntity.getCreateTime().toLocalDate().toString()); - contentText = contentText.replace("律师事务所", "[ "+departmentEntity.getDepartmentName()+" ]"); + contentText = contentText.replace("律师事务所自愿", "[ "+departmentEntity.getDepartmentName()+" ]自愿"); contentText = contentText.replace("年度", "[ "+year + " ]年度"); contentText = contentText.replace("主任(签字):", "主任(签字):" + employeeEntity.getActualName()); - contentText = contentText.replace("日期", " 日期:" + letterEntity.getCreateTime().toLocalDate()); + contentText = contentText.replace("日期", "日期:" + letterEntity.getCreateTime().toLocalDate()); noticeEntity.setContentHtml(contentHtml); noticeEntity.setContentText(contentText); diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/word/WordCertificateService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/word/WordCertificateService.java index 1033471..9bb18ab 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/word/WordCertificateService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/word/WordCertificateService.java @@ -79,7 +79,7 @@ public class WordCertificateService { replaceTextPlaceholders(document, data); // 2. 插入电子章图片 - insertSealImage(document); + //insertSealImage(document); return document; } diff --git a/yun-admin/src/main/resources/templates/certificate_template.docx b/yun-admin/src/main/resources/templates/certificate_template.docx index da1eb20..79ced41 100644 Binary files a/yun-admin/src/main/resources/templates/certificate_template.docx and b/yun-admin/src/main/resources/templates/certificate_template.docx differ diff --git a/yun-admin/src/main/resources/templates/official_seal.png b/yun-admin/src/main/resources/templates/official_seal.png index c81d647..3c439c0 100644 Binary files a/yun-admin/src/main/resources/templates/official_seal.png and b/yun-admin/src/main/resources/templates/official_seal.png differ