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 127853d68..03a7c2498 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 @@ -193,4 +193,10 @@ public class LawsMonthlyReportWriteEO implements Serializable { @TableField(exist = false) private String ids; + //新添字段 + private String relatedAreasCn;//相关领域中文 + private String relatedAreasEn;//相关领域英文 + private String source;//来源 + private String time;//日期 + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java index 7fb5ff88c..6430bfce0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java @@ -9,7 +9,8 @@ package com.jero.modules.report.enums; public enum ContentTemplateEnum { DEFAULT_TEMPLATE("默认模板","1"), NEW_REQUEST_LIST_TEMPLATE("新征求意见清单模板","2"), - NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"); + NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"), + INDUSTRY_INFORMATION_TRENDS("行业资讯动态","4"); 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 17fc90742..6b2ef20e5 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 @@ -29,5 +29,9 @@ + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index f0dd7cfef..64d918af5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -791,8 +791,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl userList, String lawsContact) { if(com.jero.modules.system.util.StringUtils.isNotBlank(lawsContact)){