From fa4ac246b5a9b2215c1caffd7f39b94ceb6db52c Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Mon, 18 May 2026 16:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SourceUserServiceImpl.java | 41 +++++++++++-------- .../SourceChangeConfigController.java | 2 +- .../resources/views/layouts/platform.html | 4 +- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index 4555eaf..bef9f9d 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -36,10 +36,7 @@ import io.v.nutz.zhgh.staffmanage.sourcechange.model.SourceChangeConfig; import io.v.nutz.zhgh.staffmanage.sourcechange.model.SourceChangeMiddleTable; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -import org.nutz.dao.Dao; -import org.nutz.dao.FieldFilter; -import org.nutz.dao.Sqls; +import org.nutz.dao.*; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.Daos; import org.nutz.ioc.aop.Aop; @@ -335,7 +332,8 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 判断自动更新的会员和福利会员 - * @param config 人员更新的配置 + * + * @param config 人员更新的配置 * @param source * @param user * @param addMemberUserIds @@ -344,13 +342,13 @@ public class SourceUserServiceImpl extends ViServiceImpl implements * @param deleteWelfareMemberUserIds */ private void checkMemberOrWelfareMember(SourceChangeConfig config, UserSource source, Sys_user user, - List addMemberUserIds, List deleteMemberUserIds, - List addWelfareMemberUserIds, List deleteWelfareMemberUserIds){ + List addMemberUserIds, List deleteMemberUserIds, + List addWelfareMemberUserIds, List deleteWelfareMemberUserIds) { if (StrUtil.isBlank(source.getUserState())) { return; } - if (user != null && ObjectUtil.equals(user.getMember(), 1) && List.of("退休", "离职", "辞职").contains(source.getUserState())) { + if (user != null && ObjectUtil.equals(user.getMember(), 1) && List.of("退休", "离职", "辞职", "死亡", "调出").contains(source.getUserState())) { deleteMemberUserIds.add(user.getId()); deleteWelfareMemberUserIds.add(user.getId()); } @@ -395,6 +393,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 用于人工操作，不自动更新，不改变数据库数据 * 待人工手动调整后，变更数据库 + * * @param source * @param user * @param dictMap @@ -455,6 +454,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 自动更新，创建历史记录 * 会直接改变数据库 + * * @param source * @param user * @param dictMap @@ -484,7 +484,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements // 变更记录 List changeList = new ArrayList<>(); for (String fieldName : allowChangeFieldNames) { - if (List.of("retireDate", "welfareStopDate", "personalStatus").contains(fieldName)) { + if (List.of("retireDate", "welfareStopDate", "personalStatus","welfareMember").contains(fieldName)) { continue; } memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); @@ -508,11 +508,12 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 比较变更类型公共方法 + * * @param source * @param user * @param changeTypes */ - private void commonCompareChange(UserSource source, Sys_user user, List changeTypes){ + private void commonCompareChange(UserSource source, Sys_user user, List changeTypes) { changeTypes.add(MemberChangeType.BASIC_CHANGE.getType()); if (!ObjectUtil.equals(user.getUserState(), source.getUserState())) { @@ -523,7 +524,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements } } - if (source.getMember() != null && !ObjectUtil.equals(user.getMember(), source.getMember())){ + if (source.getMember() != null && !ObjectUtil.equals(user.getMember(), source.getMember())) { if (source.getMember() == 1) { changeTypes.add(MemberChangeType.RESTORE.getType()); } else { @@ -539,6 +540,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 添加会员 + * * @param addMemberUserIds * @param isJoinMemberActivityScope */ @@ -568,15 +570,17 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 删除会员 + * * @param deleteMemberUserIds * @param isDeleteMemberActivityScope */ - private void deleteMemberUser(List deleteMemberUserIds, Boolean isDeleteMemberActivityScope){ + private void deleteMemberUser(List deleteMemberUserIds, Boolean isDeleteMemberActivityScope) { if (Lang.isNotEmpty(deleteMemberUserIds)) { dao().clear(Sys_user_role.class, Cnd.where("userId", "in", deleteMemberUserIds).and("roleId", "=", Roles.MEMBER)); - /* if (isDeleteMemberActivityScope) { - dao().clear(ActivityUserScope.class, Cnd.where("userId", "in", deleteMemberUserIds).and("groupId", "=", 1)); - }*/ + dao().update(Sys_user.class, Chain.make("member", 0).add("welfareMember", 0), Cnd.where("id", "in", deleteMemberUserIds)); + if (isDeleteMemberActivityScope) { + dao().clear(ActivityUserScope.class, Cnd.where("userId", "in", deleteMemberUserIds).and("groupId", "=", 4)); + } } } @@ -586,7 +590,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements public void dailyScheduledUpdates() { pullSourceData(true); Date pullTime = (Date) dao().func2(UserSource.class, "max", "pullTime"); - updateSysUser(DateUtil.formatDateTime(pullTime), "add",null,null,null,false); + updateSysUser(DateUtil.formatDateTime(pullTime), "add", null, null, null, false); DateTime agoWeekDate = DateUtil.offsetWeek(new Date(), -1); String formatAgoWeekDate = DateUtil.format(agoWeekDate, "yyyy-MM-dd"); @@ -597,9 +601,10 @@ public class SourceUserServiceImpl extends ViServiceImpl implements /** * 数据大批量更新 + * * @param needDoUpdateList 需要更新的数据 - * @param isPart 是否部分更新 - * @param filterColumnDao 部分更新传递（部分更新存在过滤字段） + * @param isPart 是否部分更新 + * @param filterColumnDao 部分更新传递（部分更新存在过滤字段） */ private void massUpdatesAsync(List needDoUpdateList, Boolean isPart, AtomicReference filterColumnDao) { // 创建一个CPU核心数的2倍的线程池 diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeConfigController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeConfigController.java index 03be31c..e5affb3 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeConfigController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeConfigController.java @@ -53,7 +53,7 @@ public class SourceChangeConfigController { List list = (List) siftValue; System.out.println(list); } - return null; + return config; } diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index c49983d..6c78075 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -71,9 +71,9 @@ - - +-->