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
2023-04-06 16:29:11 +08:00
parent aa29534221
commit 58e65b9f7c
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+2 -1
View File
@@ -485,4 +485,5 @@ ADD COLUMN `click2` varchar(255) NULL COMMENT '动态表头使用' AFTER `click1
ADD COLUMN `click3` varchar(255) NULL COMMENT '动态表头使用' AFTER `click2`, ADD COLUMN `click3` varchar(255) NULL COMMENT '动态表头使用' AFTER `click2`,
ADD COLUMN `click4` varchar(255) NULL COMMENT '动态表头使用' AFTER `click3`, ADD COLUMN `click4` varchar(255) NULL COMMENT '动态表头使用' AFTER `click3`,
ADD COLUMN `click5` varchar(255) NULL COMMENT '动态表头使用' AFTER `click4`, ADD COLUMN `click5` varchar(255) NULL COMMENT '动态表头使用' AFTER `click4`,
ADD COLUMN `click6` varchar(255) NULL COMMENT '动态表头使用' AFTER `click5`; ADD COLUMN `click6` varchar(255) NULL COMMENT '动态表头使用' AFTER `click5`,
ADD COLUMN `db_field_name` varchar(255) NULL COMMENT '动态表头使用' AFTER `click6`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
+3
View File
@@ -126,6 +126,9 @@ public class HeadCustomEO implements Comparable<HeadCustomEO> {
@ApiModelProperty(value = "动态表头使用") @ApiModelProperty(value = "动态表头使用")
private String click6; private String click6;
@ApiModelProperty(value = "动态表头使用")
private String dbFieldName;
@Override @Override
public int compareTo(HeadCustomEO o) { public int compareTo(HeadCustomEO o) {
return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序 return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+10 -4
View File
@@ -55,7 +55,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
&& !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(headCustomEOList.get(0).getModuleFlag())){ && !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(headCustomEOList.get(0).getModuleFlag())){
Collections.sort(oneList); Collections.sort(oneList);
}else{ }else{
oneList.sort(Comparator.comparing(HeadCustomEO::getSortParams)); Collections.sort(oneList,(a,b)->{
return Integer.valueOf(a.getSortParams()) - Integer.valueOf(b.getSortParams());
});
} }
//二级标题 //二级标题
List<HeadCustomEO> twoList = headCustomEOList.stream().filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); List<HeadCustomEO> twoList = headCustomEOList.stream().filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList());
@@ -171,6 +173,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
headCustomEOTemp.setClick4(headCustomEO.getClick4()); headCustomEOTemp.setClick4(headCustomEO.getClick4());
headCustomEOTemp.setClick5(headCustomEO.getClick5()); headCustomEOTemp.setClick5(headCustomEO.getClick5());
headCustomEOTemp.setClick6(headCustomEO.getClick6()); headCustomEOTemp.setClick6(headCustomEO.getClick6());
headCustomEOTemp.setDbFieldName(headCustomEO.getDbFieldName());
return headCustomEOTemp; return headCustomEOTemp;
} }
@@ -244,7 +247,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
&& !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(moduleFlag)){ && !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(moduleFlag)){
Collections.sort(oneList); Collections.sort(oneList);
}else{ }else{
oneList.sort(Comparator.comparing(HeadCustomEO::getSortParams)); Collections.sort(oneList,(a,b)->{
return Integer.valueOf(a.getSortParams()) - Integer.valueOf(b.getSortParams());
});
} }
for (HeadCustomEO headCustomEO : oneList) { for (HeadCustomEO headCustomEO : oneList) {
HeadCustomVO headCustomVO = new HeadCustomVO(); HeadCustomVO headCustomVO = new HeadCustomVO();
@@ -334,8 +339,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
@NotNull @NotNull
private HeadCustomVO getHeadCustomVO(String cut, HeadCustomEO headCustomEO, HeadCustomVO headCustomVO) { private HeadCustomVO getHeadCustomVO(String cut, HeadCustomEO headCustomEO, HeadCustomVO headCustomVO) {
headCustomVO.setDataIndex(headCustomEO.getField()); headCustomVO.setDataIndex(headCustomEO.getField());
headCustomVO.setDb_field_name(headCustomEO.getHeadFieldEn()); headCustomVO.setDb_field_name(headCustomEO.getDbFieldName());
headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldCn());
headCustomVO.setSortParams(headCustomEO.getSortParams()); headCustomVO.setSortParams(headCustomEO.getSortParams());
headCustomVO.setSort(headCustomEO.getSort()); headCustomVO.setSort(headCustomEO.getSort());
headCustomVO.setClick(headCustomEO.getClick()); headCustomVO.setClick(headCustomEO.getClick());
@@ -347,8 +351,10 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
headCustomVO.setClick6(headCustomEO.getClick6()); headCustomVO.setClick6(headCustomEO.getClick6());
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
headCustomVO.setTitle(headCustomEO.getHeadFieldCn()); headCustomVO.setTitle(headCustomEO.getHeadFieldCn());
headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldCn());
} else { } else {
headCustomVO.setTitle(headCustomEO.getHeadFieldEn()); headCustomVO.setTitle(headCustomEO.getHeadFieldEn());
headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldEn());
} }
//每个功能模块列表表头固定的列可能不相同，所以需要单独处理（后期变更的时候继续维护此处即可） //每个功能模块列表表头固定的列可能不相同，所以需要单独处理（后期变更的时候继续维护此处即可）
if ("法规清单".equals(headCustomEO.getModuleFlag())) { if ("法规清单".equals(headCustomEO.getModuleFlag())) {