c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

会员

Browse Source
This commit is contained in:
Paidax
2025-02-20 13:56:04 +08:00
parent 409ff2e0bb
commit bce946e651
189 changed files with 9732 additions and 4037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/impl/UserPartUpServiceImpl.java
+35 -32
View File
@@ -85,41 +85,44 @@ public class UserPartUpServiceImpl extends ViServiceImpl<UserPartUp> implements
@Aop(TransAop.READ_COMMITTED)
public void renewUserState() {
//在职状态
Sql userStateSql = Sqls.create("select userState from `user` where userState is not null and userState !='' group by userState");
List<String> userStates = sysDictService.listMap(userStateSql).stream().map(v -> v.getString("userState")).collect(Collectors.toList());
List<Sys_dict> userStateList = sysDictService.getSubListByCode("UserState");
//dict中的在职状态，在user表中没有,这一部分删除
List<Sys_dict> deleteUserState = userStateList.stream().filter(v -> !userStates.contains(v.getName())).collect(Collectors.toList());
List<String> deleteUserStateIds = deleteUserState.stream().map(Sys_dict::getId).collect(Collectors.toList());
if (Lang.isNotEmpty(deleteUserStateIds)) {
sysDictService.delete(deleteUserStateIds);
}
//获取删除dict后的在职状态
List<Sys_dict> deleteRenewUserStateList = sysDictService.getSubListByCode("UserState");
Sys_dict userState = deleteRenewUserStateList.stream().findFirst().orElse(null);
assert userState != null;
//获取在职状态名
List<String> dictNameList = deleteRenewUserStateList.stream().map(Sys_dict::getName).collect(Collectors.toList());
//如果user表中有在职状态, 删除userState后的dict表中没有,就需要新增
List<String> insertUserStateList = userStates.stream().filter(v -> !dictNameList.contains(v)).collect(Collectors.toList());
insertUserStateList = insertUserStateList.stream().distinct().collect(Collectors.toList());
if (Lang.isNotEmpty(insertUserStateList)) {
for (String item : insertUserStateList) {
Sys_dict dict = new Sys_dict();
dict.setCode(item);
dict.setName(item);
sysDictService.save(dict, userState.getParentId());
}
}
// Sql userStateSql = Sqls.create("select userState from `user` where userState is not null and userState !='' group by userState");
// List<String> userStates = sysDictService.listMap(userStateSql).stream().map(v -> v.getString("userState")).collect(Collectors.toList());
// List<Sys_dict> userStateList = sysDictService.getSubListByCode("UserState");
//
// //dict中的在职状态，在user表中没有,这一部分删除
// List<Sys_dict> deleteUserState = userStateList.stream().filter(v -> !userStates.contains(v.getName())).collect(Collectors.toList());
// List<String> deleteUserStateIds = deleteUserState.stream().map(Sys_dict::getId).collect(Collectors.toList());
//
// if (Lang.isNotEmpty(deleteUserStateIds)) {
// sysDictService.delete(deleteUserStateIds);
// }
//
// //获取删除dict后的在职状态
// List<Sys_dict> deleteRenewUserStateList = sysDictService.getSubListByCode("UserState");
// Sys_dict userState = deleteRenewUserStateList.stream().findFirst().orElse(null);
// assert userState != null;
// //获取在职状态名
// List<String> dictNameList = deleteRenewUserStateList.stream().map(Sys_dict::getName).collect(Collectors.toList());
// //如果user表中有在职状态, 删除userState后的dict表中没有,就需要新增
// List<String> insertUserStateList = userStates.stream().filter(v -> !dictNameList.contains(v)).collect(Collectors.toList());
//
// insertUserStateList = insertUserStateList.stream().distinct().collect(Collectors.toList());
// if (Lang.isNotEmpty(insertUserStateList)) {
// for (String item : insertUserStateList) {
// Sys_dict dict = new Sys_dict();
// dict.setCode(item);
// dict.setName(item);
// sysDictService.save(dict, userState.getParentId());
// }
// }
//人员类型
Sql personTypeSql = Sqls.create("select personType from `user` where personType is not null and personType !='' group by personType");
List<String> personTypes = sysDictService.listMap(personTypeSql).stream().map(v -> v.getString("personType")).collect(Collectors.toList());
List<Sys_dict> personTypeList = sysDictService.getSubListByCode("UserType");
List<Sys_dict> personTypeList = sysDictService.getSubListByCode("PERSON_TYPE");
if (Lang.isEmpty(personTypeList)) {
return;
}
//dict中的personType，在user表中没有,这一部分删除
List<Sys_dict> deletePersonType = personTypeList.stream().filter(v -> !personTypes.contains(v.getName())).collect(Collectors.toList());
@@ -130,7 +133,7 @@ public class UserPartUpServiceImpl extends ViServiceImpl<UserPartUp> implements
}
//获取删除dict后的personType
List<Sys_dict> deleteRenewPersonTypeList = sysDictService.getSubListByCode("UserType");
List<Sys_dict> deleteRenewPersonTypeList = sysDictService.getSubListByCode("PERSON_TYPE");
Sys_dict personType = deleteRenewPersonTypeList.stream().findFirst().orElse(null);
assert personType != null;
//获取personType