From ad3be9603be94ed78aa2e81378550f2648292767 Mon Sep 17 00:00:00 2001 From: Paidax Date: Fri, 1 Aug 2025 17:44:35 +0800 Subject: [PATCH] commit --- .../ActivityDeclareApplyController.java | 129 +++++++ .../ActivityDeclareBranchUnionController.java | 56 +++ ...ctivityDeclareClubPrincipalController.java | 34 ++ ...ivityDeclareSchoolPrincipalController.java | 34 ++ .../ActivityDeclareSchoolUnionController.java | 33 ++ .../ActivityDeclareInterceptor.java | 11 + .../declare/models/ActivityDeclareInfo.java | 111 +++++- .../service/ActivityDeclareService.java | 14 + .../impl/ActivityDeclareServiceImpl.java | 22 ++ .../enums/ActivityDeclareReimbursement.java | 33 ++ .../ActivityReimbursementApplyController.java | 120 +++++++ ...ityReimbursementBranchUnionController.java | 33 ++ ...yReimbursementClubPrincipalController.java | 34 ++ ...eimbursementSchoolPrincipalController.java | 34 ++ ...ityReimbursementSchoolUnionController.java | 33 ++ .../ActivityReimbursementInterceptor.java | 11 + .../models/ActivityReimbursementInfo.java | 31 +- .../service/ActivityReimbursementService.java | 14 + .../ActivityReimbursementServiceImpl.java | 21 ++ .../vo/ActivityBudget.java | 44 +++ .../vo/CommonPageParam.java | 65 ++++ .../vo/DifficultHelpPageParam.java | 9 + .../declare/apply/form.html | 324 ++++++++++++++++++ .../declare/apply/index.html | 200 +++++++++++ .../declare/apply/view.html | 0 .../declare/branchunion/form.html | 0 .../declare/branchunion/index.html | 0 .../declare/clubprincipal/form.html | 0 .../declare/clubprincipal/index.html | 0 .../declare/schoolprincipal/form.html | 0 .../declare/schoolprincipal/index.html | 0 .../declare/schoolunion/form.html | 0 .../declare/schoolunion/index.html | 0 .../reimbursement/apply/form.html | 0 .../reimbursement/apply/index.html | 0 .../reimbursement/apply/view.html | 0 .../reimbursement/branchunion/form.html | 0 .../reimbursement/branchunion/index.html | 0 .../reimbursement/clubprincipal/form.html | 0 .../reimbursement/clubprincipal/index.html | 0 .../reimbursement/schoolprincipal/form.html | 0 .../reimbursement/schoolprincipal/index.html | 0 .../reimbursement/schoolunion/form.html | 0 .../reimbursement/schoolunion/index.html | 0 .../difficulthelp/apply/form.html | 2 +- .../difficulthelp/apply/index.html | 6 +- 46 files changed, 1450 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/interceptor/ActivityDeclareInterceptor.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/ActivityDeclareService.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/impl/ActivityDeclareServiceImpl.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBranchUnionController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolPrincipalController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolUnionController.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/interceptor/ActivityReimbursementInterceptor.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/ActivityReimbursementService.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/impl/ActivityReimbursementServiceImpl.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/ActivityBudget.java create mode 100644 src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/form.html create mode 100644 src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java index 535d886d..f7ccce8f 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java @@ -1,5 +1,30 @@ package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.engine.FlowEngine; +import com.budwk.app.zhgh.activity.declarereimbursement.vo.CommonPageParam; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityDeclareInfo; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.service.ActivityDeclareService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; + /** * @version 1.0 * @Author zzr @@ -7,5 +32,109 @@ package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; * @Date 2025/7/31 15:46 * @注释 */ +@IocBean +@Ok("json") +@ApiOperation("活动申报") +@At("/platform/activityDeclare/apply") public class ActivityDeclareApplyController { + + @Inject + private Dao dao; + @Inject + private FlowEngine flowEngine; + @Inject + private ActivityDeclareService activityDeclareService; + + @At("") + @SaCheckPermission("activityDeclare.apply") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/apply/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityDeclare.apply") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/apply/form.html") + public void form() { + } + + @At + @SaCheckPermission("activityDeclare.apply") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/apply/view.html") + public void view() { + } + + + @At + @ApiOperation("活动申报,我的申请列表") + @SaCheckPermission("activityDeclare.apply") + public Result pageData(CommonPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.userName, + info.loginName, + info.applyTime, + info.activityName, + info.activityAddress, + info.startTime, + info.endTime, + info.declareUnitName, + info.activityType, + info.activityContent, + info.activityNumber, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, + (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask') AS startTaskId + FROM + activity_declare_info info + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageParam.buildSearch(cnd, "info."); + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { + cnd.desc("info.applyTime"); + } else { + cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("活动申报,查看活动申报") + @SaCheckPermission("activityDeclare.apply") + public Result findOne(@Valid String id) { + ActivityDeclareInfo info = dao.fetch(ActivityDeclareInfo.class, id); + return Result.success().addData(info); + } + + + @At + @ApiOperation("删除活动申报") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.apply.submit") + @SLog(tag = "活动申报", msg = "删除活动申报id: ${args[0]}") + public Result onDelete(@Valid String id) { + dao.clear(ActivityDeclareInfo.class, Cnd.where("id", "=", id)); + // 删除流程相关 + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java new file mode 100644 index 00000000..66a864ba --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java @@ -0,0 +1,56 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.flow.engine.FlowEngine; +import com.budwk.app.zhgh.activity.declarereimbursement.vo.CommonPageParam; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.service.ActivityDeclareService; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareBranchUnionController + * @Date 2025/8/1 10:15 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,分工会管理员审核") +@At("/platform/activityDeclare/branchUnion") +public class ActivityDeclareBranchUnionController { + + @Inject + private Dao dao; + @Inject + private FlowEngine flowEngine; + @Inject + private ActivityDeclareService activityDeclareService; + + + @At("") + @SaCheckPermission("activityDeclare.branchUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityDeclare.branchUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/branchunion/form.html") + public void form() { + } + + + @At + @ApiOperation("分工会审核列表") + @SaCheckPermission("activityDeclare.branchUnion") + public Result pageData(CommonPageParam pageParam) { + return Result.success(); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java new file mode 100644 index 00000000..fcb7c0a9 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareClubPrincipalController + * @Date 2025/8/1 10:15 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,协会负责人审核") +@At("/platform/activityDeclare/clubPrincipal") +public class ActivityDeclareClubPrincipalController { + + + @At("") + @SaCheckPermission("activityDeclare.clubPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityDeclare.clubPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java new file mode 100644 index 00000000..a2d007dd --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareSchoolPrincipalController + * @Date 2025/8/1 10:16 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,校工会负责人审核") +@At("/platform/activityDeclare/schoolPrincipal") +public class ActivityDeclareSchoolPrincipalController { + + + @At("") + @SaCheckPermission("activityDeclare.schoolPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityDeclare.schoolPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java new file mode 100644 index 00000000..6fd5f1e9 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java @@ -0,0 +1,33 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareSchoolUnionController + * @Date 2025/8/1 10:16 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,校工会审核") +@At("/platform/activityDeclare/schoolUnion") +public class ActivityDeclareSchoolUnionController { + + @At("") + @SaCheckPermission("activityDeclare.schoolUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityDeclare.schoolUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/schoolunion/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/interceptor/ActivityDeclareInterceptor.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/interceptor/ActivityDeclareInterceptor.java new file mode 100644 index 00000000..5482d2bc --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/interceptor/ActivityDeclareInterceptor.java @@ -0,0 +1,11 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.interceptor; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareInterceptor + * @Date 2025/8/1 11:05 + * @注释 + */ +public class ActivityDeclareInterceptor { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java index 7aac3faa..275d8aa7 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java @@ -1,9 +1,15 @@ package com.budwk.app.zhgh.activity.declarereimbursement.declare.models; +import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; +import com.budwk.app.zhgh.activity.declarereimbursement.vo.ActivityBudget; import lombok.Data; import lombok.EqualsAndHashCode; -import org.nutz.dao.entity.annotation.Table; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; +import java.util.List; /** * @version 1.0 @@ -13,6 +19,109 @@ import org.nutz.dao.entity.annotation.Table; * @注释 */ @Data +@Table @EqualsAndHashCode(callSuper = true) public class ActivityDeclareInfo extends BaseModel { + + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("年份") + @ColDefine(type = ColType.INT, width = 4) + private Integer year; + + @Column + @Comment("申请人id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("申报人工号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String loginName; + + @Column + @Comment("申报人姓名") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String userName; + + @Column + @Comment("联系方式") + @ColDefine(type = ColType.VARCHAR, width = 200) + private String mobile; + + @Column + @Comment("申报单位（校工会/二级工会名称/协会名称）") + @ColDefine(type = ColType.VARCHAR, width = 200) + private String declareUnitName; + + @Column + @Comment("工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("协会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String clubId; + + @Column + @Comment("申请时间") + @ColDefine(type = ColType.DATETIME) + private Date applyTime; + + @Column + @Comment("用户签字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sign; + + @Column + @Comment("活动名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String activityName; + + @Column + @Comment("活动地址") + @ColDefine(type = ColType.VARCHAR, width = 150) + private String activityAddress; + + @Column + @Comment("活动开始时间") + @ColDefine(type = ColType.VARCHAR, width = 30) + private String startTime; + + @Column + @Comment("活动结束时间") + @ColDefine(type = ColType.VARCHAR, width = 30) + private String endTime; + + @Column + @Comment("活动类型") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String activityType; + + @Column + @Comment("活动内容") + @ColDefine(type = ColType.TEXT) + private String activityContent; + + @Column + @Comment("活动人数") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String activityNumber; + + @Column + @Comment("附件") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; + + @Column + @Comment("活动经费预算") + @ColDefine(type = ColType.MYSQL_JSON) + private List budgets; + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/ActivityDeclareService.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/ActivityDeclareService.java new file mode 100644 index 00000000..234821b7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/ActivityDeclareService.java @@ -0,0 +1,14 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityDeclareInfo; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareService + * @Date 2025/8/1 9:09 + * @注释 + */ +public interface ActivityDeclareService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/impl/ActivityDeclareServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/impl/ActivityDeclareServiceImpl.java new file mode 100644 index 00000000..7e37d25d --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/service/impl/ActivityDeclareServiceImpl.java @@ -0,0 +1,22 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.service.impl; + +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityDeclareInfo; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.service.ActivityDeclareService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareServiceImpl + * @Date 2025/8/1 9:10 + * @注释 + */ +@IocBean(args = {"refer:dao"}) +public class ActivityDeclareServiceImpl extends BaseServiceImpl implements ActivityDeclareService { + + public ActivityDeclareServiceImpl(Dao dao) { + super(dao); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java new file mode 100644 index 00000000..6768c0c4 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java @@ -0,0 +1,33 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.enums; + +import com.budwk.app.base.annotation.DictEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareReimbursement + * @Date 2025/7/31 17:01 + * @注释 + */ +@Getter +@AllArgsConstructor +@DictEnum(key = "ActivityDeclareReimbursement", name = "申报类型") +public enum ActivityDeclareReimbursement { + + /** + * 校工会 + */ + SCHOOL_UNION("校工会活动"), + /** + * 分工会 + */ + BRANCH_UNION("分工会活动"), + /** + * 协会 + */ + CLUB("协会活动"); + + private final String typeName; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java index b36571e5..93bca1c4 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java @@ -1,5 +1,30 @@ package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.engine.FlowEngine; +import com.budwk.app.zhgh.activity.declarereimbursement.vo.CommonPageParam; +import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.models.ActivityReimbursementInfo; +import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.service.ActivityReimbursementService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; + /** * @version 1.0 * @Author zzr @@ -7,5 +32,100 @@ package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controlle * @Date 2025/7/31 15:47 * @注释 */ +@IocBean +@Ok("json") +@ApiOperation("活动报销") +@At("/platform/activityReimbursement/apply") public class ActivityReimbursementApplyController { + + @Inject + private Dao dao; + @Inject + private FlowEngine flowEngine; + @Inject + private ActivityReimbursementService activityReimbursementService; + + @At("") + @SaCheckPermission("activityReimbursement.apply") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityReimbursement.apply") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html") + public void form() { + } + + @At + @SaCheckPermission("activityReimbursement.apply") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html") + public void view() { + } + + + @At + @ApiOperation("活动报销,我的申请列表") + @SaCheckPermission("activityDeclare.apply") + public Result pageData(CommonPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.userName, + info.loginName, + info.applyTime, + info.activityName, + info.activityAddress, + info.startTime, + info.endTime, + info.declareUnitName, + info.activityType, + info.activityContent, + info.activityNumber, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, + (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask') AS startTaskId + FROM + activity_reimbursement_info info + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageParam.buildSearch(cnd, "info."); + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { + cnd.desc("info.applyTime"); + } else { + cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = activityReimbursementService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("删除活动报销") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.apply.submit") + @SLog(tag = "活动报销", msg = "删除活动报销id: ${args[0]}") + public Result onDelete(@Valid String id) { + dao.clear(ActivityReimbursementInfo.class, Cnd.where("id", "=", id)); + // 删除流程相关 + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBranchUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBranchUnionController.java new file mode 100644 index 00000000..90005932 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBranchUnionController.java @@ -0,0 +1,33 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementBranchUnionController + * @Date 2025/8/1 10:15 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,分工会管理员审核") +@At("/platform/activityReimbursement/branchUnion") +public class ActivityReimbursementBranchUnionController { + + @At("") + @SaCheckPermission("activityReimbursement.branchUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityReimbursement.branchUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java new file mode 100644 index 00000000..a20a4ed3 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementClubPrincipalController + * @Date 2025/8/1 10:15 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,协会负责人审核") +@At("/platform/activityReimbursement/clubPrincipal") +public class ActivityReimbursementClubPrincipalController { + + + @At("") + @SaCheckPermission("activityReimbursement.clubPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityReimbursement.clubPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolPrincipalController.java new file mode 100644 index 00000000..062b2f66 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolPrincipalController.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementSchoolPrincipalController + * @Date 2025/8/1 10:16 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,校工会负责人审核") +@At("/platform/activityReimbursement/schoolPrincipal") +public class ActivityReimbursementSchoolPrincipalController { + + + @At("") + @SaCheckPermission("activityReimbursement.schoolPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityReimbursement.schoolPrincipal") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolUnionController.java new file mode 100644 index 00000000..86c1df02 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolUnionController.java @@ -0,0 +1,33 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementSchoolUnionController + * @Date 2025/8/1 10:16 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("活动申报,校工会审核") +@At("/platform/activityReimbursement/schoolUnion") +public class ActivityReimbursementSchoolUnionController { + + @At("") + @SaCheckPermission("activityReimbursement.schoolUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html") + public void index() { + } + + @At + @SaCheckPermission("activityReimbursement.schoolUnion") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/form.html") + public void form() { + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/interceptor/ActivityReimbursementInterceptor.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/interceptor/ActivityReimbursementInterceptor.java new file mode 100644 index 00000000..cd5b136d --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/interceptor/ActivityReimbursementInterceptor.java @@ -0,0 +1,11 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.interceptor; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementInterceptor + * @Date 2025/8/1 11:05 + * @注释 + */ +public class ActivityReimbursementInterceptor { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java index bfed79bb..19846f7e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java @@ -1,9 +1,12 @@ package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.models; -import com.budwk.app.base.model.BaseModel; +import cn.hutool.json.JSONObject; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityDeclareInfo; import lombok.Data; import lombok.EqualsAndHashCode; -import org.nutz.dao.entity.annotation.Table; +import org.nutz.dao.entity.annotation.*; + +import java.util.List; /** * @version 1.0 @@ -13,6 +16,28 @@ import org.nutz.dao.entity.annotation.Table; * @注释 */ @Data +@Table @EqualsAndHashCode(callSuper = true) -public class ActivityReimbursementInfo extends BaseModel { +public class ActivityReimbursementInfo extends ActivityDeclareInfo { + + @Column + @Comment("申报id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String declareId; + + @Column + @Comment("发票") + @ColDefine(type = ColType.MYSQL_JSON) + private List billFiles; + + @Column + @Comment("照片") + @ColDefine(type = ColType.MYSQL_JSON) + private List photoFiles; + + @Column + @Comment("其他") + @ColDefine(type = ColType.MYSQL_JSON) + private List otherFiles; + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/ActivityReimbursementService.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/ActivityReimbursementService.java new file mode 100644 index 00000000..71d8820c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/ActivityReimbursementService.java @@ -0,0 +1,14 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.models.ActivityReimbursementInfo; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementService + * @Date 2025/8/1 9:10 + * @注释 + */ +public interface ActivityReimbursementService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/impl/ActivityReimbursementServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/impl/ActivityReimbursementServiceImpl.java new file mode 100644 index 00000000..c12eed1e --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/impl/ActivityReimbursementServiceImpl.java @@ -0,0 +1,21 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.service.impl; + +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.models.ActivityReimbursementInfo; +import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.service.ActivityReimbursementService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementServiceImpl + * @Date 2025/8/1 9:10 + * @注释 + */ +@IocBean(args = {"refer:dao"}) +public class ActivityReimbursementServiceImpl extends BaseServiceImpl implements ActivityReimbursementService { + public ActivityReimbursementServiceImpl(Dao dao) { + super(dao); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/ActivityBudget.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/ActivityBudget.java new file mode 100644 index 00000000..c543e0fd --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/ActivityBudget.java @@ -0,0 +1,44 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityBudget + * @Date 2025/7/31 16:23 + * @注释 + */ +@Data +@ApiModel("费用预算") +public class ActivityBudget { + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "预算费用") + private Double budgetPrice; + + @ApiModelProperty(value = "实际费用") + private Double actualPrice; + + @ApiModelProperty(value = "收款人id") + private String payeeId; + + @ApiModelProperty(value = "收款人姓名") + private String username; + + @ApiModelProperty(value = "收款人工号") + private String loginName; + + @ApiModelProperty(value = "支行名称") + private String bankName; + + @ApiModelProperty(value = "报销卡号") + private String bankCardNum; + + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java new file mode 100644 index 00000000..b58e4a19 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java @@ -0,0 +1,65 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.vo; + +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityDeclareInfo; +import com.budwk.app.zhgh.activity.declarereimbursement.enums.ActivityDeclareReimbursement; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.Cnd; +import org.nutz.dao.util.cri.SqlExpressionGroup; + +/** + * @version 1.0 + * @Author zzr + * @name：CommonPageParam + * @Date 2025/7/31 16:44 + * @注释 + */ +@Data +@ApiModel("通用分页参数") +@EqualsAndHashCode(callSuper = true) +public class CommonPageParam extends PageForm { + + private Integer year; + + private String clubId; + + private String unionId; + + + public void buildSearch(Cnd cnd, String prefix) { + if (cnd == null) { + cnd = Cnd.NEW(); + } + + if (StrUtil.isNotBlank(this.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike(prefix + "userName", this.getSearchKeyword()); + seg.orLike(prefix + "loginName", this.getSearchKeyword()); + cnd.and(seg); + } + + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + + cnd.and(prefix + "declareUnitName", "<>", ActivityDeclareReimbursement.SCHOOL_UNION.name()); + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), + RoleConstant.BRANCH_UNION_ADMIN.name(), + RoleConstant.BRANCH_UNION_OPERATOR.name())) { + cnd.and(prefix + "unionid", "=", SecurityUtil.getUnionId()); + } + + if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name())) { +// cnd.and(prefix + "clubId", "=", ); + } + } else { + cnd.andEX(prefix + "unionId", "=", this.getUnionId()); + cnd.andEX(prefix + "clubId", "=", this.getClubId()); + } + + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java index 0955a5f4..1f5e65ef 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.staffbenefit.difficulthelp.vo; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.param.PageForm; import com.budwk.app.web.commons.auth.utils.AuthUtil; @@ -8,6 +9,7 @@ import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.Cnd; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.lang.Lang; import java.util.List; @@ -36,6 +38,13 @@ public class DifficultHelpPageParam extends PageForm { cnd = Cnd.NEW(); } + if (StrUtil.isNotBlank(this.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike(prefix + "userName", this.getSearchKeyword()); + seg.orLike(prefix + "loginName", this.getSearchKeyword()); + cnd.and(seg); + } + cnd.andEX("YEAR(" + prefix + "applyTime)", "=", this.getYear()); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html new file mode 100644 index 00000000..c42ec176 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html @@ -0,0 +1,324 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html new file mode 100644 index 00000000..3fded042 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html @@ -0,0 +1,200 @@ + +
+ + + + + + + + + + + + + + + + + + + + 活动申报 + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/form.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html index 686fad2e..fb6df48b 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html @@ -211,7 +211,7 @@ - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html index 24d601b7..10461fc4 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html @@ -40,7 +40,7 @@ layout("/layouts/platform.html"){ - + 帮扶申请 @@ -102,8 +102,8 @@ layout("/layouts/platform.html"){ { prop: "unitName", label: "所属单位", sortable: true }, { prop: "subsidyStandards", label: "困难类型", sortable: true }, { prop: "applyTime", label: "申请时间", sortable: true }, - { prop: "taskName", label: "当前节点"}, - { prop: "instanceState", label: "流程状态"} + { prop: "taskName", label: "当前节点" }, + { prop: "instanceState", label: "流程状态" } ], unions: [], units: []