diff --git a/pom.xml b/pom.xml index bef51b8..6db6494 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 jar com.budwk - zhgh_whcp + zhgh-whcp 5.6.0-plus 2.6.0-SNAPSHOT diff --git a/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionViceChairmanHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionViceChairmanHandler.java new file mode 100644 index 0000000..41dfa8f --- /dev/null +++ b/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionViceChairmanHandler.java @@ -0,0 +1,50 @@ +package com.budwk.app.flow.handler; + +import com.budwk.app.base.constant.RoleConstant; +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 org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; + +import java.util.List; + +/** + * @author zhf + * @date 2026/1/12 17:33 + * @description 校工会副主席 + */ +public class FlowSchoolUnionViceChairmanHandler implements AssignmentHandler { + + @Override + public List assign(TaskModel model, Execution execution) { + Dao dao = ServiceContext.find(Dao.class); + Sql sql = Sqls.create(""" + SELECT + userRole.userId + FROM + `sys_user_role` userRole + LEFT JOIN sys_role role ON role.id = userRole.roleId + WHERE + role.`code` = @roleCode + GROUP BY + userRole.userId + """).setParam("roleCode", RoleConstant.SCHOOL_UNION_VICE_CHAIRMAN.name()); + sql.setCallback(Sqls.callback.strList()); + dao.execute(sql); + return sql.getList(String.class); + } + + + @Override + public String getMessage() { + return "获取校工会副主席"; + } + + @Override + public int getOrder() { + return AssignmentHandler.super.getOrder(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java index ed18832..67a9c77 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java @@ -171,14 +171,15 @@ public class UnionReimburseApplyController { seg.or(View_user::getUsername, "like", "%" + keyword + "%"); cnd.and(seg); } - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.and(View_user::getId, "!=", SecurityUtil.getUserId()); + /*if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId()); } else { cnd.and(View_user::getId, "=", SecurityUtil.getUserId()); } - } + }*/ sql.setCondition(cnd); Pagination pagination = unionReimburseService.listPageMap(1, 50, sql); return Result.success(pagination.getList()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/vo/UnionReimburseCollectExcelVO.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/vo/UnionReimburseCollectExcelVO.java index 379cd7d..8340009 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/vo/UnionReimburseCollectExcelVO.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/vo/UnionReimburseCollectExcelVO.java @@ -34,7 +34,6 @@ public class UnionReimburseCollectExcelVO implements Serializable { @Excel(name = "申请时间", width = 30) private String createTime; - @Excel(name = "经费来源", width = 30) private String reimburseFundSource; //活动名称 diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java index 5eecf9e..8adf600 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java @@ -242,4 +242,9 @@ public class MemberApplyRecord extends BaseModel { @Comment("家庭住址") @ColDefine(type = ColType.VARCHAR, width = 100) private String homeAddress; + + @Column + @Comment("来校时间") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String arrivalAtSchoolDate; } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java index 8675121..c68c3c1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java @@ -265,7 +265,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl imple sql.setParam("lastYear", currentYear - 1); sql.setParam("currentYear", currentYear); Cnd cnd = Cnd.NEW(); - cnd.and("dw.unitLevel", "=", 2); + cnd.and("dw.unitLevel", "=", 3); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("dw.unionId", "=", SecurityUtil.getUnionId()); } else { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html index 724fdef..54f44cf 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html @@ -135,15 +135,15 @@ layout("/layouts/platform.html"){ --> - - - - - - + + + + + + + + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js index 158038d..21b1c92 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js @@ -34,7 +34,7 @@ const unionReimburseInfo = { {{viewData.activityName}} {{viewData.activityPlace||'暂无'}} {{viewData.money}} - {{viewData.invoiceNumber}} + {{viewData.paymentNotes}} - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -55,16 +55,17 @@ layout("/layouts/platform.html"){ - +