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

认证-参数项收集-bug修改

Browse Source
This commit is contained in:
liyawei
2022-12-08 10:55:33 +08:00
parent 4013ba302f
commit 333a2d1a98
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+18 -12
View File
@@ -436,18 +436,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String controlType = collectManifestEO.getControlType(); String controlType = collectManifestEO.getControlType();
String paramsCollectManifestId = collectManifestEO.getId(); String paramsCollectManifestId = collectManifestEO.getId();
Map<String, Object> referencesColMap = new HashMap<>(); if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
String referencesCol = collectManifestEO.getReferencesCol(); Map<String, Object> referencesColMap = new HashMap<>();
if (StringUtils.isNotBlank(referencesCol)) { String referencesCol = collectManifestEO.getReferencesCol();
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据 if (StringUtils.isNotBlank(referencesCol)) {
referencesColMap.put("controlType", controlType); List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据
referencesColMap.put("list", referencesColVOList); referencesColMap.put("controlType", controlType);
manifestMap.put("referencesCol", referencesColMap); referencesColMap.put("list", referencesColVOList);
} else { manifestMap.put("referencesCol", referencesColMap);
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据 } else {
referencesColMap.put("controlType", controlType); List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
referencesColMap.put("list", referencesColVOList); referencesColMap.put("controlType", controlType);
manifestMap.put("referencesCol", referencesColMap); referencesColMap.put("list", referencesColVOList);
manifestMap.put("referencesCol", referencesColMap);
}
} }
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
@@ -1118,6 +1120,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String[] references = projectName.split("-"); String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名 map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
} else {
continue;
} }
} else { } else {
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1131,6 +1135,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String[] references = projectName.split("-"); String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名 map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
} else {
continue;
} }
} else { } else {
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@RequestParam(name="orderByField", required = false) String orderByField, @RequestParam(name="orderByField", required = false) String orderByField,
@RequestParam(name="orderBy", required = false) String orderBy, @RequestParam(name="orderBy", required = false) String orderBy,
@RequestParam(name="cut") String cut, @RequestParam(name="cut") String cut,
@RequestParam(name="allNumber") String allNumber, @RequestParam(name="allNumber", required = false) String allNumber,
HttpServletRequest req) { HttpServletRequest req) {
if (StringUtils.isNotEmpty(allNumber)) { if (StringUtils.isNotEmpty(allNumber)) {