diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 298ac28e4..9ffc6c5d9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1446,6 +1446,10 @@ public class ParamsCollectManifestEOServiceImpl 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 ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { map.put("click5", true); @@ -1532,6 +1540,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl operatorMap = new HashMap<>(); + operatorMap.put("headFieldCn","操作"); + operatorMap.put("headFieldEn","Operation"); + operatorMap.put("moduleFlag","参数项收集清单"); if (CutEnum.CN.getValue().equals(cut)) { operatorMap.put("db_field_txt", "操作"); } else { @@ -1541,6 +1552,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map : list) { + //排序字段赋值,用于自定义列表 + map.put("sortParams",String.valueOf(count++)); + } return list; } 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 1863e9935..4b3e811cf 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 @@ -1,6 +1,7 @@ package com.jero.modules.head.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.head.entity.HeadCustomEO; @@ -8,7 +9,6 @@ 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; -import net.sf.saxon.functions.ConstantFunction; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -17,14 +17,12 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.LinkedList; import java.util.List; -import java.util.Date; import java.util.UUID; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 自定义表头 * @Author: jero-boot