From 18f298b879d20eac577a2f62189e214ff78406bb Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 23 Apr 2025 17:45:45 +0800 Subject: [PATCH] commit --- .../sys/club/ClubUserCountController.java | 4 +- .../impl/SysLocalProcessServiceImpl.java | 5 +- .../basic/ActivityBasicScopeController.java | 2 +- .../RetiredGroupManageController.java | 2 +- .../RetiredPartyBranchManageController.java | 2 +- .../controller/RetiredUserListController.java | 5 +- .../user/mode/RetiredUserTemplate.java | 46 ++++---- ...MemberApplyBranchUnionAuditController.java | 74 ++----------- .../apply/MemberApplyController.java | 20 +--- .../apply/MemberApplyMineController.java | 35 ++++++ ...MemberApplySchoolUnionAuditController.java | 102 ++++++------------ ...emberChangeBranchUnionAuditController.java | 2 +- .../service/impl/MemberCommonServiceImpl.java | 2 +- .../controller/SingleUserController.java | 33 ++++++ .../impl/SourceChangeManageServiceImpl.java | 2 +- .../thirtyteach/template/ThirtyTeachTemp.java | 2 +- .../impl/TrainSignUpActivityServiceImpl.java | 2 +- .../member/apply/branchUnionAudit/index.html | 15 ++- .../member/apply/schoolUnionAudit/index.html | 30 +----- .../views/mobile/welfare/list/receive.html | 2 +- .../member/apply/branchUnionAudit/index.html | 13 ++- .../member/apply/schoolUnionAudit/index.html | 31 +----- .../platform/member/change/record/index.html | 2 +- .../platform/retired/partyBranch/manage.html | 2 + .../platform/specialstaff/manage/index.html | 2 +- .../platform/welfare/member/MemberMange.html | 6 +- 26 files changed, 183 insertions(+), 260 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java index f685f2b..2aeb422 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java @@ -229,6 +229,7 @@ public class ClubUserCountController { c.clubid FROM sys_club_user c + LEFT JOIN sys_club club ON club.id = c.clubid LEFT JOIN `user` u ON u.id = c.userid $condition ORDER BY FIELD( c.sf, 1, 3, 4, 5, 2 ) @@ -246,6 +247,7 @@ public class ClubUserCountController { cnd.andEX("c.giveMoney", "=", giveMoney); cnd.andEX("c.isNormal", "=", true); cnd.andEX("c.status", "=", 5); + cnd.and("club.state", "=", ClubRegistAuditState.SCHOOL_PASS); sql.setCondition(cnd); List listMap = baseService.listMap(sql); //获取所有协会 @@ -290,7 +292,7 @@ public class ClubUserCountController { LinkedHashMap> fileList = new LinkedHashMap<>(); //查询协会 - List clubList = dao.query(Sys_club.class, Cnd.NEW().andEX("id", "=", clubId)); + List clubList = dao.query(Sys_club.class, Cnd.NEW().andEX("id", "=", clubId).and("state", "=", ClubRegistAuditState.SCHOOL_PASS)); clubList.forEach(item -> { List file = new ArrayList<>(); file.addAll(item.getFiles() != null ? item.getFiles() : new ArrayList<>()); diff --git a/src/main/java/io/v/nutz/sys/services/impl/SysLocalProcessServiceImpl.java b/src/main/java/io/v/nutz/sys/services/impl/SysLocalProcessServiceImpl.java index 1d01020..8319f9f 100644 --- a/src/main/java/io/v/nutz/sys/services/impl/SysLocalProcessServiceImpl.java +++ b/src/main/java/io/v/nutz/sys/services/impl/SysLocalProcessServiceImpl.java @@ -172,7 +172,10 @@ public class SysLocalProcessServiceImpl implements SysLocalProcessService { .add("delFlag", 1), Cnd.where("id", "=", tasks.get(0).getId())); dao.update(Sys_local_process_instance_task.class, Chain.make("status", 1), Cnd.where("id", "=", tasks.get(1).getId())); dao.update(Sys_local_process_instance.class,Chain.make("processInstanceStatus",1).add("nodeName",taskNodeName),Cnd.where("processUniqueId","=",processUniqueId)); - }else{ + } else if(ObjectUtil.isNotEmpty(tasks) && tasks.size() == 1) { + dao.update(Sys_local_process_instance_task.class, Chain.make("status", 1), Cnd.where("id", "=", tasks.get(0).getId())); + dao.update(Sys_local_process_instance.class,Chain.make("processInstanceStatus",1).add("nodeName",taskNodeName),Cnd.where("processUniqueId","=",processUniqueId)); + } else{ throw new RuntimeException("无法撤回，请联系管理员！"); } } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java index ff4bc95..d1a570c 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java @@ -308,7 +308,7 @@ public class ActivityBasicScopeController { COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' - AND TABLE_SCHEMA = 'zhgh_hmc' + AND TABLE_SCHEMA = 'zhgh_zjitc' """); List sqlDataList = activityBasicScopeService.listMap(sql); // sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE")))); diff --git a/src/main/java/io/v/nutz/zhgh/retired/group/controller/RetiredGroupManageController.java b/src/main/java/io/v/nutz/zhgh/retired/group/controller/RetiredGroupManageController.java index 3e7db5b..9327261 100644 --- a/src/main/java/io/v/nutz/zhgh/retired/group/controller/RetiredGroupManageController.java +++ b/src/main/java/io/v/nutz/zhgh/retired/group/controller/RetiredGroupManageController.java @@ -232,7 +232,7 @@ public class RetiredGroupManageController { """); sql.setParam("groupId", groupId); Cnd cnd = Cnd.NEW(); - cnd.and("u.userState", "=", "不在职"); + cnd.and("u.retired", "=", 1); // cnd.and("u.personType", "=", "退休人员"); cnd.and("u.unitid", "in", Sqls.create("select unitId from retired_group_unit where retiredGroupId = @retiredGroupId").setParam("retiredGroupId", groupId)); diff --git a/src/main/java/io/v/nutz/zhgh/retired/partyBranch/controller/RetiredPartyBranchManageController.java b/src/main/java/io/v/nutz/zhgh/retired/partyBranch/controller/RetiredPartyBranchManageController.java index 318d3c2..a326a92 100644 --- a/src/main/java/io/v/nutz/zhgh/retired/partyBranch/controller/RetiredPartyBranchManageController.java +++ b/src/main/java/io/v/nutz/zhgh/retired/partyBranch/controller/RetiredPartyBranchManageController.java @@ -236,7 +236,7 @@ public class RetiredPartyBranchManageController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and("u.userState", "=", "退休"); + cnd.and("u.retired", "=", 1); cnd.and("u.political", "=", "中共党员"); cnd.and("rpbu.partyBranchId", "=", partyBranchId); if (StrUtil.isNotBlank(val)) { diff --git a/src/main/java/io/v/nutz/zhgh/retired/user/controller/RetiredUserListController.java b/src/main/java/io/v/nutz/zhgh/retired/user/controller/RetiredUserListController.java index 18db4f6..a369f8d 100644 --- a/src/main/java/io/v/nutz/zhgh/retired/user/controller/RetiredUserListController.java +++ b/src/main/java/io/v/nutz/zhgh/retired/user/controller/RetiredUserListController.java @@ -350,7 +350,10 @@ public class RetiredUserListController { ViTool.excelResponse(response, "离退休人员导入模版.xlsx"); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); - Workbook sheets = ExcelExportUtil.exportExcel(exportParams, RetiredUserTemplate.class, new ArrayList<>()); + List result = new ArrayList<>(); + NutMap map = new NutMap(); + result.add(map); + Workbook sheets = ExcelExportUtil.exportExcel(exportParams, RetiredUserTemplate.class, result); ServletOutputStream outputStream = response.getOutputStream(); sheets.write(outputStream); outputStream.close(); diff --git a/src/main/java/io/v/nutz/zhgh/retired/user/mode/RetiredUserTemplate.java b/src/main/java/io/v/nutz/zhgh/retired/user/mode/RetiredUserTemplate.java index b7ec03a..09fa9b1 100644 --- a/src/main/java/io/v/nutz/zhgh/retired/user/mode/RetiredUserTemplate.java +++ b/src/main/java/io/v/nutz/zhgh/retired/user/mode/RetiredUserTemplate.java @@ -13,73 +13,73 @@ import lombok.Data; @Data public class RetiredUserTemplate { -// @Excel(name = "工号") + @Excel(name = "工号", width = 20) private String loginName; - @Excel(name = "性质") + @Excel(name = "性质", width = 20) private String retireNature; - @Excel(name = "姓名") + @Excel(name = "姓名", width = 20) private String username; - @Excel(name = "性别") + @Excel(name = "性别", width = 20) private String sex; - @Excel(name = "民族") + @Excel(name = "民族", width = 20) private String nation; - @Excel(name = "出生年月",importFormat = "yyyy-MM") + @Excel(name = "出生年月",importFormat = "yyyy-MM", width = 20) private String birthday; - @Excel(name = "入党时间",importFormat = "yyyy-MM") + @Excel(name = "入党时间",importFormat = "yyyy-MM", width = 20) private String partyJoiningTime; - @Excel(name = "所属支部") + @Excel(name = "所属支部", width = 20) private String belongBranch; - @Excel(name = "工作时间",importFormat = "yyyy-MM") + @Excel(name = "工作时间",importFormat = "yyyy-MM", width = 20) private String workStartDate; - @Excel(name = "进校时间",importFormat = "yyyy-MM") + @Excel(name = "进校时间",importFormat = "yyyy-MM", width = 20) private String schoolTime; - @Excel(name = "文化程度") + @Excel(name = "文化程度", width = 20) private String education; - @Excel(name = "籍贯") + @Excel(name = "籍贯", width = 20) private String hometown; - @Excel(name = "职称") + @Excel(name = "职称", width = 20) private String jobTitle; - @Excel(name = "待遇") + @Excel(name = "待遇", width = 20) private String treatment; - @Excel(name = "退休时间",importFormat = "yyyy-MM") + @Excel(name = "退休时间",importFormat = "yyyy-MM", width = 20) private String retirementTime; - @Excel(name = "身份证号码") + @Excel(name = "身份证号码", width = 20) private String idCard; - @Excel(name = "医疗证号") + @Excel(name = "医疗证号", width = 20) private String medicalCertificateNumber; - @Excel(name = "基础病信息") + @Excel(name = "基础病信息", width = 20) private String basicDiseaseInfo; - @Excel(name = "原部门") + @Excel(name = "原部门", width = 20) private String originalDepartment; - @Excel(name = "家属姓名") + @Excel(name = "家属姓名", width = 20) private String familyName; - @Excel(name = "家庭住址") + @Excel(name = "家庭住址", width = 20) private String homeAddress; - @Excel(name = "联系方式") + @Excel(name = "联系方式", width = 20) private String retirePhone; - @Excel(name = "备注") + @Excel(name = "备注", width = 20) private String retireNotes; private String errorMsg; diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java index 492a17a..61aa63e 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java @@ -5,10 +5,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; -import com.alibaba.fastjson.JSON; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Audit; -import io.v.nutz.base.model.msgUser; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_union; @@ -40,7 +38,6 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import java.util.ArrayList; import java.util.List; /** @@ -97,9 +94,9 @@ public class MemberApplyBranchUnionAuditController { cnd.and("record.allocationUnionId", "=", Vi.getUnionId()); } if (pageForm.getAudit()) { - cnd.and("record.applyStateId", ">", 50); + cnd.and("record.applyStateId", ">", 20); } else { - cnd.and("record.applyStateId", "=", 50); + cnd.and("record.applyStateId", "=", 20); } cnd.desc("record.applyDateTime"); sql.setCondition(cnd); @@ -124,13 +121,13 @@ public class MemberApplyBranchUnionAuditController { MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); if (audit.getAuditType() == 2) { // 退回修改 - record.setApplyStateId(60); + record.setApplyStateId(30); } else if (audit.getAuditType() == 1) { // 通过 - record.setApplyStateId(80); + record.setApplyStateId(50); } else { // 拒绝 - record.setApplyStateId(70); + record.setApplyStateId(40); } record.setBranchUnionAuditId(audit.getId()); @@ -142,62 +139,9 @@ public class MemberApplyBranchUnionAuditController { if (audit.getAuditType() == 2) { MemberApplyToDoHandler.CREATE_APPLY_RE_MODIFY_TASK.exec(record, null); } else if (audit.getAuditType() == 1) { - // 判断是否改变了工会关系 - User user = dao.fetch(User.class, Cnd.where("id", "=", record.getUserId())); - - if (!ObjectUtil.equals(user.getUnionid(), record.getAllocationUnionId())) { - if (dao.count(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())) > 0) { - dao.clear(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())); - user = dao.fetch(User.class, Cnd.where("id", "=", record.getUserId())); - } - - if (!ObjectUtil.equals(user.getUnionid(), record.getAllocationUnionId())) { - SpecialStaff staff = new SpecialStaff(); - staff.setUserId(record.getUserId()); - staff.setPersonnelRelationUnitId(user.getUnitid()); - staff.setPersonnelRelationUnitName(user.getUnitname()); - staff.setUnionRelationUnionId(union.getId()); - staff.setUnionRelationUnionName(union.getUnionname()); - staff.setIsManyUnit(false); - staff.setSpecialStaffType("HMC_RELATION"); - dao.insert(staff); - } - } - - Sys_user sysUser = new Sys_user(); - BeanUtil.copyProperties(record, sysUser); - sysUser.setId(user.getId()); - dao.updateIgnoreNull(sysUser); - - MemberApplyToDoHandler.COMPLETE_PROCESS.exec(record, null); - String content = "尊敬的%s老师，您已正式成为杭医工会会员，会员关系在%s，欢迎您的加入！" - .formatted(user.getUsername(), union.getUnionname()); - System.out.println(content); - sysUserService.deleteCacheAndUpdate(record.getUserId()); - msgUser msgUser=new msgUser(); - msgUser.setName("User"); - msgUser.setUserId(sysUser.getLoginname()); - msgUser.setName(sysUser.getUsername()); - List users = new ArrayList<>(); - users.add(msgUser); - msgApi.sendMsg("入会结果通知", content, 1, 1, "SMS", users,""); - //msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "入会结果通知", content, "", ""); + MemberApplyToDoHandler.CREATE_SCHOOL_TASK.exec(record, null); } else { - // 杭州医学院，分工会拒绝接收，还要去创建校工会的审核任务 - MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会拒绝接收")); - MemberApplyToDoHandler.CREATE_SCHOOL_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核")); - String content = "工会主管您好，%s分拒绝接收%s老师，拒绝原因：%s，请您及时联系该分工会负责人或将工会关系划入其他工会。点击此消息或登录“智慧工会”可重新分配工会关系" - .formatted(union.getUnionname(), record.getUsername(), audit.getAuditOpinion()); - String linkUrl = Globals.AppDomain + "/platform/member/apply/schoolUnion/audit/h5"; - System.out.println(content); - //msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 2, "入会结果通知", content, "", linkUrl); - msgUser user=new msgUser(); - user.setName("User"); - user.setUserId(record.getLoginname()); - user.setName(record.getUsername()); - List users = new ArrayList<>(); - users.add(user); - msgApi.sendMsg("入会结果通知", content, 1, 1, "SMS", users,linkUrl); + MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会审核拒绝")); } return null; } @@ -210,11 +154,11 @@ public class MemberApplyBranchUnionAuditController { @SLog(type = "memberApply", tag = "会员入会申请", msg = "分工会撤回") public Object doRevoke(String id){ MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); - dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 50) + dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 20) .add("branchUnionAuditId", null), Cnd.where("id", "=", id)); dao.clear(Audit.class, Cnd.where("id", "=", record.getBranchUnionAuditId())); // 待办撤回 - localProcessService.revokeTask("MEMBER_APPLY@" + id, "分工会接收"); + localProcessService.revokeTask("MEMBER_APPLY@" + id, "待分工会审核"); return null; } } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java index 38abd2e..8e598ed 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java @@ -2,7 +2,6 @@ package io.v.nutz.zhgh.staffmanage.member.controller.apply; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.model.msgUser; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Roles; import io.v.nutz.sys.models.Sys_user_role; @@ -120,29 +119,14 @@ public class MemberApplyController { if (record.getApplyStateId() != null && List.of(30, 60).contains(record.getApplyStateId())) { MemberApplyToDoHandler.COMPLETE_APPLY_RE_MODIFY_TASK.exec(record, NutMap.NEW().addv("nodeName", "重新修改申请")); } - // 待校工会审核 + // 待分工会审核 record.setApplyStateId(20); dao.insertOrUpdate(record); // 审核流程开始 MemberApplyToDoHandler.START_PROCESS.exec(record, null); - MemberApplyToDoHandler.CREATE_SCHOOL_TASK.exec(record, null); + MemberApplyToDoHandler.CREATE_UNION_TASK.exec(record, null); - // 短信通知 - List schoolLoginNameList = commonService.getSchoolOrBranchUnionMemberAdminLoginNames("school", null); - List users = schoolLoginNameList.stream().map(item -> { - msgUser user = new msgUser(); - user.setType("User"); - user.setUserId(item); - return user; - }).collect(Collectors.toList()); - //String schoolLoginNameListStr = schoolLoginNameList.stream().distinct().collect(Collectors.joining(",")); - - String content = "%s老师正申请加入工会，请您点击此条消息或登录“智慧工会”进行审核".formatted(record.getUsername()); - String linkUrl = Globals.AppDomain + "/platform/member/apply/schoolUnion/audit/h5"; - - //msgApi.sendMsg(List.of("DingTalk"), schoolLoginNameListStr, 2, "入会审核通知", content, "", linkUrl); - msgApi.sendMsg("入会审核通知", content, 1, 1, "SMS", users,linkUrl); return null; } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java index a11305e..3c5e8f2 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java @@ -1,11 +1,15 @@ package io.v.nutz.zhgh.staffmanage.member.controller.apply; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Audit; import io.v.nutz.base.utils.Vi; +import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysLocalProcessService; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; @@ -28,6 +32,13 @@ import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * @version 1.0 * @Author zzr @@ -145,4 +156,28 @@ public class MemberApplyMineController { } return nutMap; } + + + @At + @Ok("void") + @RequiresPermissions("member.apply.mine") + @SLog(tag = "会员入会申请", msg = "导出开卡证明") + public void doExportProve(HttpServletResponse response){ + try { + User user = dao.fetch(User.class, Cnd.where("id","=",ShiroUtil.getUserId())); + Map map = new HashMap(); + map.put("userName", user.getUsername()); + map.put("unitName", user.getUnitname()); + map.put("idCard", user.getIdcard()); + map.put("date", DateUtil.format(new Date(),"yyyy年MM月dd日")); + response.addHeader("Content-Type", "application/octet-stream"); + response.addHeader("Content-Disposition", "attachment; filename=\"" + new String("办卡申请".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".docx"); + Configure config = Configure.newBuilder().build(); + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/member/addIdCard.docx"); + XWPFTemplate.compile(inputStream, config).render(map, response.getOutputStream()); + inputStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java index a07dece..8961ec1 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java @@ -1,14 +1,18 @@ package io.v.nutz.zhgh.staffmanage.member.controller.apply; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; -import com.alibaba.fastjson.JSON; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Audit; -import io.v.nutz.base.model.msgUser; import io.v.nutz.base.utils.MsgApi; +import io.v.nutz.base.utils.Roles; +import io.v.nutz.sys.models.Sys_user; +import io.v.nutz.sys.models.Sys_user_role; +import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysLocalProcessService; +import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; @@ -32,7 +36,6 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import java.util.ArrayList; import java.util.List; /** @@ -50,11 +53,13 @@ public class MemberApplySchoolUnionAuditController { @Inject private Dao dao; @Inject + private MsgApi msgApi; + @Inject + private SysUserService sysUserService; + @Inject private MemberCommonService memberCommonService; @Inject private SysLocalProcessService localProcessService; - @Inject - private MsgApi msgApi; @At("/") @Ok("beetl:/platform/member/apply/schoolUnionAudit/index.html") @@ -85,10 +90,9 @@ public class MemberApplySchoolUnionAuditController { Cnd cnd = Cnd.NEW(); pageForm.buildSearch(cnd, "record."); if (pageForm.getAudit()) { - cnd.and("record.applyStateId", ">", 20); - cnd.and("record.applyStateId", "!=", 70); + cnd.and("record.applyStateId", ">", 50); } else { - cnd.and("record.applyStateId", "in", List.of(20, 70)); + cnd.and("record.applyStateId", "=", 50); } cnd.desc("record.applyDateTime"); sql.setCondition(cnd); @@ -102,7 +106,7 @@ public class MemberApplySchoolUnionAuditController { @Aop(TransAop.READ_COMMITTED) @RequiresPermissions("member.apply.schoolUnion.audit") @SLog(type = "memberApply", tag = "会员入会申请", msg = "校工会审核") - public Object approval(@Param("audit") Audit audit, String id, String unionId) { + public Object approval(@Param("audit") Audit audit, String id) { audit.setAuditor(ShiroUtil.getUserId()); audit.setLoginname(ShiroUtil.getPlatformLoginname()); audit.setUsername(ShiroUtil.getPlatformUsername()); @@ -112,77 +116,42 @@ public class MemberApplySchoolUnionAuditController { MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); if (audit.getAuditType() == 2) { // 退回修改 - record.setApplyStateId(30); + record.setApplyStateId(60); } else if (audit.getAuditType() == 1) { // 通过 - record.setApplyStateId(50); + record.setApplyStateId(80); } else { // 拒绝 - record.setApplyStateId(40); + record.setApplyStateId(70); } - record.setAllocationUnionId(unionId); record.setSchoolUnionAuditId(audit.getId()); dao.updateIgnoreNull(record); MemberApplyToDoHandler.COMPLETE_SCHOOL_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核完成")); if (audit.getAuditType() == 2) { MemberApplyToDoHandler.CREATE_APPLY_RE_MODIFY_TASK.exec(record, null); - // 短信通知 -// String content = "%s老师您好，您的入会申请被校工会退回，您可根据退回原因修改后再次提交，如有疑问请及时联系校工会".formatted(record.getUsername()); } else if (audit.getAuditType() == 1) { - Sql sql = Sqls.create(""" - SELECT - u.loginname, - u.username, - u.unionname - FROM - `sys_user_role` userRole - LEFT JOIN sys_role role ON role.id = userRole.roleId - LEFT JOIN `user` u ON u.id = userRole.userId - WHERE - role.`code` = 'BranchUnionMemberAdmin' and u.unionid = @unionId - group by u.loginname - """).setParam("unionId", unionId); - List list = memberCommonService.listMap(sql); + MemberApplyToDoHandler.COMPLETE_PROCESS.exec(record, null); + // 将填写内容修改到用户表 + User user = dao.fetch(User.class, Cnd.where("id", "=", record.getUserId())); + Sys_user sysUser = new Sys_user(); + BeanUtil.copyProperties(record, sysUser); + sysUser.setId(user.getId()); + dao.updateIgnoreNull(sysUser); - if (Lang.isNotEmpty(list)) { - List unionLeaderLoginNames = list.stream().map(v -> v.getString("loginname")).toList(); - MemberApplyToDoHandler.CREATE_UNION_TASK.exec(record, NutMap.NEW().addv("unionLeaderLoginNames", unionLeaderLoginNames)); - - // 获取审核人的工会 - NutMap nutMap = list.stream().findFirst().orElse(NutMap.NEW()); - String unionname = nutMap.getString("unionname"); - // 短信通知 - String linkUrl = Globals.AppDomain + "/platform/member/apply/branchUnion/audit/h5"; - for (NutMap map : list) { - String content = "%s，%s老师的入会申请已经通过校工会审核，现将工会关系转入您处，请点击此消息或登录“智慧工会”办理新会员接收手续。" - .formatted(unionname, record.getUsername()); - System.out.println(content); - msgUser user=new msgUser(); - user.setName("User"); - user.setUserId(map.getString("loginname")); - user.setName(map.getString("username")); - List users = new ArrayList<>(); - users.add(user); - //msgApi.sendMsg(List.of("DingTalk"), map.getString("loginname"), 2, "会员入会审核通知", content, "", linkUrl); - msgApi.sendMsg("会员入会审核通知", content, 1, 1, "SMS", users,linkUrl); - - } + // 还要设置会员角色 + int count = dao.count(Sys_user_role.class, Cnd.where("userId", "=", user.getId()).and("roleId", "=", Roles.MEMBER)); + if (count == 0) { + Sys_user_role userRole = new Sys_user_role(); + userRole.setUserId(user.getId()); + userRole.setRoleId(Roles.MEMBER); + dao.insert(userRole); } + + sysUserService.deleteCacheAndUpdate(user.getId()); } else { MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核拒绝")); - msgUser user=new msgUser(); - user.setName("User"); - user.setUserId(record.getLoginname()); - user.setName(record.getUsername()); - List users = new ArrayList<>(); - users.add(user); - // 短信通知 - String content = "尊敬的%s老师，您的入会申请未被通过，若有疑问请联系校工会，联系电话87692636".formatted(record.getUsername()); - System.out.println(content); - //msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "会员入会结果通知", content, "", ""); - msgApi.sendMsg("会员入会结果通知", content, 1, 1, "SMS", users,""); } return null; } @@ -195,12 +164,11 @@ public class MemberApplySchoolUnionAuditController { @SLog(type = "memberApply", tag = "会员入会申请", msg = "校工会撤回") public Object doRevoke(String id) { MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); - dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 20) - .add("schoolUnionAuditId", null).add("allocationUnionId", null) - , Cnd.where("id", "=", id)); + dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 50) + .add("schoolUnionAuditId", null), Cnd.where("id", "=", id)); dao.clear(Audit.class, Cnd.where("id", "=", record.getSchoolUnionAuditId())); // 待办撤回 - localProcessService.revokeTask("MEMBER_APPLY@" + id, "校工会审核"); + localProcessService.revokeTask("MEMBER_APPLY@" + id, "待校工会审核"); return null; } } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java index 8c20a58..20e97a1 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java @@ -75,7 +75,7 @@ public class MemberChangeBranchUnionAuditController { """); Cnd cnd = Cnd.NEW(); if (!ShiroUtil.hasAnyRoles("sysadmin, A06, SchoolUnionMemberAdmin")) { - cnd.and("record.allocationUnionId", "=", Vi.getUnionId()); + cnd.and("record.unionId", "=", Vi.getUnionId()); } pageForm.buildSearch(cnd, "record."); if (pageForm.getAudit()) { 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 2d0197d..ea505ae 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 @@ -336,7 +336,7 @@ public class MemberCommonServiceImpl extends ViServiceImpl implements staff.setUnionRelationUnionId(union.getId()); staff.setUnionRelationUnionName(union.getUnionname()); staff.setIsManyUnit(false); - staff.setSpecialStaffType("HMC_RELATION"); + staff.setSpecialStaffType("ZJITC_RELATION"); dao().insert(staff); } } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/single/controller/SingleUserController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/single/controller/SingleUserController.java index 7260a88..85dc768 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/single/controller/SingleUserController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/single/controller/SingleUserController.java @@ -4,12 +4,14 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.result.Result; import io.v.nutz.base.utils.ViTool; import io.v.nutz.sys.models.Sys_user; +import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.zhgh.staffmanage.single.service.SingleUserService; import io.v.nutz.zhgh.staffmanage.thirtyteach.template.ThirtyTeachTemp; import org.apache.poi.ss.usermodel.Workbook; @@ -135,6 +137,37 @@ public class SingleUserController { } } + @At + @ViReturn + @SLog(tag = "单身教工", msg = "删除", param = true, result = true) + public Object delete(String userId) { + singleUserService.update(Chain.make("marriage", "已婚"), Cnd.where("id", "=", userId)); + return null; + } + + + /** + * 导入模板下载 + * @param response + */ + @At + @Ok("void") + public void downloadImport(HttpServletResponse response) { + try { + ViTool.excelResponse(response, "单身教工导入模版.xlsx"); + ExportParams exportParams = new ExportParams(); + List list = new ArrayList<>(); + list.add(new ExcelExportEntity("工号", "loginName", 20)); + list.add(new ExcelExportEntity("姓名", "userName", 20)); + list.add(new ExcelExportEntity("身份证号码", "idCard", 20)); + list.add(new ExcelExportEntity("出生年月", "birthday", 20)); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, list, new ArrayList<>()); + workbook.write(response.getOutputStream()); + } catch (Exception e) { + e.printStackTrace(); + } + } @At @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java index 9d9afab..cf021bb 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java @@ -219,7 +219,7 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl { diff --git a/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html b/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html index 479cdb8..9bbfbe3 100644 --- a/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html @@ -71,7 +71,7 @@ layout("/mobile/platform.html"){
- + 工作单位：{{item.unitName}} 所属工会：{{item.unionName}} - 分配工会：{{item.allocationUnionName}} 在职状态：{{item.userState}} 人员类型：{{item.personType}} @@ -121,12 +120,12 @@ layout("/mobile/platform.html"){ type="info" style="margin-right: 4px">查看 审核 撤回 @@ -145,13 +144,11 @@ layout("/mobile/platform.html"){
-
{{ '分工会接收' }}
+
{{ '分工会审核' }}
- +
取消 @@ -236,7 +233,7 @@ layout("/mobile/platform.html"){ } let msg = '确定要通过此条申请吗？' if (approvalType === 0) { - msg = '确定要拒绝接收该教工的工会关系吗？' + msg = '拒绝后不可撤回，确定要拒绝此条申请吗？' } else if (approvalType === 2) { msg = '确定要退回此条申请吗？' } diff --git a/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html b/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html index aef8641..b5cac28 100644 --- a/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html @@ -105,7 +105,6 @@ layout("/mobile/platform.html"){ 工作单位：{{item.unitName}} 所属工会：{{item.unionName}} - 分配工会：{{item.allocationUnionName}} 在职状态：{{item.userState}} 人员类型：{{item.personType}} @@ -123,12 +122,12 @@ layout("/mobile/platform.html"){ type="info" style="margin-right: 4px">查看 {{ item.applyStateId === 70 ? '重新审核' : '审核' }} + style="margin-right: 4px">审核 撤回 @@ -152,22 +151,7 @@ layout("/mobile/platform.html"){ - - - - - +
取消 @@ -262,11 +246,6 @@ layout("/mobile/platform.html"){ this.$toast.fail('请填写审核意见') return } - if (!this.formData.unionId) { - this.$toast.fail('请选择分配工会') - return - } - let msg = '确定要通过此条申请吗？' if (approvalType === 0) { msg = '拒绝后不可撤回，确定要拒绝此条申请吗？' @@ -282,7 +261,6 @@ layout("/mobile/platform.html"){ const resp = await $.post('/platform/member/apply/schoolUnion/audit/approval', { audit: JSON.stringify(this.formData), id: this.id, - unionId: this.formData.unionId }) if (resp.code === 0) { this.$toast.success(resp.msg) diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index a1ab564..426f100 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -656,7 +656,7 @@ layout("/mobile/platform.html"){ this.confirmPopup = false await this.getProjectInfo() setTimeout(() => { - window.location.reload() + pjaxReplace('/mobile/welfare/mine/myWelfare') }, 1000) }, diff --git a/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html b/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html index 5e22af0..f2dc0cf 100644 --- a/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html +++ b/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html @@ -45,8 +45,8 @@ layout("/layouts/platform.html"){ @@ -57,7 +57,7 @@ layout("/layouts/platform.html"){ @@ -116,8 +116,7 @@ layout("/layouts/platform.html"){ { prop: "personType", label: "人员类型", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, - { prop: "allocationUnionName", label: "分配工会", sortable: true }, - { prop: "sign", label: "签字" }, + // { prop: "sign", label: "签字" }, { prop: "stateName", label: "当前节点", sortable: true } ], diff --git a/src/main/resources/views/platform/member/apply/schoolUnionAudit/index.html b/src/main/resources/views/platform/member/apply/schoolUnionAudit/index.html index bf14c56..57cc6f8 100644 --- a/src/main/resources/views/platform/member/apply/schoolUnionAudit/index.html +++ b/src/main/resources/views/platform/member/apply/schoolUnionAudit/index.html @@ -45,10 +45,8 @@ layout("/layouts/platform.html"){ @@ -74,23 +72,6 @@ layout("/layouts/platform.html"){ - - - - - - - - - - - - - - - @@ -137,8 +118,7 @@ layout("/layouts/platform.html"){ { prop: "personType", label: "人员类型", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, - { prop: "allocationUnionName", label: "分配工会", sortable: true }, - { prop: "sign", label: "签字" }, + // { prop: "sign", label: "签字" }, { prop: "stateName", label: "当前节点", sortable: true } ], @@ -175,11 +155,6 @@ layout("/layouts/platform.html"){ }) }, doApproval(approvalType){ - if (approvalType === 1 && !this.formData.unionId) { - this.$message.warning('请分配工会关系') - return - } - let msg = '确定要通过此条申请吗？' if (approvalType === 0) { msg = '拒绝后不可撤回，确定要拒绝此条申请吗？' diff --git a/src/main/resources/views/platform/member/change/record/index.html b/src/main/resources/views/platform/member/change/record/index.html index 91ab285..76b8515 100644 --- a/src/main/resources/views/platform/member/change/record/index.html +++ b/src/main/resources/views/platform/member/change/record/index.html @@ -167,7 +167,7 @@ layout("/layouts/platform.html"){ label="操作" width="100px" fixed="right"> diff --git a/src/main/resources/views/platform/retired/partyBranch/manage.html b/src/main/resources/views/platform/retired/partyBranch/manage.html index 293a5b8..130caee 100644 --- a/src/main/resources/views/platform/retired/partyBranch/manage.html +++ b/src/main/resources/views/platform/retired/partyBranch/manage.html @@ -218,6 +218,7 @@ layout("/layouts/platform.html"){ + @@ -245,6 +246,7 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/specialstaff/manage/index.html b/src/main/resources/views/platform/specialstaff/manage/index.html index d196238..9f5fe4c 100644 --- a/src/main/resources/views/platform/specialstaff/manage/index.html +++ b/src/main/resources/views/platform/specialstaff/manage/index.html @@ -238,7 +238,7 @@ layout("/layouts/platform.html"){ -