From 2a114f01498ace96ee678dc65ec2561096191288 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sun, 25 Sep 2022 13:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5=E5=A1=AB?= =?UTF-8?q?=E5=86=99---=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=BA=A7=E7=9B=AE?= =?UTF-8?q?=E5=BD=95,=20=E5=B9=B6=E6=8C=89=E7=9B=AE=E5=BD=95=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ .../report/entity/LawsMonthlyReportWriteEO.java | 11 ++++++++++- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 13 ++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6e71e6449..42b019d1b 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1159,3 +1159,7 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener -- 法规清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境 ALTER TABLE `laws_weilai`.`project_laws_inventory` MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`; + +-- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境 +ALTER TABLE `laws_weilai`.`laws_monthly_report_write` +ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`; 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 b76f1b294..2563e41b4 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 @@ -71,10 +71,19 @@ public class LawsMonthlyReportWriteEO implements Serializable { @ApiModelProperty(value = "章节目录") private java.lang.String memoriesChapter; - //章节目录名称 + //章节目录名称 @TableField(exist = false) private java.lang.String memoriesChapterName; + /**章节目录一级标题*/ + @ApiModelProperty(value = "章节目录一级标题") + private java.lang.String memoriesChapterOne; + + /**章节目录一级标题中文名称*/ + @ApiModelProperty(value = "章节目录一级标题中文名称") + @TableField(exist = false) + private java.lang.String memoriesChapterOneName; + /**内容模板*/ @Excel(name = "内容模板", width = 15) @ApiModelProperty(value = "内容模板") 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 f77804cc8..577b4050d 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 @@ -102,6 +102,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); //管理员查看全部数据,其余人只能查看自己的数据 LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); @@ -354,6 +355,16 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapterOne().equals(e.getId())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); + }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); + } + } if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ //新征求意见清单模板