From eefb76c781c7b89ea47e78fed30a1f3dd9100f87 Mon Sep 17 00:00:00 2001 From: zhengziru Date: Fri, 26 Jul 2024 13:45:13 +0800 Subject: [PATCH] commit --- .../platform/sys/club/SysClubCon.java | 2 +- .../platform/sys/club/SysClubUserCon.java | 2 +- .../club/applyIn/ClubApplyInController.java | 4 +- .../java/io/v/nutz/sys/models/Sys_user.java | 5 ++ .../task/job/walking/WalkingNotifyJob.java | 2 +- .../site/SiteReserveApplyController.java | 4 +- .../site/SiteRetireProcessController.java | 4 +- .../controller/site/SiteReviewController.java | 4 +- .../site/SiteUnionProcessController.java | 4 +- .../union/ActivityUnionManageController.java | 4 +- .../EvaluateUnionAuditController.java | 4 +- .../controller/activitybx/AccountingCon.java | 4 +- .../activitybx/ApplyController.java | 4 +- .../controller/activitybx/AssociationCon.java | 6 +- .../jf/controller/activitybx/DivisionCon.java | 6 +- .../jf/controller/activitybx/UnionCon.java | 4 +- .../reimbursement/ReimbursementToHandler.java | 2 +- .../lxy/controller/LxyAgentController.java | 2 +- .../controller/ManuscriptAgentController.java | 2 +- .../member/constant/MemberApplyState.java | 4 +- .../constant/MemberChangeApplyState.java | 4 +- .../inquire/MemberStatisticsController.java | 2 +- .../member/handle/MemberApplyAuditHandle.java | 2 +- .../handle/MemberChangeAuditHandle.java | 2 +- .../service/impl/MsgNotifyServiceImpl.java | 2 +- .../impl/ProposalConfigServiceImpl.java | 4 +- .../impl/ProposalSecondedServiceImpl.java | 2 +- .../controller/AuditConfirmController.java | 2 +- .../controller/applyNewController.java | 4 +- .../controller/info/SyrXtsbController.java | 2 +- .../controller/WelfareListController.java | 2 +- .../statistics/WelfareSingleController.java | 2 +- .../impl/WelfareSingleServiceImpl.java | 2 +- .../condolence/CondolenceAgentController.java | 2 +- .../difficult/DifficultAgentController.java | 4 +- .../io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java | 2 +- .../views/mobile/member/union_Audit.html | 4 +- .../views/mobile/question/answer_ctgu.html | 16 ++-- .../platform/healthCheckup/projectMange.html | 2 +- .../views/platform/jf/Funds/apply.html | 2 +- .../views/platform/jf/activitybx/apply.html | 4 +- .../platform/jf/bxFundsLayout/division.html | 2 +- .../platform/member/apply/audit/Layout.html | 2 +- .../views/platform/member/apply/index.html | 2 +- .../platform/member/change/audit/Layout.html | 2 +- .../views/platform/member/check/school.html | 2 +- .../views/platform/member/check/union.html | 2 +- .../platform/memberCost/payment/summary.html | 1 + .../resources/views/platform/sys/login.html | 89 ++++++++++++------- 49 files changed, 140 insertions(+), 103 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java index 7900b7a..c7c8b00 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java @@ -139,7 +139,7 @@ public class SysClubCon { list.forEach(item -> { String content = StrUtil.format("{}老师您好，{}将{}的{}从{}变更为{}，请您登录智慧工会进行审核！", item.getString("userName"), platformUsername, sysClub.getName(), user.getUsername(), getSfName(oldSf), getSfName(sf)); - //msgApi.sendWxMsg(s, content); + ////msgApi.sendWxMsg(s, content); }); } sysUserService.clearCache(); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java index 2e85ea8..f9a9ac3 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java @@ -297,7 +297,7 @@ public class SysClubUserCon { list.forEach(item -> { String content = StrUtil.format("{}老师您好，{}设置{}为{}的{}，请您登录智慧工会进行审核！", item.getString("userName"), platformUsername, fetch.getUsername(), sysClub.getName(), getSfName(sf)); - //msgApi.sendWxMsg(s, content); + ////msgApi.sendWxMsg(s, content); }); } } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java index c14eb29..966e563 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java @@ -175,7 +175,7 @@ public class ClubApplyInController { list.forEach(item -> { String content = "%s老师您好，%s老师于%s申请加入%s，请登陆智慧工会进行审核！".formatted(item.getString("userName") , platformUsername, dateTime, item.getString("name")); - //msgApi.sendWxMsg(person, content); + ////msgApi.sendWxMsg(person, content); }); return null; } @@ -229,7 +229,7 @@ public class ClubApplyInController { list.forEach(item -> { String content = "%s老师您好，%s老师于%s撤销加入%s的申请！".formatted(item.getString("userName") , platformUsername, DateUtil.getDateTime(), item.getString("name")); - //msgApi.sendWxMsg(person, content); + ////msgApi.sendWxMsg(person, content); }); return null; } diff --git a/src/main/java/io/v/nutz/sys/models/Sys_user.java b/src/main/java/io/v/nutz/sys/models/Sys_user.java index f46700e..a38395e 100644 --- a/src/main/java/io/v/nutz/sys/models/Sys_user.java +++ b/src/main/java/io/v/nutz/sys/models/Sys_user.java @@ -674,6 +674,11 @@ public class Sys_user extends BaseModel implements Serializable { @ColDefine(type = ColType.DATE) private Date startSalaryDate; + @Column + @Comment("更新时间") + @ColDefine(type = ColType.DATE) + private Date renewTime; + /** * 前端菜单 */ diff --git a/src/main/java/io/v/nutz/task/job/walking/WalkingNotifyJob.java b/src/main/java/io/v/nutz/task/job/walking/WalkingNotifyJob.java index 6d42410..fc57457 100644 --- a/src/main/java/io/v/nutz/task/job/walking/WalkingNotifyJob.java +++ b/src/main/java/io/v/nutz/task/job/walking/WalkingNotifyJob.java @@ -41,7 +41,7 @@ public class WalkingNotifyJob implements Job { """).setParam("groupId", groupId); List loginnames = ((List) Daos.query(dao, sql.toString(), Sqls.callback.maps())).stream().map(v -> v.getString("loginname")).collect(Collectors.toList()); for (String loginname : loginnames) { -// msgApi.sendWxMsg("快去上传步数", loginname); +// //msgApi.sendWxMsg("快去上传步数", loginname); } } } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java index 717e910..cf3df4a 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java @@ -133,7 +133,7 @@ public class SiteReserveApplyController { // String content = siteInfo.getName() + ",您有一条场地预约待审核，请您通过门户网站或点击详情登录智慧工会平台进行审核。," // + activitySiteReserve.getReserve_person_username(); - msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,auditLoginNameList,""); +// //msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,auditLoginNameList,""); } else { //离退休 祝鸿 审核 List auditLoginNameList = Lang.list("1019981325"); @@ -142,7 +142,7 @@ public class SiteReserveApplyController { String content = "离退休工作处的%s老师申请了一条%s的场地预约，请您通过门户网站或点击详情登录智慧工会平台进行审核" .formatted(ShiroUtil.getPrincipalProperty("username"), siteInfo.getName()); - msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,auditLoginNameList,""); +// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,auditLoginNameList,""); } return null; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java index 4c33ef9..a056e28 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java @@ -159,14 +159,14 @@ public class SiteRetireProcessController { .formatted(reserve_person, siteInfo.getName()); - msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,List.of("1019911404"),""); +// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,List.of("1019911404"),""); } else { //审核拒绝，发送短信给本人 String content = "%s老师您好！您预约的%s申请被离退休工作处处长拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); System.out.println(content); - msgApi.sendWxMsg("智慧工会【场地预约（离退休）】","","text",content,List.of(reserve_person_login_name),""); +// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】","","text",content,List.of(reserve_person_login_name),""); } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java index 7f5527d..717b380 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java @@ -157,13 +157,13 @@ public class SiteReviewController { String content = "%s老师您好！您预约的%s申请已通过审批，祝您使用愉快！" .formatted(reserve_person, siteInfo.getName()); - msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); + ////msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); } else { //审核拒绝，发送短信给本人 String content = "%s老师您好！您预约的%s申请被校工会拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); - msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); + ////msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); } return null; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java index a5d52d2..158b240 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java @@ -151,14 +151,14 @@ public class SiteUnionProcessController { reserve_person, siteInfo.getName()); - msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),""); + ////msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),""); } else { //审核拒绝，发送短信给本人 String content = "%s老师您好！您预约的%s申请被分工会拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); System.out.println(content); - msgApi.sendWxMsg("智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); + ////msgApi.sendWxMsg("智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java index eda7176..d0de228 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java @@ -343,11 +343,11 @@ public class ActivityUnionManageController { List userLoginNameList = users.stream().map(Sys_user::getLoginname).collect(Collectors.toList()); -// msgApi.sendWxMsg("会议通知", "", "text", "常熟理工学院五届二次教代会会议通知\\查看更多", List.of("17386049197")); +// //msgApi.sendWxMsg("会议通知", "", "text", "常熟理工学院五届二次教代会会议通知\\查看更多", List.of("17386049197")); String msgText = ShiroUtil.getPrincipalProperty("username") + "邀请您参加【" + activityTissue.getName() + "】活动，请您点击卡片跳转至活动报名页"; try { - msgApi.sendWxMsg("智慧工会【活动管理】", msgUrl, "textcard", msgText, userLoginNameList, ""); + ////msgApi.sendWxMsg("智慧工会【活动管理】", msgUrl, "textcard", msgText, userLoginNameList, ""); return Result.success(); } catch (Exception e){ e.printStackTrace(); diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java index 737fcca..0247985 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java @@ -156,7 +156,7 @@ public class EvaluateUnionAuditController { // //sendMsg.pushWeChatMsg("评优评先", msg, map.getString("loginname")); // } // } else { -// String msg = "%s老师您好，您于%s申请的【%s】评优评先，在院级工会审核时被驳回！" +// String msg = "%s老师您好，您于%s申请的【%s】评优评先，在分工会审核时被驳回！" // .formatted(applyUser.getUsername(), evaluateApply.getApplyTime(), evaluate.getName()); // //sendMsg.pushWeChatMsg("评优评先", msg, applyUser.getLoginname()); // } @@ -181,7 +181,7 @@ public class EvaluateUnionAuditController { //回到初始状态，审核记录可以不用清除，让申请人能看到是因为什么原因退回 evaluateApplyViService.update(Chain.make("stateId", 1400).add("unionAuditId", audit.getId()), Cnd.where("id", "=", id)); //退回发短信 - String msg = "%s老师您好，您于%s申请的【%s】评优评先，在院级工会审核时被退回！" + String msg = "%s老师您好，您于%s申请的【%s】评优评先，在分工会审核时被退回！" .formatted(applyUser.getUsername(), evaluateApply.getApplyTime(), evaluate.getName()); //sendMsg.pushWeChatMsg("评优评先", msg, applyUser.getLoginname()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java index 9065404..4191b0b 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java @@ -149,13 +149,13 @@ public class AccountingCon { Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH_WYH_ZX)); if (Lang.isNotEmpty(sys_user_role)) { Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); + ////msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); FundsToHandler.CREATE_SCHOOL_TASK.exec(aid.getId(), null, List.of(user.getLoginname())); } } else { nodeName = "校工会负责人拒绝"; Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会负责人拒绝，审核意见：" + aid.getAccounting_idea(), List.of(user.getLoginname()), null); + ////msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会负责人拒绝，审核意见：" + aid.getAccounting_idea(), List.of(user.getLoginname()), null); FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null); } FundsToHandler.COMPLETE_SCHOOL_FZR_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java index a4892ef..01db12d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java @@ -78,7 +78,7 @@ public class ApplyController { activityBx.setYear(Calendar.getInstance().get(Calendar.YEAR)); if (activityBx.getActivity_type() == 40001) { activityBx.setState_id("1020"); - loginNames.add("1019911404"); + loginNames.add("8333300107"); } else if (activityBx.getActivity_type() == 40002) { activityBx.setState_id("1010"); Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId())); @@ -103,7 +103,7 @@ public class ApplyController { } activityBxService.doAdd(activityBx); if (Lang.isNotEmpty(loginNames)) { - msgApi.sendWxMsg("活动申报", "", "text", activityBx.getUser_name() + "申请了一条活动申报【" + activityBx.getActivity_name() + "】,请前往智慧工会进行审核。", loginNames, null); + ////msgApi.sendWxMsg("活动申报", "", "text", activityBx.getUser_name() + "申请了一条活动申报【" + activityBx.getActivity_name() + "】,请前往智慧工会进行审核。", loginNames, null); NutMap map = new NutMap(); map.setv("userId",activityBx.getUser_id()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java index d53e1da..2313390 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java @@ -131,12 +131,12 @@ public class AssociationCon { String nodeName = ""; if (flag) { - msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of("1019911404"), null); - FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, new NutMap().addv("userId", aid.getUser_id()), List.of("1019911404")); + ////msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of("1019911404"), null); + FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, new NutMap().addv("userId", aid.getUser_id()), List.of("8333300107")); nodeName = "校工会负责人审核"; } else { Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被协会拒绝，审核意见：" + aid.getAssociation_principal_idea(), List.of(user.getLoginname()), null); + ////msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被协会拒绝，审核意见：" + aid.getAssociation_principal_idea(), List.of(user.getLoginname()), null); nodeName = "协会审核拒绝"; FundsToHandler.REFUSE_TASK.exec(id, new NutMap().addv("option", nodeName), null); } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java index 8dff2a8..25cd605 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java @@ -141,14 +141,14 @@ public class DivisionCon { // Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH_WYH_ZX)); // if (Lang.isNotEmpty(sys_user_role)) { // Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - Sys_user user = activityBxService.dao().fetch(Sys_user.class, Cnd.where("loginname","=","1019911404")); - msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); + Sys_user user = activityBxService.dao().fetch(Sys_user.class, Cnd.where("loginname","=","8333300107")); + //msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, null, List.of(user.getLoginname())); // } } else { nodeName = "基层工会主席拒绝"; Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被基层工会主席拒绝，审核意见：" + aid.getDivision_chairman_idea(), List.of(user.getLoginname()), null); + //msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被基层工会主席拒绝，审核意见：" + aid.getDivision_chairman_idea(), List.of(user.getLoginname()), null); FundsToHandler.REFUSE_TASK.exec(id, new NutMap().addv("option", nodeName), null); } FundsToHandler.COMPLETE_UNION_TASK.exec(id, new NutMap().addv("option", nodeName), null); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java index e77e876..0d5bd2d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java @@ -151,7 +151,7 @@ public class UnionCon { String nodeName = ""; if (nutMap.getBoolean("flag")) { User user = activityBxService.dao().fetch(User.class, Cnd.where("id", "=", aid.getUser_id())); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null); + //msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null); if (aid.getActivity_id() == null) { @@ -180,7 +180,7 @@ public class UnionCon { nodeName = "审核通过"; } else { Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null); + //msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null); FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null); } activityBxService.update(aid); diff --git a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java index a278d29..43d75ce 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java +++ b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java @@ -209,7 +209,7 @@ public enum ReimbursementToHandler { "activity_reimbursement_school_director_audit", "校工会负责人审核", ShiroUtil.getUserId(), - List.of("1019911404"), + List.of("8333300107"), "/platform/jf/reimbursement/schoolDirector", "/platform/jf/reimbursement/schoolDirector", "/platform/jf/reimbursement/schoolDirector", diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java index 1baf4ba..b96a0df 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java @@ -40,7 +40,7 @@ public class LxyAgentController { final String title = "【疗休养】"; List result = new ArrayList<>(); if (ShiroUtil.hasAnyRoles("sysadmin")) { - result.add(new NutMap().setv("title", title).setv("url", FGHSH).setv("iconClass", vi.getIconByPath(FGHSH)).setv("label", "待院级工会审核").setv("number", getFghshCount())); + result.add(new NutMap().setv("title", title).setv("url", FGHSH).setv("iconClass", vi.getIconByPath(FGHSH)).setv("label", "待分工会审核").setv("number", getFghshCount())); result.add(new NutMap().setv("title", title).setv("url", XGHSH).setv("iconClass", vi.getIconByPath(XGHSH)).setv("label", "待校工会审核").setv("number", getXghshCount().size())); } return result; diff --git a/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java b/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java index 0b6a875..e3f264a 100644 --- a/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java @@ -45,7 +45,7 @@ public class ManuscriptAgentController { List result = new ArrayList<>(); - result.add(new NutMap().setv("title", title).setv("url", union).setv("iconClass", vi.getIconByPath(union)).setv("label", "待院级工会审核").setv("number", getUnionCount())); + result.add(new NutMap().setv("title", title).setv("url", union).setv("iconClass", vi.getIconByPath(union)).setv("label", "待分工会审核").setv("number", getUnionCount())); result.add(new NutMap().setv("title", title).setv("url", school).setv("iconClass", vi.getIconByPath(school)).setv("label", "待校工会审核").setv("number", getSchoolCount())); Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); diff --git a/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java b/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java index b03ffc1..e7778f5 100644 --- a/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java +++ b/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java @@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant; */ public interface MemberApplyState { /** - * 待院级工会审核 + * 待分工会审核 */ int UNION = 10; /** - * 院级工会审核不通过 + * 分工会审核不通过 */ int UNION_FAIL = 15; diff --git a/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java b/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java index fd2e4c7..181b0d6 100644 --- a/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java +++ b/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java @@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant; */ public interface MemberChangeApplyState { /** - * 待院级工会审核 + * 待分工会审核 */ int UNION = 50; /** - * 院级工会审核不通过 + * 分工会审核不通过 */ int UNION_FAIL = 55; diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java index 7107c4b..24150d3 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java @@ -243,7 +243,7 @@ public class MemberStatisticsController { try { response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment;filename=" + new String(("会员性别统计.xls").getBytes("utf-8"), "ISO8859-1")); + response.setHeader("Content-Disposition", "attachment;filename=" + new String(("会员统计名单.xls").getBytes("utf-8"), "ISO8859-1")); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, memberList); ServletOutputStream outputStream = response.getOutputStream(); workbook.write(outputStream); diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java index 89e856f..6b3596f 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java @@ -92,7 +92,7 @@ public enum MemberApplyAuditHandle { } }, /** - * 院级工会审核 + * 分工会审核 */ AUDIT_UNION(MemberApplyState.UNION) { @Override diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java index 1bdaad7..0d7850f 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java @@ -71,7 +71,7 @@ public enum MemberChangeAuditHandle { } }, /** - * 院级工会审核 + * 分工会审核 */ UNION(MemberChangeApplyState.UNION) { @Override diff --git a/src/main/java/io/v/nutz/zhgh/msgNotify/service/impl/MsgNotifyServiceImpl.java b/src/main/java/io/v/nutz/zhgh/msgNotify/service/impl/MsgNotifyServiceImpl.java index e0fedb9..5920bae 100644 --- a/src/main/java/io/v/nutz/zhgh/msgNotify/service/impl/MsgNotifyServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/msgNotify/service/impl/MsgNotifyServiceImpl.java @@ -128,7 +128,7 @@ public class MsgNotifyServiceImpl extends ViServiceImpl implements Ms if (sendTypes.contains("msg")) { } if (sendTypes.contains("WeChat")) { - msgApi.sendWxMsg(title, "", contentType, content, userData, contentUrl); + //msgApi.sendWxMsg(title, "", contentType, content, userData, contentUrl); } } }.start(); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java index fdc63fb..e539917 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java @@ -160,9 +160,9 @@ public class ProposalConfigServiceImpl extends ViServiceImpl imp list2.add(""); String collect = list2.stream().collect(Collectors.joining("|")); if (alreadySecondedCount >= seconderNum) { -// msgApi.sendWxMsg(collect, StrUtil.format("您的《{}》提案已经附议完成，但还未提交，请关注！", proposalName)); +// //msgApi.sendWxMsg(collect, StrUtil.format("您的《{}》提案已经附议完成，但还未提交，请关注！", proposalName)); } else { -// msgApi.sendWxMsg(collect, StrUtil.format("您的《{}》提案已经有({})人附议通过，但还未达到提交的要求数量，请关注！", proposalName, alreadySecondedCount)); +// //msgApi.sendWxMsg(collect, StrUtil.format("您的《{}》提案已经有({})人附议通过，但还未达到提交的要求数量，请关注！", proposalName, alreadySecondedCount)); } }); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java index cf769d9..e4ef36c 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java @@ -66,7 +66,7 @@ public class ProposalSecondedServiceImpl extends ViServiceImpl list.add(""); String collect = list.stream().collect(Collectors.joining("|")); //发送消息 -// msgApi.sendWxMsg(collect, StrUtil.format(TZ_TEMPLATE, info.getProposalName())); +// //msgApi.sendWxMsg(collect, StrUtil.format(TZ_TEMPLATE, info.getProposalName())); } } } diff --git a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/AuditConfirmController.java b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/AuditConfirmController.java index 35d21c6..f2c762e 100644 --- a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/AuditConfirmController.java +++ b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/AuditConfirmController.java @@ -160,7 +160,7 @@ public class AuditConfirmController { } } - //msgApi.sendWxMsg(content, reimbursementNew.getLoginName()); + ////msgApi.sendWxMsg(content, reimbursementNew.getLoginName()); }); return null; diff --git a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java index 61736e0..eb908ee 100644 --- a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java +++ b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java @@ -95,7 +95,7 @@ public class applyNewController { """).setParam("kj", Roles.XGHKJ); List list = baseService.listMap(sql); list.forEach(v -> { - //msgApi.sendWxMsg("%s(%s)提交了一条报销申请待您审核，请前往智慧工会查看！".formatted(reimbursementNew.getUserName(), reimbursementNew.getLoginName()), v.getString("loginname")); + ////msgApi.sendWxMsg("%s(%s)提交了一条报销申请待您审核，请前往智慧工会查看！".formatted(reimbursementNew.getUserName(), reimbursementNew.getLoginName()), v.getString("loginname")); }); return null; } @@ -140,7 +140,7 @@ public class applyNewController { """).setParam("kj", Roles.XGHKJ); List list = baseService.listMap(sql); list.forEach(v -> { - //msgApi.sendWxMsg("%s(%s)提交了一条报销申请待您审核，请前往智慧工会查看！".formatted(reimbursementNew.getUserName(), reimbursementNew.getLoginName()), v.getString("loginname")); + ////msgApi.sendWxMsg("%s(%s)提交了一条报销申请待您审核，请前往智慧工会查看！".formatted(reimbursementNew.getUserName(), reimbursementNew.getLoginName()), v.getString("loginname")); }); } reimbursementNew.setState(ReimbursementState.AUDIT_CONFIRM); diff --git a/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java b/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java index d3fb8b6..0696cd8 100644 --- a/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java +++ b/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java @@ -97,7 +97,7 @@ public class SyrXtsbController { List roleList = baseService.list(sql); String content = "您有一个“%s”提交的“三育人”项目申报材料需审核，请于7月31日前登录https://zhgh.nuaa.edu.cn进行审核。谢谢！【智慧工会】".formatted(ShiroUtil.getPrincipalProperty("username")); roleList.forEach(v -> { -// msgApi.pushWeChatMsg("三育人院级工会审核", content, v.getString("loginname")); +// msgApi.pushWeChatMsg("三育人分工会审核", content, v.getString("loginname")); }); return Result.success(); } catch (Exception e) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java index 0a981f7..b15de16 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java @@ -484,7 +484,7 @@ public class WelfareListController { it.`name` unitname, wpus.selectNum FROM - welfare_project_user_selection_copy1 wpus + welfare_project_user_selection_copy wpus LEFT JOIN `welfare_list` wl ON wpus.selectUserId = wl.userId LEFT JOIN `sys_user` u ON u.id = wl.userId LEFT JOIN sys_union un ON un.id = wl.welfareUnitId diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java index 3f666e1..87f1910 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java @@ -698,7 +698,7 @@ public class WelfareSingleController { wpus.selectNum, wpso.optionName FROM - welfare_project_user_selection_copy1 wpus + welfare_project_user_selection_copy wpus left join sys_user u on u.id = wpus.selectUserId left join welfare_project_subject_option wpso on wpso.id = wpus.selectOptionId left join welfare_list wl on wl.userId = wpus.selectUserId diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java index f6ca7f5..e551dc4 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java @@ -184,7 +184,7 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl wpus.selectUserId, wl.welfareUnitId as unionId FROM - `welfare_project_user_selection_copy1` wpus + `welfare_project_user_selection_copy` wpus LEFT JOIN welfare_list wl on wl.userId = wpus.selectUserId $condition """); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceAgentController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceAgentController.java index 5cefac5..012108b 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceAgentController.java @@ -53,7 +53,7 @@ public class CondolenceAgentController { List result = new ArrayList<>(); - result.add(new NutMap().setv("title", title).setv("url", UCR).setv("iconClass", vi.getIconByPath(UCR)).setv("label", "待院级工会审核").setv("number", getUcrCount())); + result.add(new NutMap().setv("title", title).setv("url", UCR).setv("iconClass", vi.getIconByPath(UCR)).setv("label", "待分工会审核").setv("number", getUcrCount())); result.add(new NutMap().setv("title", title).setv("url", FR).setv("iconClass", vi.getIconByPath(FR)).setv("label", "待二级党组织审核").setv("number", getFrCount())); result.add(new NutMap().setv("title", title).setv("url", VCR).setv("iconClass", vi.getIconByPath(VCR)).setv("label", "待校工会审核").setv("number", getVcrCount())); result.add(new NutMap().setv("title", title).setv("url", ECR).setv("iconClass", vi.getIconByPath(ECR)).setv("label", "待工会常务副主席审核").setv("number", getEcrCount())); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultAgentController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultAgentController.java index 5dff120..277f27c 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultAgentController.java @@ -48,7 +48,7 @@ public class DifficultAgentController { List result = new ArrayList<>(); if (ShiroUtil.hasAnyRoles("sysadmin")) { - result.add(new NutMap().setv("title", title).setv("url", UNIONCHAIRMAN).setv("iconClass", vi.getIconByPath(UNIONCHAIRMAN)).setv("label", "待院级工会审核").setv("number", getUnionChairmanCount())); + result.add(new NutMap().setv("title", title).setv("url", UNIONCHAIRMAN).setv("iconClass", vi.getIconByPath(UNIONCHAIRMAN)).setv("label", "待分工会审核").setv("number", getUnionChairmanCount())); result.add(new NutMap().setv("title", title).setv("url", SCHOOLMANAGER).setv("iconClass", vi.getIconByPath(SCHOOLMANAGER)).setv("label", "待校工会审核").setv("number", getSchoolManagerCount())); //暂时没用到 result.add(new NutMap().setv("title", title).setv("url", SCHOOLVICECHAIRMAN).setv("iconClass", vi.getIconByPath(SCHOOLVICECHAIRMAN)).setv("label", "待校工会副主席审核").setv("number", getSchoolviceChairmanCount())); @@ -56,7 +56,7 @@ public class DifficultAgentController { result.add(new NutMap().setv("title", title).setv("url", SCHOOLSTANDING).setv("iconClass", vi.getIconByPath(SCHOOLSTANDING)).setv("label", "待校工会常务副主席审核").setv("number", getSchoolStandingCount())); } else { if (ShiroUtil.hasAnyRoles("H04,gh01")) { - result.add(new NutMap().setv("title", title).setv("url", UNIONCHAIRMAN).setv("iconClass", vi.getIconByPath(UNIONCHAIRMAN)).setv("label", "待院级工会审核").setv("number", getUnionChairmanCount())); + result.add(new NutMap().setv("title", title).setv("url", UNIONCHAIRMAN).setv("iconClass", vi.getIconByPath(UNIONCHAIRMAN)).setv("label", "待分工会审核").setv("number", getUnionChairmanCount())); } if (ShiroUtil.hasAnyRoles("A06,wyh02")) { result.add(new NutMap().setv("title", title).setv("url", SCHOOLMANAGER).setv("iconClass", vi.getIconByPath(SCHOOLMANAGER)).setv("label", "待校工会审核").setv("number", getSchoolManagerCount())); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java b/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java index 30219be..8dd510f 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java @@ -104,7 +104,7 @@ public class Fw_Wwj implements Serializable { private String xghqz; @Column - @Comment("审核状态(0待申请人修改 1待院级工会审核 2待校工会审核 3院级工会审核不通过 4校工会审核不通过 5审核通过)") + @Comment("审核状态(0待申请人修改 1待分工会审核 2待校工会审核 3分工会审核不通过 4校工会审核不通过 5审核通过)") @ColDefine(type = ColType.INT) private Integer status; diff --git a/src/main/resources/views/mobile/member/union_Audit.html b/src/main/resources/views/mobile/member/union_Audit.html index 5af86c1..8223761 100644 --- a/src/main/resources/views/mobile/member/union_Audit.html +++ b/src/main/resources/views/mobile/member/union_Audit.html @@ -7,12 +7,12 @@ layout("/mobile/platform.html"){ @click-left="history.back()"> - +