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

commit

Browse Source
This commit is contained in:
=
2026-04-20 17:22:28 +08:00
parent 97def4472b
commit d72c86cc14
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java
+10 -6
View File
@@ -129,13 +129,17 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
// return false; // return false;
// } // }
if (!"在岗".equals(userState) && !"在岗-里仁学院".equals(userState)) { // if (!"在岗".equals(userState) && !"在岗-里仁学院".equals(userState)) {
return false; // return false;
} // }
//
// // 判断聘用方式
// Set<String> memberPreparedByTypes = new HashSet<>(Arrays.asList("新人事代理", "校聘合同制", "事业编制"));
// return memberPreparedByTypes.contains(preparedBy);
// 判断聘用方式
Set<String> memberPreparedByTypes = new HashSet<>(Arrays.asList("新人事代理", "校聘合同制", "事业编制")); // 其他人员只需要判断在岗状态
return memberPreparedByTypes.contains(preparedBy); return "在岗".equals(userState) || "在岗-里仁学院".equals(userState);
} }
/** /**
src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java
+26 -21
View File
@@ -71,30 +71,35 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
// 检查是否符合会员条件 // 检查是否符合会员条件
// 1. 用户状态为"在岗" // 1. 用户状态为"在岗"
if ("在岗".equals(sysUser.getUserState()) || "在岗-里仁学院".equals(sysUser.getUserState())) { if ("在岗".equals(sysUser.getUserState()) || "在岗-里仁学院".equals(sysUser.getUserState())) {
// 2. 检查聘用方式条件 sysUser.setMember(true);
List<String> membershipQualifyingPreparedBy = Arrays.asList("新人事代理", "校聘合同制", "事业编制");
// 第一种情况：聘用方式在指定列表中
boolean isQualifiedByPreparedBy = membershipQualifyingPreparedBy.contains(sysUser.getPreparedBy());
// 第二种情况：聘用方式是博士后，且进站时间不超过两年
boolean isQualifiedPostdoc = false;
// if ("博士后".equals(sysUser.getPreparedBy()) && sysUser.getPostDoctoralJoinDate() != null) {
// Calendar twoYearsAgo = Calendar.getInstance();
// twoYearsAgo.add(Calendar.YEAR, -2);
// Date twoYearsAgoDate = twoYearsAgo.getTime();
// isQualifiedPostdoc = sysUser.getPostDoctoralJoinDate().after(twoYearsAgoDate);
// }
// 如果满足任一条件，设置为会员
if (isQualifiedByPreparedBy || isQualifiedPostdoc) {
sysUser.setMember(true);
} else {
sysUser.setMember(false);
}
} else { } else {
sysUser.setMember(false); sysUser.setMember(false);
} }
// if ("在岗".equals(sysUser.getUserState()) || "在岗-里仁学院".equals(sysUser.getUserState())) {
// // 2. 检查聘用方式条件
// List<String> membershipQualifyingPreparedBy = Arrays.asList("新人事代理", "校聘合同制", "事业编制");
//
// // 第一种情况：聘用方式在指定列表中
// boolean isQualifiedByPreparedBy = membershipQualifyingPreparedBy.contains(sysUser.getPreparedBy());
//
// // 第二种情况：聘用方式是博士后，且进站时间不超过两年
// boolean isQualifiedPostdoc = false;
//// if ("博士后".equals(sysUser.getPreparedBy()) && sysUser.getPostDoctoralJoinDate() != null) {
//// Calendar twoYearsAgo = Calendar.getInstance();
//// twoYearsAgo.add(Calendar.YEAR, -2);
//// Date twoYearsAgoDate = twoYearsAgo.getTime();
//// isQualifiedPostdoc = sysUser.getPostDoctoralJoinDate().after(twoYearsAgoDate);
//// }
//
// // 如果满足任一条件，设置为会员
// if (isQualifiedByPreparedBy || isQualifiedPostdoc) {
// sysUser.setMember(true);
// } else {
// sysUser.setMember(false);
// }
// } else {
// sysUser.setMember(false);
// }
} }
List<List<Sys_user>> splitSysUsers = ListUtil.split(sysUsers, 500); List<List<Sys_user>> splitSysUsers = ListUtil.split(sysUsers, 500);