guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

14473 三项数据库都有 没有企业类型的企业 创建的数据不正确

limingyu-20240401-app登录曹实业判断修改
liujun 2024-03-12 14:45:06 +08:00
parent ba48e647dc
commit dc441e5cef
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java
View File

@ -183,7 +183,7 @@ public class TextLibraryServiceImpl implements TextLibraryService {
PageData corp_condition = new PageData(); PageData corp_condition = new PageData();
corp_condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); corp_condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corp = corpInfoMapper.getInfo(corp_condition); PageData corp = corpInfoMapper.getInfo(corp_condition);
// 国民经济类型
List<PageData> specificationTypes = Warden.initSpecificationTypes(corp); List<PageData> specificationTypes = Warden.initSpecificationTypes(corp);
list.addAll(specificationTypes); list.addAll(specificationTypes);
List<PageData> labels = Warden.getList(condition.getString("labels")); List<PageData> labels = Warden.getList(condition.getString("labels"));

48
src/main/java/com/zcloud/util/Warden.java
View File

@ -331,29 +331,37 @@ public class Warden {
public static List<PageData> initSpecificationTypes(PageData corp) { public static List<PageData> initSpecificationTypes(PageData corp) {
List<PageData> list = new ArrayList<>(); List<PageData> list = new ArrayList<>();
PageData one = new PageData(); if (corp.get("CORP_TYPE_ONE_NAME") != null && StringUtils.isNotBlank(corp.getString("CORP_TYPE_ONE_NAME"))){
one.put("CATEGORY","SPECIFICATION_TYPES"); PageData one = new PageData();
one.put("CATEGORY_ID",corp.getString("CORP_TYPE")); one.put("CATEGORY","SPECIFICATION_TYPES");
one.put("CATEGORY_NAME",corp.getString("CORP_TYPE_ONE_NAME")); one.put("CATEGORY_ID",corp.getString("CORP_TYPE"));
list.add(one); one.put("CATEGORY_NAME",corp.getString("CORP_TYPE_ONE_NAME"));
list.add(one);
}
PageData two = new PageData(); if (corp.get("CORP_TYPE_TWO_NAME") != null && StringUtils.isNotBlank(corp.getString("CORP_TYPE_TWO_NAME"))) {
two.put("CATEGORY","SPECIFICATION_TYPES"); PageData two = new PageData();
two.put("CATEGORY_ID",corp.getString("CORP_TYPE2")); two.put("CATEGORY", "SPECIFICATION_TYPES");
two.put("CATEGORY_NAME",corp.getString("CORP_TYPE_TWO_NAME")); two.put("CATEGORY_ID", corp.getString("CORP_TYPE2"));
list.add(two); two.put("CATEGORY_NAME", corp.getString("CORP_TYPE_TWO_NAME"));
list.add(two);
}
PageData three = new PageData(); if (corp.get("CORP_TYPE_THREE_NAME") != null && StringUtils.isNotBlank(corp.getString("CORP_TYPE_THREE_NAME"))) {
three.put("CATEGORY","SPECIFICATION_TYPES"); PageData three = new PageData();
three.put("CATEGORY_ID",corp.getString("CORP_TYPE3")); three.put("CATEGORY", "SPECIFICATION_TYPES");
three.put("CATEGORY_NAME",corp.getString("CORP_TYPE_THREE_NAME")); three.put("CATEGORY_ID", corp.getString("CORP_TYPE3"));
list.add(three); three.put("CATEGORY_NAME", corp.getString("CORP_TYPE_THREE_NAME"));
list.add(three);
}
PageData four = new PageData(); if (corp.get("CORP_TYPE_FOUR_NAME") != null && StringUtils.isNotBlank(corp.getString("CORP_TYPE_FOUR_NAME"))) {
four.put("CATEGORY","SPECIFICATION_TYPES"); PageData four = new PageData();
four.put("CATEGORY_ID",corp.getString("CORP_TYPE4")); four.put("CATEGORY", "SPECIFICATION_TYPES");
four.put("CATEGORY_NAME",corp.getString("CORP_TYPE_FOUR_NAME")); four.put("CATEGORY_ID", corp.getString("CORP_TYPE4"));
list.add(four); four.put("CATEGORY_NAME", corp.getString("CORP_TYPE_FOUR_NAME"));
list.add(four);
}
return list; return list;
} }