diff --git a/src/main/java/com/budwk/app/base/constant/RoleConstant.java b/src/main/java/com/budwk/app/base/constant/RoleConstant.java index ab3f6e9..718b076 100644 --- a/src/main/java/com/budwk/app/base/constant/RoleConstant.java +++ b/src/main/java/com/budwk/app/base/constant/RoleConstant.java @@ -20,6 +20,7 @@ RoleConstant { SCHOOL_UNION_CHAIRMAN("校工会主席"), SCHOOL_UNION_VICE_CHAIRMAN("校工会副主席"), SCHOOL_UNION_WELFARE_ADMIN("校工会福利管理员"), + SCHOOL_UNION_WELFARE_COMMITTEE("校福利委员会"), SCHOOL_UNION_MEMBER_ADMIN("校工会会员管理员"), SCHOOL_UNION_TC_ADMIN("校工会教代会管理员"), SCHOOL_UNION_WC_ADMIN("校工会工代会管理员"), diff --git a/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionWelfareCommitteeHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionWelfareCommitteeHandler.java new file mode 100644 index 0000000..f1332fc --- /dev/null +++ b/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionWelfareCommitteeHandler.java @@ -0,0 +1,47 @@ +package com.budwk.app.flow.handler; + +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.exception.BaseException; +import com.budwk.app.flow.engine.AssignmentHandler; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.engine.model.TaskModel; +import com.budwk.app.sys.models.Sys_role; +import com.budwk.app.sys.models.Sys_user_role; +import com.budwk.app.sys.services.SysRoleService; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; + +import java.util.List; + +public class FlowSchoolUnionWelfareCommitteeHandler implements AssignmentHandler { + @Override + public List assign(TaskModel model, Execution execution) { + Dao dao = ServiceContext.find(Dao.class); + SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class); + Sys_role role = sysRoleService.getByCode(RoleConstant.SCHOOL_UNION_WELFARE_COMMITTEE); + if (role == null || role.isDisabled()) { + throw new BaseException("校福利委员会角色未配置或已禁用,请联系校工会!"); + } + List relations = dao.query(Sys_user_role.class, + Cnd.where(Sys_user_role::getRoleId, "=", role.getId()) + .and(Sys_user_role::getEnable, "=", true)); + List userIds = relations.stream().map(Sys_user_role::getUserId) + .filter(StrUtil::isNotBlank).distinct().toList(); + if (userIds.isEmpty()) { + throw new BaseException("校福利委员没有设置,请联系校工会!"); + } + return userIds; + } + + @Override + public String getMessage() { + return "获取校福利委员"; + } + + @Override + public int getOrder() { + return 14; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java similarity index 87% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java index 6bbecf2..226f878 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java @@ -27,34 +27,34 @@ import org.nutz.mvc.annotation.Param; import java.util.List; /** - * @ClassName CondolenceBranchUnionApprovalController + * @ClassName CondolenceFirstApprovalController * @Author JyuHsin * @Date 2025/7/28 11:33 * @Version 1.0 * @Description TODO */ @IocBean -@At("/platform/condolence/branchUnionApproval") -@Api("职工慰问分工会审核") +@At("/platform/condolence/firstApproval") +@Api("职工慰问一级审核") @Ok("json:full") -public class CondolenceBranchUnionApprovalController { +public class CondolenceFirstApprovalController { @Inject private CondolenceService condolenceService; @At("/") - @Ok("beetl:/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html") - @SaCheckPermission("condolence.branchUnionApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/condolence/firstApproval/index.html") + @SaCheckPermission("condolence.firstApproval") public void index() {} @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html") - @SaCheckPermission("h5.condolence.branchUnionApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/firstApproval/index.html") + @SaCheckPermission("h5.condolence.firstApproval") public void h5Index() {} @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.branchUnionApproval", "h5.condolence.branchUnionApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"condolence.firstApproval", "h5.condolence.firstApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSecondApprovalController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSecondApprovalController.java index 7e7de9d..e595e15 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSecondApprovalController.java @@ -29,30 +29,30 @@ import java.util.List; /** * @author zhf * @date 2025/12/23 14:13 - * @description 校工会预审 + * @description 二级审核 */ @IocBean -@At("/platform/condolence/schoolPrincipalApproval") -@Api("职工慰问校工会预审") +@At("/platform/condolence/secondApproval") +@Api("职工慰问二级审核") @Ok("json:full") -public class CondolenceSchoolPrincipalApprovalController { +public class CondolenceSecondApprovalController { @Inject private CondolenceService condolenceService; @At("/") - @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html") - @SaCheckPermission("condolence.schoolPrincipalApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/condolence/secondApproval/index.html") + @SaCheckPermission("condolence.secondApproval") public void index() {} @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html") - @SaCheckPermission("h5.condolence.schoolPrincipalApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/secondApproval/index.html") + @SaCheckPermission("h5.condolence.secondApproval") public void h5Index() {} @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.schoolPrincipalApproval", "h5.condolence.schoolPrincipalApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"condolence.secondApproval", "h5.condolence.secondApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceThirdApprovalController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceThirdApprovalController.java index ac36de4..1dd392b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceThirdApprovalController.java @@ -27,34 +27,34 @@ import org.nutz.mvc.annotation.Param; import java.util.List; /** - * @ClassName CondolenceSchoolUnionApprovalController + * @ClassName CondolenceThirdApprovalController * @Author JyuHsin * @Date 2025/7/29 16:23 * @Version 1.0 * @Description TODO */ @IocBean -@At("/platform/condolence/schoolUnionApproval") -@Api("职工慰问校工会审核") +@At("/platform/condolence/thirdApproval") +@Api("职工慰问三级审核") @Ok("json:full") -public class CondolenceSchoolUnionApprovalController { +public class CondolenceThirdApprovalController { @Inject private CondolenceService condolenceService; @At("/") - @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckPermission("condolence.schoolUnionApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/condolence/thirdApproval/index.html") + @SaCheckPermission("condolence.thirdApproval") public void index() {} @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckPermission("h5.condolence.schoolUnionApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/thirdApproval/index.html") + @SaCheckPermission("h5.condolence.thirdApproval") public void h5Index() {} @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"condolence.thirdApproval", "h5.condolence.thirdApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpFirstApprovalController.java similarity index 84% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpFirstApprovalController.java index f07fbc7..7bfda09 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpFirstApprovalController.java @@ -25,15 +25,15 @@ import java.util.List; /** * @version 1.0 * @Author zzr - * @name:DifficultHelpBranchUnionApprovalController + * @name:DifficultHelpFirstApprovalController * @Date 2025/7/31 11:47 * @注释 */ @IocBean @Ok("json") -@ApiOperation("困难补助分工会审核") -@At("/platform/difficultHelp/branchUnionApproval") -public class DifficultHelpBranchUnionApprovalController { +@ApiOperation("困难补助一级审核") +@At("/platform/difficultHelp/firstApproval") +public class DifficultHelpFirstApprovalController { @Inject private Dao dao; @@ -41,27 +41,27 @@ public class DifficultHelpBranchUnionApprovalController { private DifficultHelpCommonService difficultHelpCommonService; @At("") - @SaCheckPermission("difficultHelp.branchUnionApproval") - @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html") + @SaCheckPermission("difficultHelp.firstApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/firstApproval/index.html") public void index() { } @At - @SaCheckPermission("difficultHelp.branchUnionApproval") - @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html") + @SaCheckPermission("difficultHelp.firstApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/firstApproval/form.html") public void form() { } @At - @SaCheckPermission("h5.difficultHelp.branchUnionApproval") - @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html") + @SaCheckPermission("h5.difficultHelp.firstApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/firstApproval/index.html") public void h5() { } @At - @ApiOperation("困难补助分工会审核列表") - @SaCheckPermission("difficultHelp.branchUnionApproval") + @ApiOperation("困难补助一级审核列表") + @SaCheckPermission("difficultHelp.firstApproval") public Result pageData(DifficultHelpPageParam pageParam) { Sql sql = Sqls.create(""" SELECT diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionLeaderApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSecondApprovalController.java similarity index 85% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionLeaderApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSecondApprovalController.java index a3dd674..3714201 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionLeaderApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSecondApprovalController.java @@ -26,15 +26,15 @@ import java.util.List; /** * @version 1.0 * @Author zzr - * @name:DifficultHelpBranchUnionApprovalController + * @name:DifficultHelpSecondApprovalController * @Date 2025/7/31 11:47 * @注释 */ @IocBean @Ok("json") -@ApiOperation("困难补助二级党组织审核") -@At("/platform/difficultHelp/unionLeaderApproval") -public class DifficultHelpBranchUnionLeaderApprovalController { +@ApiOperation("困难补助二级审核") +@At("/platform/difficultHelp/secondApproval") +public class DifficultHelpSecondApprovalController { @Inject private Dao dao; @@ -42,27 +42,27 @@ public class DifficultHelpBranchUnionLeaderApprovalController { private DifficultHelpCommonService difficultHelpCommonService; @At("") - @SaCheckPermission("difficultHelp.unionLeaderApproval") - @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html") + @SaCheckPermission("difficultHelp.secondApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/secondApproval/index.html") public void index() { } @At - @SaCheckPermission("difficultHelp.unionLeaderApproval") - @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/form.html") + @SaCheckPermission("difficultHelp.secondApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/secondApproval/form.html") public void form() { } @At - @SaCheckPermission("h5.difficultHelp.unionLeaderApproval") - @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html") + @SaCheckPermission("h5.difficultHelp.secondApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/secondApproval/index.html") public void h5() { } @At - @ApiOperation("困难补助分工会审核列表") - @SaCheckPermission("difficultHelp.unionLeaderApproval") + @ApiOperation("困难补助二级审核列表") + @SaCheckPermission("difficultHelp.secondApproval") public Result pageData(DifficultHelpPageParam pageParam) { Sql sql = Sqls.create(""" SELECT diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpThirdApprovalController.java similarity index 85% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpThirdApprovalController.java index a778b68..fe09a0a 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpThirdApprovalController.java @@ -30,15 +30,15 @@ import java.util.List; /** * @version 1.0 * @Author zzr - * @name:DifficultHelpSchoolUnionApprovalController + * @name:DifficultHelpThirdApprovalController * @Date 2025/7/31 11:47 * @注释 */ @IocBean @Ok("json") -@ApiOperation("困难补助校工会审核") -@At("/platform/difficultHelp/schoolUnionApproval") -public class DifficultHelpSchoolUnionApprovalController { +@ApiOperation("困难补助三级审核") +@At("/platform/difficultHelp/thirdApproval") +public class DifficultHelpThirdApprovalController { @Inject private Dao dao; @@ -46,26 +46,26 @@ public class DifficultHelpSchoolUnionApprovalController { private DifficultHelpCommonService difficultHelpCommonService; @At("") - @SaCheckPermission("difficultHelp.schoolUnionApproval") - @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html") + @SaCheckPermission("difficultHelp.thirdApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/thirdApproval/index.html") public void index() { } @At - @SaCheckPermission("difficultHelp.schoolUnionApproval") - @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html") + @SaCheckPermission("difficultHelp.thirdApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/thirdApproval/form.html") public void form() { } @At - @SaCheckPermission("h5.difficultHelp.schoolUnionApproval") - @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html") + @SaCheckPermission("h5.difficultHelp.thirdApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/thirdApproval/index.html") public void h5() { } @At - @ApiOperation("困难补助校工会审核列表") - @SaCheckPermission("difficultHelp.schoolUnionApproval") + @ApiOperation("困难补助三级审核列表") + @SaCheckPermission("difficultHelp.thirdApproval") public Result pageData(DifficultHelpPageParam pageParam) { Sql sql = Sqls.create(""" SELECT @@ -131,7 +131,7 @@ public class DifficultHelpSchoolUnionApprovalController { @At @ApiOperation("保存补助金额、级别") - @SaCheckPermission("difficultHelp.schoolUnionApproval") + @SaCheckPermission("difficultHelp.thirdApproval") @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}") public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) { dao.updateIgnoreNull(difficultHelpInfo); diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js index d2bb27d..3bcf25f 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js @@ -43,7 +43,7 @@ const condolenceInfo = {