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

commit

Browse Source
This commit is contained in:
Paidax
2024-12-04 08:51:01 +08:00
parent 2ffadd89a7
commit 02150326e0
63 changed files with 2362 additions and 2243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java
+3 -3
View File
@@ -336,7 +336,7 @@ public class WelfareMemberCheckUnionController {
audit.setAuditor(ShiroUtil.getUserId());
audit.setAuditPass(true);
audit.setAuditTime(new Date());
audit.setAuditOpinion(UserChangeType.NEW_WELFARE_LIST.getDescription());
// audit.setAuditOpinion(UserChangeType.NEW_WELFARE_LIST.getDescription());
audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString());
audit.setLoginname(ShiroUtil.getPrincipalProperty("loginname").toString());
dao.insert(audit);
@@ -346,8 +346,8 @@ public class WelfareMemberCheckUnionController {
User user = userList.stream().filter(u -> u.getId().equals(userId)).findFirst().orElse(null);
MemberChangeRecord changeRecord = new MemberChangeRecord();
changeRecord.setType(UserChangeType.NEW_WELFARE_LIST.getCode());
changeRecord.setRemark(UserChangeType.NEW_WELFARE_LIST.getDescription());
// changeRecord.setType(UserChangeType.NEW_WELFARE_LIST.getCode());
// changeRecord.setRemark(UserChangeType.NEW_WELFARE_LIST.getDescription());
changeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
changeRecord.setStateId(MemberChangeApplyState.SCHOOL_UNION);
changeRecord.setUpdateWelfareMember(true);