From 96895296f8457a089bf176904e84e19fba8f9c9b Mon Sep 17 00:00:00 2001 From: Paidax Date: Mon, 21 Apr 2025 15:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/v/nutz/sys/models/User.java | 13 +++++++++++++ .../data/service/impl/SourceUserServiceImpl.java | 10 ++++++---- .../change/MemberChangeManageController.java | 9 ++++++++- .../member/model/MemberChangeRecord.java | 6 ++++++ .../service/impl/MemberCommonServiceImpl.java | 2 +- .../platform/member/change/common/memberChange.js | 4 +++- 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/models/User.java b/src/main/java/io/v/nutz/sys/models/User.java index 7f274ea..f561626 100644 --- a/src/main/java/io/v/nutz/sys/models/User.java +++ b/src/main/java/io/v/nutz/sys/models/User.java @@ -5,6 +5,8 @@ import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.Column; import org.nutz.dao.entity.annotation.View; +import java.util.Date; + /** * 视图中的user * @@ -136,4 +138,15 @@ public class User { @Column private String threeUnitId; + @Column + private String personalStatus; + + @Column + private String schoolTime; + + @Column + private Date retireDate; + + @Column + private Date welfareStopDate; } 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 4ba6eb1..8fc7e1b 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 @@ -257,7 +257,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements if (user != null) { histories.add(history); } - if (history.getChangeTypes().contains(MemberChangeType.NEW.getType())) { + if (Lang.isNotEmpty(history.getChangeTypes()) && history.getChangeTypes().contains(MemberChangeType.NEW.getType())) { needInitUserList.add(u); } } else { @@ -268,7 +268,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements if (user != null && Lang.isNotEmpty(table.getChangeTypes())) { middleTables.add(table); } - if (table.getChangeTypes().contains(MemberChangeType.NEW.getType())) { + if (Lang.isNotEmpty(table.getChangeTypes()) && table.getChangeTypes().contains(MemberChangeType.NEW.getType())) { needInitUserList.add(u); } } @@ -543,7 +543,8 @@ public class SourceUserServiceImpl extends ViServiceImpl implements // 变更记录 List changeList = new ArrayList<>(); for (String fieldName : allowChangeFieldNames) { - if (allowChangeFieldNames.contains("retireDate") || allowChangeFieldNames.contains("welfareStopDate")) { + if (allowChangeFieldNames.contains("retireDate") || allowChangeFieldNames.contains("welfareStopDate") + || allowChangeFieldNames.contains("personalStatus")) { continue; } memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); @@ -594,7 +595,8 @@ public class SourceUserServiceImpl extends ViServiceImpl implements } List changeList = new ArrayList<>(); for (String fieldName : allowChangeFieldNames) { - if (allowChangeFieldNames.contains("retireDate") || allowChangeFieldNames.contains("welfareStopDate")) { + if (allowChangeFieldNames.contains("retireDate") || allowChangeFieldNames.contains("welfareStopDate") + || allowChangeFieldNames.contains("personalStatus")) { continue; } memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java index f05c72c..ed3dbe2 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java @@ -417,11 +417,18 @@ public class MemberChangeManageController { sql.setCondition(cnd); List ids = memberService.list(sql).stream().map(v -> v.getString("id")).collect(Collectors.toList()); + // 杭医特有，他们有一个福利享受截止时间，在这个时间之前的退休人员，也需要享受福利 + Sql welfareSql = Sqls.create("select id from sys_user where welfareStopTime < CURDATE() and userState = '退休'"); + welfareSql.setCallback(Sqls.callback.strList()); + dao.execute(welfareSql); + ids.addAll(welfareSql.getList(String.class)); + Trans.exec(() -> { if (!isAppendWelfareMember) { memberService.update(Chain.make("welfareMember", WelfareMemberMode.NONE.getCode()), Cnd.where("welfareMember", "=", WelfareMemberMode.NORMAL.getCode())); } - memberService.update(Chain.make("welfareMember", WelfareMemberMode.NORMAL.getCode()), Cnd.where("member", "=", MemberMode.NORMAL.getCode()).and("id", "in", ids)); +// memberService.update(Chain.make("welfareMember", WelfareMemberMode.NORMAL.getCode()), Cnd.where("member", "=", MemberMode.NORMAL.getCode()).and("id", "in", ids)); + dao.update(Sys_user.class, Chain.make("welfareMember", true), Cnd.where("id", "in", ids)); }); return null; } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java index 3e0e56a..cf56f00 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java @@ -134,6 +134,12 @@ public class MemberChangeRecord { @Size(max = 50) private String personType; + @Column + @Comment("费用类型") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Size(max = 50) + private String personalStatus; + @Column @Comment("手机号码") @ColDefine(type = ColType.VARCHAR, width = 32) diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java index 0e4f87b..2d0197d 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java @@ -355,7 +355,7 @@ public class MemberCommonServiceImpl extends ViServiceImpl implements // 去查询手动更新记录表，删除状态是未操作，变更类型是新入职的 dao().clear(SourceChangeMiddleTable.class, Cnd.where("loginname", "=", history.getLoginname()) - .and("changeInfoStr", "=", "新入职").and("isOperate", "=", 0)); + .and("changeInfosStr", "=", "新入职").and("isOperate", "=", 0)); sysUserService.deleteCacheAndUpdate(info.getId()); } diff --git a/src/main/resources/views/platform/member/change/common/memberChange.js b/src/main/resources/views/platform/member/change/common/memberChange.js index 24d9b2a..ee6aa03 100644 --- a/src/main/resources/views/platform/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/member/change/common/memberChange.js @@ -141,7 +141,7 @@ const MEMBER_CHANGE = { - + @@ -475,6 +475,7 @@ const MEMBER_CHANGE = { userState, personType, preparedBy, + personalStatus, idCard, mobile, email, @@ -499,6 +500,7 @@ const MEMBER_CHANGE = { this.$set(this.formData, "userState", userState) this.$set(this.formData, "personType", personType) this.$set(this.formData, "preparedBy", preparedBy) + this.$set(this.formData, "personalStatus", personalStatus) this.$set(this.formData, "unitName", unit ? unit.name : null) this.$set(this.formData, "unitId", unit ? unit.id : null) this.$set(this.formData, "unionName", union ? union.unionname : null)