Commit cfac6ed7 authored by suhuiguang's avatar suhuiguang

feat(综合搜索):字段调整

1.人员资质作业项目+资质项目,调整为逗号分割 2.企业+人员信息增加创建日期
parent 86092161
...@@ -1488,6 +1488,8 @@ public class DataHandlerServiceImpl { ...@@ -1488,6 +1488,8 @@ public class DataHandlerServiceImpl {
return permissions.stream().map(p -> { return permissions.stream().map(p -> {
EsUserInfo.License license = new EsUserInfo.License(); EsUserInfo.License license = new EsUserInfo.License();
BeanUtil.copyProperties(p, license); BeanUtil.copyProperties(p, license);
license.setPermissionItem(StatisticsDataUpdateService.castStrList2String(p.getPermissionItem()));
license.setJobItem(StatisticsDataUpdateService.castStrList2String(p.getJobItem()));
return license; return license;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
......
...@@ -50,10 +50,13 @@ public class StatisticsDataUpdateService { ...@@ -50,10 +50,13 @@ public class StatisticsDataUpdateService {
return String.join(",", posts); return String.join(",", posts);
} }
public static String castStrList2String(String postJsonStr){ public static String castStrList2String(String jsonTypesStr){
if(!isNullOrEmpty(postJsonStr)){ if(!isNullOrEmpty(jsonTypesStr)){
List<String> posts = JSON.parseArray(postJsonStr, String.class); if(isJSONValid(jsonTypesStr)){
return String.join(",", posts); List<String> posts = JSON.parseArray(jsonTypesStr, String.class);
return String.join(",", posts);
}
return jsonTypesStr;
} }
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment