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

法规月报填写---增加一级目录, 并按目录排序

Browse Source
This commit is contained in:
zhn
2022-09-25 13:37:52 +08:00
parent 03ef3a8800
commit 2a114f0149
3 changed files with 26 additions and 2 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
+10 -1
View File
@@ -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 = "内容模板")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+12 -1
View File
@@ -102,6 +102,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
*/
@Override
public void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
// lawsMonthlyReportWriteEO.setMemoriesChapterOne("2");
Date now = new Date();
lawsMonthlyReportWriteEO.setCreateTime(now);
lawsMonthlyReportWriteEO.setUpdateTime(now);
@@ -291,7 +292,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
Integer pageSize,
HttpServletRequest req) {
QueryWrapper<LawsMonthlyReportWriteEO> 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<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
@@ -354,6 +355,16 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
}
}
//处理章节目录对应的一级目录
if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapterOne())){
List<LawsMonthlyReportTitleTemplateEO> 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())){
//新征求意见清单模板