diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 03a7c2498..b76f1b294 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -196,7 +196,8 @@ public class LawsMonthlyReportWriteEO implements Serializable { //新添字段 private String relatedAreasCn;//相关领域中文 private String relatedAreasEn;//相关领域英文 - private String source;//来源 + private String sourceCn;//来源中文 + private String sourceEn;//来源英文 private String time;//日期 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml index 6b2ef20e5..699e217ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml @@ -31,7 +31,8 @@ - + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 6cb4f2bcf..6ecc9ce43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -519,7 +519,8 @@ public class WordUtil { String cut) { String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文 String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文 - String source = lawsMonthlyReportWriteEO.getSource();//来源 + String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源 + String sourceEn = lawsMonthlyReportWriteEO.getSourceEn(); String time = lawsMonthlyReportWriteEO.getTime();//日期 String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文 String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文 @@ -545,7 +546,7 @@ public class WordUtil { //第1行 setCell(table, 0, "相关领域",relatedAreasCn); //第2行 - setCell(table,1, "来源",source); + setCell(table,1, "来源",sourceCn); //第3行 setCell(table,2, "日期",time); //第4行 @@ -556,7 +557,7 @@ public class WordUtil { //第1行 setCell(table,0, "Related Areas",relatedAreasEn); //第2行 - setCell(table,1,"source",source); + setCell(table,1,"Source",sourceEn); //第3行 setCell(table,2,"Date",time); //第4行