diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 14e6f0379..b5f3844fa 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -474,4 +474,15 @@ ALTER TABLE `auth_dummy_inventory_info` -- 项目库-法规清单，增加字段 流程最后结束的时间（导出合规性报告时使用） 2023-4-03 未同步生产环境 ALTER TABLE `project_laws_inventory` - ADD COLUMN `process_end_time` datetime NULL COMMENT '流程最后结束的时间' AFTER `stand_id`; \ No newline at end of file + ADD COLUMN `process_end_time` datetime NULL COMMENT '流程最后结束的时间' AFTER `stand_id`; + +-- 自定义表头中动态表头使用以下字段 2023-4-06 未同步生产环境 +ALTER TABLE `head_custom` +ADD COLUMN `sort_params` varchar(255) NULL COMMENT '排序--动态表头' AFTER `sort`, +ADD COLUMN `click` varchar(255) NULL COMMENT '动态表头使用' AFTER `affirm_flag`, +ADD COLUMN `click1` varchar(255) NULL COMMENT '动态表头使用' AFTER `click`, +ADD COLUMN `click2` varchar(255) NULL COMMENT '动态表头使用' AFTER `click1`, +ADD COLUMN `click3` varchar(255) NULL COMMENT '动态表头使用' AFTER `click2`, +ADD COLUMN `click4` varchar(255) NULL COMMENT '动态表头使用' AFTER `click3`, +ADD COLUMN `click5` varchar(255) NULL COMMENT '动态表头使用' AFTER `click4`, +ADD COLUMN `click6` varchar(255) NULL COMMENT '动态表头使用' AFTER `click5`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 2bef73cf0..e8abdfa82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -580,6 +580,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("headFieldCn",onlCgformField.getDbFieldTxt()); + map.put("headFieldEn",onlCgformField.getDbFieldEnName()); + map.put("moduleFlag","上报库详情"); + map.put("field",onlCgformField.getDbFieldName()); String dbFieldName = onlCgformField.getDbFieldName(); if ("description".equals(dbFieldName)) { indexOfDescription = i; @@ -651,6 +658,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("headFieldCn","操作"); + map.put("headFieldEn","Operation"); + map.put("moduleFlag","上报库详情"); if(CutEnum.CN.getValue().equals(cut)){ map.put("db_field_txt","操作"); }else{ @@ -663,7 +673,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl mapTmp : list) { + //排序字段赋值，用于自定义列表 + mapTmp.put("sortParams",String.valueOf(count++)); + } return list; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java index e0bc49fa3..5af44c0b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java @@ -102,6 +102,30 @@ public class HeadCustomEO implements Comparable { @ApiModelProperty(value = "确认标识") private java.lang.String affirmFlag; + @ApiModelProperty(value = "排序--动态表头") + private String sortParams; + + @ApiModelProperty(value = "动态表头使用") + private String click; + + @ApiModelProperty(value = "动态表头使用") + private String click1; + + @ApiModelProperty(value = "动态表头使用") + private String click2; + + @ApiModelProperty(value = "动态表头使用") + private String click3; + + @ApiModelProperty(value = "动态表头使用") + private String click4; + + @ApiModelProperty(value = "动态表头使用") + private String click5; + + @ApiModelProperty(value = "动态表头使用") + private String click6; + @Override public int compareTo(HeadCustomEO o) { return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/headCustomEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/headCustomEnum.java new file mode 100644 index 000000000..5276d445d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/headCustomEnum.java @@ -0,0 +1,28 @@ +package com.jero.modules.head.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum headCustomEnum { + VIRTUAL_LIST("虚拟清单"), + LAWS_LIST("法规清单"), + PARAMETER_COLLECTION_LIST("参数项收集清单"), + REPORT_DATABASE_DETAILS("上报库详情"); + + String name; + + private headCustomEnum(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 4b3e811cf..0d8c188a7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -6,6 +6,7 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.head.entity.HeadCustomEO; import com.jero.modules.head.enums.AffirmFlagEnum; +import com.jero.modules.head.enums.headCustomEnum; import com.jero.modules.head.mapper.HeadCustomEOMapper; import com.jero.modules.head.service.IHeadCustomEOService; import com.jero.modules.head.vo.HeadCustomVO; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -49,7 +51,12 @@ public class HeadCustomEOServiceImpl extends ServiceImpl oneList = headCustomEOList.stream().filter(e -> StringUtils.isBlank(e.getAffirmFlag())).collect(Collectors.toList()); - Collections.sort(oneList); + if(!headCustomEnum.PARAMETER_COLLECTION_LIST.getName().equals(headCustomEOList.get(0).getModuleFlag()) + && !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(headCustomEOList.get(0).getModuleFlag())){ + Collections.sort(oneList); + }else{ + oneList.sort(Comparator.comparing(HeadCustomEO::getSortParams)); + } //二级标题 List twoList = headCustomEOList.stream().filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); @@ -156,6 +163,14 @@ public class HeadCustomEOServiceImpl extends ServiceImpl twoList = list.stream() .filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); - Collections.sort(oneList); + if(!headCustomEnum.PARAMETER_COLLECTION_LIST.getName().equals(moduleFlag) + && !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(moduleFlag)){ + Collections.sort(oneList); + }else{ + oneList.sort(Comparator.comparing(HeadCustomEO::getSortParams)); + } for (HeadCustomEO headCustomEO : oneList) { HeadCustomVO headCustomVO = new HeadCustomVO(); if (ObjectUtils.isNotEmpty(twoList)) {