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

commit

Browse Source
This commit is contained in:
zhengziru
2024-07-26 13:45:13 +08:00
parent fc673e5e4e
commit eefb76c781
49 changed files with 140 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java
+1 -1
View File
@@ -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();
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java
+1 -1
View File
@@ -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);
});
}
}
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java
+2 -2
View File
@@ -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;
}
src/main/java/io/v/nutz/sys/models/Sys_user.java
+5
View File
@@ -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;
/**
* 前端菜单
*/
src/main/java/io/v/nutz/task/job/walking/WalkingNotifyJob.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class WalkingNotifyJob implements Job {
""").setParam("groupId", groupId);
List<String> loginnames = ((List<NutMap>) 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);
}
}
}
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java
+2 -2
View File
@@ -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<String> 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;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java
+2 -2
View File
@@ -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;
}
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java
+2 -2
View File
@@ -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;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java
+2 -2
View File
@@ -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;
}
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+2 -2
View File
@@ -343,11 +343,11 @@ public class ActivityUnionManageController {
List<String> userLoginNameList = users.stream().map(Sys_user::getLoginname).collect(Collectors.toList());
// msgApi.sendWxMsg("会议通知", "", "text", "常熟理工学院五届二次教代会会议通知\\<a href=https://zhgh.cslg.edu.cn/1711354503398.jpg\\>查看更多</a>", List.of("17386049197"));
// //msgApi.sendWxMsg("会议通知", "", "text", "常熟理工学院五届二次教代会会议通知\\<a href=https://zhgh.cslg.edu.cn/1711354503398.jpg\\>查看更多</a>", 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();
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java
+2 -2
View File
@@ -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());
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java
+2 -2
View File
@@ -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);
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java
+2 -2
View File
@@ -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());
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java
+3 -3
View File
@@ -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);
}
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java
+3 -3
View File
@@ -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);
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java
+2 -2
View File
@@ -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);
src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java
+1 -1
View File
@@ -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",
src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class LxyAgentController {
final String title = "【疗休养】";
List<NutMap> 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;
src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class ManuscriptAgentController {
List<NutMap> 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();
src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java
+2 -2
View File
@@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant;
*/
public interface MemberApplyState {
/**
* 待院级工会审核
* 待分工会审核
*/
int UNION = 10;
/**
* 院级工会审核不通过
* 分工会审核不通过
*/
int UNION_FAIL = 15;
src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java
+2 -2
View File
@@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant;
*/
public interface MemberChangeApplyState {
/**
* 待院级工会审核
* 待分工会审核
*/
int UNION = 50;
/**
* 院级工会审核不通过
* 分工会审核不通过
*/
int UNION_FAIL = 55;
src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java
+1 -1
View File
@@ -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);
src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java
+1 -1
View File
@@ -92,7 +92,7 @@ public enum MemberApplyAuditHandle {
}
},
/**
* 院级工会审核
* 分工会审核
*/
AUDIT_UNION(MemberApplyState.UNION) {
@Override
src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java
+1 -1
View File
@@ -71,7 +71,7 @@ public enum MemberChangeAuditHandle {
}
},
/**
* 院级工会审核
* 分工会审核
*/
UNION(MemberChangeApplyState.UNION) {
@Override
src/main/java/io/v/nutz/zhgh/msgNotify/service/impl/MsgNotifyServiceImpl.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class MsgNotifyServiceImpl extends ViServiceImpl<MsgNotify> 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();
src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java
+2 -2
View File
@@ -160,9 +160,9 @@ public class ProposalConfigServiceImpl extends ViServiceImpl<ProposalConfig> 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));
}
});
src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class ProposalSecondedServiceImpl extends ViServiceImpl<ProposalSeconded>
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()));
}
}
}
src/main/java/io/v/nutz/zhgh/reimbursement/controller/AuditConfirmController.java
+1 -1
View File
@@ -160,7 +160,7 @@ public class AuditConfirmController {
}
}
//msgApi.sendWxMsg(content, reimbursementNew.getLoginName());
////msgApi.sendWxMsg(content, reimbursementNew.getLoginName());
});
return null;
src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java
+2 -2
View File
@@ -95,7 +95,7 @@ public class applyNewController {
""").setParam("kj", Roles.XGHKJ);
List<NutMap> 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<NutMap> 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);
src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class SyrXtsbController {
List<Record> 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) {
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
+1 -1
View File
@@ -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
src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java
+1 -1
View File
@@ -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
src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> 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
""");
src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceAgentController.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class CondolenceAgentController {
List<NutMap> 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()));
src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultAgentController.java
+2 -2
View File
@@ -48,7 +48,7 @@ public class DifficultAgentController {
List<NutMap> 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()));
src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java
+1 -1
View File
@@ -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;
src/main/resources/views/mobile/member/union_Audit.html
+2 -2
View File
@@ -7,12 +7,12 @@ layout("/mobile/platform.html"){
@click-left="history.back()"></van-nav-bar>
<member-menber-info ref="info" :id="id" title="院级工会审核" :handle="handle">
<member-menber-info ref="info" :id="id" title="分工会审核" :handle="handle">
<template #handle>
<div class="van-cell-group__title mt20">
<div class="van-sidebar-item van-sidebar-item--select">
院级工会审核
分工会审核
</div>
</div>
<van-form>
src/main/resources/views/mobile/question/answer_ctgu.html
+11 -5
View File
@@ -209,18 +209,24 @@ layout("/mobile/platform.html"){
const radios = this.issueList.filter(v => v.itx === 1 && v.iisdx)
const checkBoxes = this.issueList.filter(v => v.itx === 1 && !v.iisdx)
const radioScore = radios ? radios[0].fraction : 0
const checkBoxesScore = checkBoxes ? checkBoxes[0].fraction : 0
const radioScore = radios && radios.length > 0 ? radios[0].fraction : 0
const checkBoxesScore = checkBoxes && checkBoxes.length > 0 ? checkBoxes[0].fraction : 0
const radioScoreSum = radios.map(v => v.fraction ? v.fraction : 0).reduce((a, b) => a + b, 0)
const checkBoxesScoreSum = checkBoxes.map(v => v.fraction ? v.fraction : 0).reduce((a, b) => a + b, 0)
const sumScore = radioScoreSum + checkBoxesScoreSum
const countNum = radios.length + checkBoxes.length
let radiosText = ''
let checkBoxesText = ''
// return "说明：单选题" + radios.length + "题，每题" + radioScore + "分，合计" + radioScoreSum + "分；多选题" + checkBoxes.length + "题，每题" + checkBoxesScore + "分，合计" + checkBoxesScoreSum + "分；总分" + sumScore + "分。"
return "说明：单选题" + radios.length + "题；多选题" + checkBoxes.length + "题；合计：" + countNum + "题。"
if (radios && radios.length > 0) {
radiosText = "单选题" + radios.length + "题，每题" + radioScore + "分，合计" + radioScoreSum + "分；"
}
if (checkBoxes && checkBoxes.length > 0) {
checkBoxesText = "多选题" + checkBoxes.length + "题，每题" + checkBoxesScore + "分，合计" + checkBoxesScoreSum + "分；总分" + sumScore + "分。"
}
return "说明：" + radiosText + checkBoxesText
},
src/main/resources/views/platform/healthCheckup/projectMange.html
+1 -1
View File
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
查看
</el-dropdown-item>
<el-dropdown-item v-if="row.isWithinChoiceTime && !row.isHasUserList"
:command="{type:'create',data:row}">
:command="{type:'created',data:row}">
生成名单
</el-dropdown-item>
<el-dropdown-item v-if="row.isWithinChoiceTime && row.isHasUserList"
src/main/resources/views/platform/jf/Funds/apply.html
+1 -1
View File
@@ -346,7 +346,7 @@ layout("/layouts/platform.html"){
address: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activity_card_name: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activity_card_number: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
}
},
src/main/resources/views/platform/jf/activitybx/apply.html
+2 -2
View File
@@ -327,7 +327,7 @@ layout("/layouts/platform.html"){
activity_type: [{required: true, message: '必填', trigger: ['blur', 'change']}],
time: [{required: true, message: '必填', trigger: ['blur', 'change']}],
projectTypeCode: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
billFiles: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
activity: []
@@ -337,7 +337,7 @@ layout("/layouts/platform.html"){
'search': httpVueLoader('/components/activityBx/ActivityBxSearch.vue'),
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue?v=' + new Date().getTime()),
'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0')
'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1')
},
methods: {
async remoteMethod(query) {
src/main/resources/views/platform/jf/bxFundsLayout/division.html
+1 -1
View File
@@ -123,7 +123,7 @@
</template>
<template #edit>
<activity-bx-info ref="act_info2" :handle="true" label="院级工会审核" :panes="[2]">
<activity-bx-info ref="act_info2" :handle="true" label="分工会审核" :panes="[2]">
<template #handle>
<el-form :model="formData" ref="form" :rules="formRules" label-position="right"
style="padding: 20px 0"
src/main/resources/views/platform/member/apply/audit/Layout.html
+1 -1
View File
@@ -176,7 +176,7 @@
<el-tab-pane label="个人信息" name="info">
<member ref="memberInfo" :id="info.userId" view></member>
</el-tab-pane>
<el-tab-pane label="院级工会审核" name="union">
<el-tab-pane label="分工会审核" name="union">
<el-form :model="formData" ref="form" :rules="formRules"
label-width="120px" label-suffix="：">
src/main/resources/views/platform/member/apply/index.html
+1 -1
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
label-position="right" label-suffix="："
label-width="120px">
<el-form>
<el-form-item label="院级工会审核信息&emsp;"
<el-form-item label="分工会审核信息&emsp;"
label-width="180px"
class="view-header">
</el-form-item>
src/main/resources/views/platform/member/change/audit/Layout.html
+1 -1
View File
@@ -200,7 +200,7 @@
<mem-change-records :userid="info.userId"></mem-change-records>
</el-tab-pane>
<el-tab-pane label="院级工会审核" name="union">
<el-tab-pane label="分工会审核" name="union">
<el-form :model="formData" ref="form" :rules="formRules"
label-width="120px" label-suffix="：">
src/main/resources/views/platform/member/check/school.html
+1 -1
View File
@@ -436,7 +436,7 @@ layout("/layouts/platform.html"){
components: {
'member': httpVueLoader('/components/member/MemberInfo.vue?v=' + new Date().getTime()),
'mem-change-records': httpVueLoader('/components/member/MemChangeRecords.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/userChangeHistory.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/UserChangeHistory.vue?v=' + new Date().getTime()),
},
data() {
return {
src/main/resources/views/platform/member/check/union.html
+1 -1
View File
@@ -310,7 +310,7 @@ layout("/layouts/platform.html"){
components: {
'mem-change-apply': httpVueLoader('/components/member/MemChangeApply.vue?v=' + new Date().getTime()),
'member-user-select': httpVueLoader('/components/plugins/MemberUserTableSelect.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/userChangeHistory.vue?v=' + new Date().getTime()),
'user-change-history': httpVueLoader('/components/userChangeHistory/UserChangeHistory.vue?v=' + new Date().getTime()),
},
computed: {
allowOperationTask() {
src/main/resources/views/platform/memberCost/payment/summary.html
+1
View File
@@ -311,6 +311,7 @@ layout("/layouts/platform.html"){
'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=1.0.0'),
},
methods: {
sendPaymentMsgAll(){},
async sendPaymentMsg(row){
const confirm = await this.$confirm("您确定对【"+ row.username +"】会员进行催缴吗?", '提示', {
confirmButtonText: '确定',
src/main/resources/views/platform/sys/login.html
+57 -32
View File
@@ -127,6 +127,18 @@
color: black;
}
.login-code{
display: inline-block;
float: right;
width: 38%;
height: 38px;
}
.login-code img{
vertical-align: middle;
cursor: pointer;
}
</style>
</head>
@@ -160,31 +172,49 @@
<h4 class="login-content-title ml15">
${AppName!}系统登录
</h4>
<el-tabs class="login-tabs">
<!--<el-tab-pane label="用户名登录" name="1">
<el-tabs class="login-tabs" v-model="activeName">
<el-tab-pane label="用户名登录" name="1">
<el-form v-if="activeName == '1'" :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
ref="loginForm">
<el-form-item prop="username">
<el-input
placeholder="请输入用户名"
placeholder="账号或手机号码"
prefix-icon="el-icon-user"
type="text"
v-model="loginForm.username">
v-model="loginForm.username"
>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
@keyup.enter.native="doLogin"
placeholder="请输入密码"
placeholder="密码"
prefix-icon="el-icon-lock"
type="password"
v-model="loginForm.password">
v-model="loginForm.password"
>
</el-input>
</el-form-item>
<el-form-item prop="platformCaptcha">
<el-input
@keyup.enter.native="doLogin"
placeholder="验证码"
prefix-icon="el-icon-lock"
style="width: 60%"
type="password"
v-model="loginForm.platformCaptcha"
>
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCodeUsername" alt="">
</div>
</el-form-item>
<el-form-item>
<el-button :disabled="disabled"
:loading="loading"
@click.native.prevent="handleLogin"
@click.native.prevent="doLogin"
class="login-button"
type="primary">
<span v-if="!loading">登 录</span>
@@ -192,9 +222,9 @@
</el-button>
</el-form-item>
</el-form>
</el-tab-pane>-->
<el-tab-pane label="短信快捷登陆">
<el-form :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
</el-tab-pane>
<el-tab-pane label="短信快捷登陆" name="2">
<el-form v-if="activeName == '2'" :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
ref="loginForm">
<el-form-item prop="mobile">
<el-input
@@ -258,6 +288,7 @@
timer: null,
// 是否显示滑块验证
isShowSliderVerify: false,
activeName: '1',
loginForm: {
username: '',
password: '',
@@ -285,6 +316,7 @@
},
loading: false,
disabled: false,
codeUrl: "${base!}/platform/login/captcha",
}
},
components: {
@@ -389,7 +421,11 @@
async doLogin() {
const valid = await this.$refs['loginForm'].validate()
if (valid) {
this.loginForm.loginType = 'SMS_CODE'
if (this.activeName === '2'){
this.loginForm.loginType = 'SMS_CODE'
} else {
this.loginForm.loginType = null
}
const resp = await $.post('${base!}/platform/login/doLogin', this.loginForm)
if (resp.code === 0) {
this.$message.success(resp.msg)
@@ -408,26 +444,6 @@
this.isShowSliderVerify = false;
}
}
/*$.post(url, self.loginForm, function (d) {
if (d.code == 0) {
self.$refs.sliderVerify.verifySuccessEvent();
self.$message({
showClose: true,
type: 'success',
message: '登录成功，正在跳转首页...',
duration: 1000
});
setTimeout(() => {
window.location.href = "${base!}/platform/home"
}, 500);
} else {
self.$message({
message: d.msg,
type: 'error'
})
self.isShowSliderVerify = false;
}
}, "json");*/
},
getQueryString(name) {
const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
@@ -451,10 +467,19 @@
isMobile = true;
}
return isMobile;
},
async getCodeUsername() {
const {data} = await $.get('/platform/login/captcha')
this.codeUrl = data.codeUrl
this.loginForm.platformKey = data.key
}
},
created() {
async created() {
this.year = new Date().getFullYear()
if (this.activeName === '1'){
await this.getCodeUsername()
}
},
mounted() {
window.addEventListener('pageshow', (event) => {