|
@@ -283,10 +283,13 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
|
|
String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
|
|
if (JSONUtil.isJsonArray(gigTypeJson)) {
|
|
if (JSONUtil.isJsonArray(gigTypeJson)) {
|
|
JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
|
|
JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
|
|
|
|
+ List<GigTypeEnum> gigTypeEnumList = gigTypeArray.stream()
|
|
|
|
+ .map(o -> Enum.valueOf(GigTypeEnum.class, String.valueOf(o)))
|
|
|
|
+ .collect(Collectors.toList());
|
|
List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
- .in(SysUserSub::getGigType, gigTypeArray));
|
|
|
|
|
|
+ .in(SysUserSub::getGigType, gigTypeEnumList));
|
|
Map<String, Map<String, String>> dbResultMap = subList.stream()
|
|
Map<String, Map<String, String>> dbResultMap = subList.stream()
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
|
|
sysUserSub -> MapUtil.builder("certStatus",
|
|
sysUserSub -> MapUtil.builder("certStatus",
|
|
@@ -356,10 +359,13 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
|
|
String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
|
|
if (JSONUtil.isJsonArray(gigTypeJson)) {
|
|
if (JSONUtil.isJsonArray(gigTypeJson)) {
|
|
JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
|
|
JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
|
|
|
|
+ List<GigTypeEnum> gigTypeEnumList = gigTypeArray.stream()
|
|
|
|
+ .map(o -> Enum.valueOf(GigTypeEnum.class, String.valueOf(o)))
|
|
|
|
+ .collect(Collectors.toList());
|
|
List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
- .in(SysUserSub::getGigType, gigTypeArray));
|
|
|
|
|
|
+ .in(SysUserSub::getGigType, gigTypeEnumList));
|
|
Map<String, Map<String, String>> dbResultMap = subList.stream()
|
|
Map<String, Map<String, String>> dbResultMap = subList.stream()
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
|
|
sysUserSub -> MapUtil.builder("certStatus",
|
|
sysUserSub -> MapUtil.builder("certStatus",
|
|
@@ -428,10 +434,13 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
|
|
String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
|
|
if (JSONUtil.isJsonArray(gigTypeJson)) {
|
|
if (JSONUtil.isJsonArray(gigTypeJson)) {
|
|
JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
|
|
JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
|
|
|
|
+ List<GigTypeEnum> gigTypeEnumList = gigTypeArray.stream()
|
|
|
|
+ .map(o -> Enum.valueOf(GigTypeEnum.class, String.valueOf(o)))
|
|
|
|
+ .collect(Collectors.toList());
|
|
List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
- .in(SysUserSub::getGigType, gigTypeArray));
|
|
|
|
|
|
+ .in(SysUserSub::getGigType, gigTypeEnumList));
|
|
Map<String, Map<String, String>> dbResultMap = subList.stream()
|
|
Map<String, Map<String, String>> dbResultMap = subList.stream()
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
|
|
.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
|
|
sysUserSub -> MapUtil.builder("certStatus",
|
|
sysUserSub -> MapUtil.builder("certStatus",
|