diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 1290b8041..561ad9290 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -174,4 +174,5 @@ CREATE TABLE `laws_weilai`.`head_custom` ( `module_flag` varchar(255) NULL COMMENT '模块标识', `sort` varchar(255) NULL COMMENT '排序', `field` varchar(255) NULL COMMENT '对应列表接口字段名', + `affirm_flag` varchar(36) NULL COMMENT '确认标识', PRIMARY KEY (`id`)); 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 a8fbab6bf..e0bc49fa3 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 @@ -97,6 +97,11 @@ public class HeadCustomEO implements Comparable { @ApiModelProperty(value = "标题顺序") private String sort; + /**确认标识*/ + @Excel(name = "确认标识", width = 15) + @ApiModelProperty(value = "确认标识") + private java.lang.String affirmFlag; + @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/AffirmFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java new file mode 100644 index 000000000..c7f391a04 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java @@ -0,0 +1,48 @@ +package com.jero.modules.head.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum AffirmFlagEnum { + DESIGN_FLAG("设计符合性确认","Design Compliance Check","1"), + AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"), + VERIFY_FLAG("验证符合性确认","Validation Compliance Check","3"); + + + + String name; + String nameEn; + String value; + + private AffirmFlagEnum(String name,String nameEn, String value) { + this.name = name; + this.nameEn = nameEn; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } +} 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 f980982ee..cfb039ea2 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.mapper.HeadCustomEOMapper; import com.jero.modules.head.service.IHeadCustomEOService; import com.jero.modules.head.vo.HeadCustomVO; @@ -38,7 +39,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl headCustomEOList) { if(ObjectUtils.isNotEmpty(headCustomEOList)){ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -47,8 +48,52 @@ public class HeadCustomEOServiceImpl extends ServiceImpl oneList = headCustomEOList.stream().filter(e -> StringUtils.isBlank(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(oneList); + //二级标题 + List twoList = headCustomEOList.stream().filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); + + //设计 + List design = twoList.stream().filter(e -> AffirmFlagEnum.DESIGN_FLAG.getValue().equals(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(design); + //pre + List affirm = twoList.stream().filter(e -> AffirmFlagEnum.AFFIRM_FLAG.getValue().equals(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(affirm); + //验证 + List verify = twoList.stream().filter(e -> AffirmFlagEnum.VERIFY_FLAG.getValue().equals(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(verify); + + if(ObjectUtils.isNotEmpty(design)){ + HeadCustomEO headCustomEO = new HeadCustomEO(); + headCustomEO.setHeadFieldCn(AffirmFlagEnum.DESIGN_FLAG.getName()); + headCustomEO.setHeadFieldEn(AffirmFlagEnum.DESIGN_FLAG.getNameEn()); + headCustomEO.setModuleFlag(design.get(0).getModuleFlag()); + headCustomEO.setSort(design.get(0).getSort()); + headCustomEO.setChildren(design); + oneList.add(headCustomEO); + } + if(ObjectUtils.isNotEmpty(affirm)){ + HeadCustomEO headCustomEO = new HeadCustomEO(); + headCustomEO.setHeadFieldCn(AffirmFlagEnum.AFFIRM_FLAG.getName()); + headCustomEO.setHeadFieldEn(AffirmFlagEnum.AFFIRM_FLAG.getNameEn()); + headCustomEO.setModuleFlag(affirm.get(0).getModuleFlag()); + headCustomEO.setSort(affirm.get(0).getSort()); + headCustomEO.setChildren(affirm); + oneList.add(headCustomEO); + } + if(ObjectUtils.isNotEmpty(verify)){ + HeadCustomEO headCustomEO = new HeadCustomEO(); + headCustomEO.setHeadFieldCn(AffirmFlagEnum.VERIFY_FLAG.getName()); + headCustomEO.setHeadFieldEn(AffirmFlagEnum.VERIFY_FLAG.getNameEn()); + headCustomEO.setModuleFlag(affirm.get(0).getModuleFlag()); + headCustomEO.setSort(affirm.get(0).getSort()); + headCustomEO.setChildren(verify); + oneList.add(headCustomEO); + } + List headCustomEOS = new ArrayList<>(); - for (HeadCustomEO headCustomEO : headCustomEOList) { + for (HeadCustomEO headCustomEO : oneList) { //一级标题 String id = UUID.randomUUID().toString().replace("-", ""); HeadCustomEO headCustomEOTemp = getHeadCustomEO(loginUser, headCustomEO, id); @@ -68,6 +113,36 @@ public class HeadCustomEOServiceImpl extends ServiceImpl headCustomEOList) { +// if(ObjectUtils.isNotEmpty(headCustomEOList)){ +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// //先删除再新增 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.in(HeadCustomEO::getCreateBy,loginUser.getUsername()).in(HeadCustomEO::getModuleFlag,headCustomEOList.get(0).getModuleFlag()); +// this.remove(wrapper); +// +// List headCustomEOS = new ArrayList<>(); +// for (HeadCustomEO headCustomEO : headCustomEOList) { +// //一级标题 +// String id = UUID.randomUUID().toString().replace("-", ""); +// HeadCustomEO headCustomEOTemp = getHeadCustomEO(loginUser, headCustomEO, id); +// headCustomEOS.add(headCustomEOTemp); +// //二级标题 +// if(ObjectUtils.isNotEmpty(headCustomEO.getChildren())){ +// for (HeadCustomEO child : headCustomEO.getChildren()) { +// String idTemp = UUID.randomUUID().toString().replace("-", ""); +// HeadCustomEO customEO = getHeadCustomEO(loginUser, child, idTemp); +// customEO.setParentId(id); +// headCustomEOS.add(customEO); +// } +// } +// } +// if(ObjectUtils.isNotEmpty(headCustomEOS)){ +// this.saveBatch(headCustomEOS); +// } +// } +// } @NotNull private HeadCustomEO getHeadCustomEO(LoginUser loginUser, HeadCustomEO headCustomEO, String id) { @@ -145,10 +220,10 @@ public class HeadCustomEOServiceImpl extends ServiceImpl oneList = list.stream() - .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + .filter(e -> StringUtils.isBlank(e.getAffirmFlag())).collect(Collectors.toList()); //列表表头二级 List twoList = list.stream() - .filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); + .filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); Collections.sort(oneList); for (HeadCustomEO headCustomEO : oneList) { HeadCustomVO headCustomVO = new HeadCustomVO();