WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
liyawei
2022-08-18 15:06:48 +08:00
parent a748a14e2a d479f580dd
commit 5b837b73c2
8 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+2 -1
View File
@@ -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;//日期
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
+2 -1
View File
@@ -31,7 +31,8 @@
<result column="export_state" property="exportState" />
<result column="related_areas_cn" property="relatedAreasCn" />
<result column="related_areas_en" property="relatedAreasEn" />
<result column="source" property="source" />
<result column="source_cn" property="sourceCn" />
<result column="source_en" property="sourceEn" />
<result column="time" property="time" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+4 -3
View File
@@ -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行