diff --git a/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java b/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java index a80acf7..943a009 100644 --- a/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java +++ b/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java @@ -391,6 +391,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl impleme processTask.setTaskState(ProcessTaskStateEnum.DOING.getCode()); processTask.setTaskType(taskModel.getTaskType().getCode()); processTask.setProcessInstanceId(execution.getProcessInstanceId()); + processTask.setH5FormKey(taskModel.getH5form()); // 增加是否为第一个任务节点标识 execution.getArgs().put(FlowConst.IS_FIRST_TASK_NODE, FlowUtil.isFistTaskName(execution.getProcessModel(), taskModel.getName())); 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 index ab98ae8..c79c881 100644 --- 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 @@ -106,6 +106,7 @@ public class ActivityDeclareBranchUnionController { cnd.and("t.taskName", "=", "54f481d7-3239-4cd2-882d-e1cc18ea86eb"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.andEX("info.applyTime", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); 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 index 91c3772..2ef3dc2 100644 --- 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 @@ -100,6 +100,7 @@ public class ActivityDeclareClubPrincipalController { cnd.and("t.taskName", "=", "06d5979b-b52f-4df1-8974-087568322cd6"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.andEX("info.applyTime", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index ddc4ee8..0349dca 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -66,225 +66,229 @@ import java.util.*; @At("/platform/activityDeclare/mine") public class ActivityDeclareMineController { - @Inject - private Dao dao; - @Inject - private FlowEngine flowEngine; - @Inject - private SysOfficeTemplateUtil sysOfficeTemplateUtil; - @Inject - private ActivityDeclareService activityDeclareService; + @Inject + private Dao dao; + @Inject + private FlowEngine flowEngine; + @Inject + private SysOfficeTemplateUtil sysOfficeTemplateUtil; + @Inject + private ActivityDeclareService activityDeclareService; - @At("") - @SaCheckPermission("activityDeclare.mine") - @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/mine/index.html") - public void index() { - } + @At("") + @SaCheckPermission("activityDeclare.mine") + @Ok("beetl:/platform/zhgh/activity/declarereimbursement/declare/mine/index.html") + public void index() { + } - @At - @ApiOperation("活动申报,我的申请列表") - @SaCheckPermission("activityDeclare.mine") - public Result pageData(CommonPageParam pageParam) { - Sql sql = Sqls.create(""" - SELECT - info.id, - info.userName, - info.mobile, - info.loginName, - info.applyTime, - info.activityName, - info.activityAddress, - info.planStartTime, - info.planEndTime, - info.declareUnitName, - info.activityType, - info.activityContent, - info.activityNumber, - ins.id AS instanceId, - ins.businessNo, - ins.state instanceState, - ins.variable instanceVariable, - ins.processDefineId instanceProcessDefineId, - 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' AND taskState in (10,20)) 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.mine") + public Result pageData(CommonPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.userName, + info.mobile, + info.loginName, + info.applyTime, + info.activityName, + info.activityAddress, + info.planStartTime, + info.planEndTime, + info.declareUnitName, + info.activityType, + info.activityContent, + info.activityNumber, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + ins.processDefineId instanceProcessDefineId, + 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' AND taskState in (10,20)) 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."); + cnd.andEX("info.applyTime", "=", pageParam.getYear()); + 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") - public Result findOne(@Valid String id) { - ActivityDeclareInfo info = dao.fetch(ActivityDeclareInfo.class, id); - return Result.success().addData(info); - } + @At + @ApiOperation("活动申报,查看活动申报") + @SaCheckPermission("activityDeclare") + 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("activityDeclare.mine") - @SLog(tag = "活动申报", msg = "删除活动申报id: ${args[0]}") - public Result onDelete(@Valid String id) { - dao.clear(ActivityDeclareInfo.class, Cnd.where("id", "=", id)); - // 删除流程相关 - flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + @At + @ApiOperation("删除活动申报") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("activityDeclare.mine") + @SLog(tag = "活动申报", msg = "删除活动申报id: ${args[0]}") + public Result onDelete(@Valid String id) { + dao.clear(ActivityDeclareInfo.class, Cnd.where("id", "=", id)); + // 删除流程相关 + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); - // 如果有报销的流程，也一并删除 - ActivityReimbursementInfo reimbursementInfo = dao.fetch(ActivityReimbursementInfo.class, Cnd.where("declareId", "=", id)); - if (Lang.isNotEmpty(reimbursementInfo)) { - dao.clear(ActivityReimbursementInfo.class, Cnd.where("id", "=", reimbursementInfo.getId())); - // 删除流程相关 - flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(reimbursementInfo.getId()); - } - return Result.success(); - } + // 如果有报销的流程，也一并删除 + ActivityReimbursementInfo reimbursementInfo = dao.fetch(ActivityReimbursementInfo.class, Cnd.where("declareId", "=", id)); + if (Lang.isNotEmpty(reimbursementInfo)) { + dao.clear(ActivityReimbursementInfo.class, Cnd.where("id", "=", reimbursementInfo.getId())); + // 删除流程相关 + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(reimbursementInfo.getId()); + } + return Result.success(); + } - @At - @Ok("void") - @SaCheckPermission("activityDeclare.mine") - @SLog(tag = "活动申报", msg = "导出活动申报表") - public void doExportDeclare(@Valid String id, HttpServletResponse response) { - HashMap docData = new HashMap<>(); + @At + @Ok("void") + @SaCheckPermission("activityDeclare.mine") + @SLog(tag = "活动申报", msg = "导出活动申报表") + public void doExportDeclare(@Valid String id, HttpServletResponse response) { + HashMap docData = new HashMap<>(); - Sql sql = Sqls.create(""" - SELECT - info.*, - ins.id AS instanceId - FROM - `activity_declare_info` info - LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id - WHERE - ins.state = 20 AND info.id = @id - """).setParam("id", id); - sql.setCallback(Sqls.callback.map()); - dao.execute(sql); - NutMap info = (NutMap) sql.getResult(); + Sql sql = Sqls.create(""" + SELECT + info.*, + ins.id AS instanceId + FROM + `activity_declare_info` info + LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id + WHERE + ins.state = 20 AND info.id = @id + """).setParam("id", id); + sql.setCallback(Sqls.callback.map()); + dao.execute(sql); + NutMap info = (NutMap) sql.getResult(); - String activityContent = info.getString("activityContent"); - info.put("activityContent", sysOfficeTemplateUtil.convertRichTextToDocText(activityContent)); + String activityContent = info.getString("activityContent"); + info.put("activityContent", sysOfficeTemplateUtil.convertRichTextToDocText(activityContent)); - docData.put("schoolName", Globals.AppName); - docData.put("info", info); + info.put("applyTime", DateUtil.format(info.getTime("applyTime"), "yyyy-MM-dd")); + info.put("planStartTime", DateUtil.format(info.getTime("planStartTime"), "yyyy年MM月dd日")); + info.put("planEndTime", DateUtil.format(info.getTime("planEndTime"), "yyyy年MM月dd日")); + docData.put("schoolName", Globals.AppName); + docData.put("info", info); - List doneTaskVos = new ArrayList<>(); - List doneTaskList = flowEngine.processTaskService().getDoneTaskList(info.getLong("instanceId"), null); - for (ProcessTask doneTask : doneTaskList) { - ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId()); - doneTaskVos.add(taskVO); - } + List doneTaskVos = new ArrayList<>(); + List doneTaskList = flowEngine.processTaskService().getDoneTaskList(info.getLong("instanceId"), null); + for (ProcessTask doneTask : doneTaskList) { + ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId()); + doneTaskVos.add(taskVO); + } - // 分工会审核 - doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName())) - .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) - .ifPresent(v -> { - Dict taskFormData = v.getTaskFormData(); - HashMap approval = new HashMap<>(); + // 分工会审核 + doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName())) + .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) + .ifPresent(v -> { + Dict taskFormData = v.getTaskFormData(); + HashMap approval = new HashMap<>(); - approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); - approval.put("user", taskFormData.getStr("tf_userName")); - if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); - } - approval.put("opinion", taskFormData.getStr("tf_opinion")); - docData.put("fgh", approval); - }); + approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); + approval.put("user", taskFormData.getStr("tf_userName")); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + } + approval.put("opinion", taskFormData.getStr("tf_opinion")); + docData.put("fgh", approval); + }); - // 协会负责人审核 - doneTaskVos.stream().filter(task -> "协会负责人审核".equals(task.getDisplayName())) - .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) - .ifPresent(v -> { - Dict taskFormData = v.getTaskFormData(); - HashMap approval = new HashMap<>(); + // 协会负责人审核 + doneTaskVos.stream().filter(task -> "协会负责人审核".equals(task.getDisplayName())) + .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) + .ifPresent(v -> { + Dict taskFormData = v.getTaskFormData(); + HashMap approval = new HashMap<>(); - approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); - approval.put("user", taskFormData.getStr("tf_userName")); - if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); - } - approval.put("opinion", taskFormData.getStr("tf_opinion")); - docData.put("xh", approval); - }); + approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); + approval.put("user", taskFormData.getStr("tf_userName")); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + } + approval.put("opinion", taskFormData.getStr("tf_opinion")); + docData.put("xh", approval); + }); - // 校工会负责人审核 - doneTaskVos.stream().filter(task -> "校工会负责人审核".equals(task.getDisplayName())) - .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) - .ifPresent(v -> { - Dict taskFormData = v.getTaskFormData(); - HashMap approval = new HashMap<>(); + // 校工会负责人审核 + doneTaskVos.stream().filter(task -> "校工会负责人审核".equals(task.getDisplayName())) + .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) + .ifPresent(v -> { + Dict taskFormData = v.getTaskFormData(); + HashMap approval = new HashMap<>(); - approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); - approval.put("user", taskFormData.getStr("tf_userName")); - if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); - } - approval.put("opinion", taskFormData.getStr("tf_opinion")); - docData.put("xfzr", approval); - }); + approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); + approval.put("user", taskFormData.getStr("tf_userName")); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + } + approval.put("opinion", taskFormData.getStr("tf_opinion")); + docData.put("xfzr", approval); + }); - // 校工会主席审核 - doneTaskVos.stream().filter(task -> "校工会主席审核".equals(task.getDisplayName())) - .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) - .ifPresent(v -> { - Dict taskFormData = v.getTaskFormData(); - HashMap approval = new HashMap<>(); + // 校工会主席审核 + doneTaskVos.stream().filter(task -> "校工会主席审核".equals(task.getDisplayName())) + .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) + .ifPresent(v -> { + Dict taskFormData = v.getTaskFormData(); + HashMap approval = new HashMap<>(); - approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); - approval.put("user", taskFormData.getStr("tf_userName")); - if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); - } - approval.put("opinion", taskFormData.getStr("tf_opinion")); - docData.put("xzx", approval); - }); + approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); + approval.put("user", taskFormData.getStr("tf_userName")); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + } + approval.put("opinion", taskFormData.getStr("tf_opinion")); + docData.put("xzx", approval); + }); - String budgetsStr = info.getString("budgets"); - List list = JSONUtil.parseArray(budgetsStr).toList(ActivityBudgetVO.class); - for (int i = 0; i < list.size(); i++) { - list.get(i).setRanking(i + 1); - } - docData.put("budgets", list); + String budgetsStr = info.getString("budgets"); + List list = JSONUtil.parseArray(budgetsStr).toList(ActivityBudgetVO.class); + for (int i = 0; i < list.size(); i++) { + list.get(i).setRanking(i + 1); + } + docData.put("budgets", list); - LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy(); - Configure config = Configure.builder() - .bind("budgets", policy) - .build(); + LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy(); + Configure config = Configure.builder() + .bind("budgets", policy) + .build(); - String fileName = Globals.AppName + "【" + info.getString("activityName") + "】申报表.docx"; + String fileName = Globals.AppName + "【" + info.getString("activityName") + "】申报表.docx"; - try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { - XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("activity_declare"), config).render(docData).writeAndClose(byteArrayOutputStream); - CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), response); - } catch (IOException e) { - log.error("活动申报表导出失败,id:{},错误信息：{}", id, e.getMessage()); - } - } + try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { + XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("activity_declare"), config).render(docData).writeAndClose(byteArrayOutputStream); + CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), response); + } catch (IOException e) { + log.error("活动申报表导出失败,id:{},错误信息：{}", id, e.getMessage()); + } + } } 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 index 4ec5077..bef5b3a 100644 --- 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 @@ -100,6 +100,7 @@ public class ActivityDeclareSchoolPrincipalController { cnd.and("t.taskName", "=", "5b511275-143f-4ecd-8eff-7c8ad1456b1b"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.andEX("info.applyTime", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); 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 index a33b7f6..d8cbad8 100644 --- 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 @@ -97,6 +97,7 @@ public class ActivityDeclareSchoolUnionController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.andEX("info.applyTime", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); 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 index a66a81f..281f1a2 100644 --- 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 @@ -108,7 +108,7 @@ public class ActivityReimbursementBranchUnionController { cnd.andEX("outlay.budgetReimburseType", "=" , pageParam.getBudgetReimburseType()); cnd.andEX("info.outlayManageSource", "=", pageParam.getOutlayManageSource()); cnd.andEX("info.activityReimbursementMode", "=", pageParam.getActivityReimbursementMode()); - + cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); } else { 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 index a9ce395..973fbe9 100644 --- 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 @@ -108,7 +108,7 @@ public class ActivityReimbursementClubPrincipalController { cnd.andEX("outlay.budgetReimburseType", "=" , pageParam.getBudgetReimburseType()); cnd.andEX("info.outlayManageSource", "=", pageParam.getOutlayManageSource()); cnd.andEX("info.activityReimbursementMode", "=", pageParam.getActivityReimbursementMode()); - + cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); } else { diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java index ced3c4c..6430669 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java @@ -133,6 +133,7 @@ public class ActivityReimbursementMineController { cnd.and("info.userId", "=", SecurityUtil.getUserId()); } } + cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear()); if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { cnd.desc("info.applyTime"); } else { diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolFinanceController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolFinanceController.java index a9c5bc9..eb35231 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolFinanceController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementSchoolFinanceController.java @@ -100,7 +100,7 @@ public class ActivityReimbursementSchoolFinanceController { cnd.andEX("outlay.budgetReimburseType", "=" , pageParam.getBudgetReimburseType()); cnd.andEX("info.outlayManageSource", "=", pageParam.getOutlayManageSource()); cnd.andEX("info.activityReimbursementMode", "=", pageParam.getActivityReimbursementMode()); - + cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); } else { 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 index 89167aa..752d333 100644 --- 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 @@ -108,7 +108,7 @@ public class ActivityReimbursementSchoolPrincipalController { cnd.andEX("outlay.budgetReimburseType", "=" , pageParam.getBudgetReimburseType()); cnd.andEX("info.outlayManageSource", "=", pageParam.getOutlayManageSource()); cnd.andEX("info.activityReimbursementMode", "=", pageParam.getActivityReimbursementMode()); - + cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); } else { 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 index e3e2b33..0b76412 100644 --- 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 @@ -124,6 +124,7 @@ public class ActivityReimbursementSchoolUnionController { cnd.andEX("outlay.budgetReimburseType", "=" , pageParam.getBudgetReimburseType()); cnd.andEX("info.outlayManageSource", "=", pageParam.getOutlayManageSource()); cnd.andEX("info.activityReimbursementMode", "=", pageParam.getActivityReimbursementMode()); + cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java index e6290e7..b28cdf3 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java @@ -177,7 +177,7 @@ public class ClubUserJoinApplyController { } ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId())); - if (!processInstance.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())) { + if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(),ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) { return Result.error(99, "您有该协会的申请记录尚未完成，请到我的申请里查看！"); } return Result.success(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/Asset.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/Asset.java index 91da438..d4ec6c5 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/Asset.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/Asset.java @@ -70,7 +70,7 @@ public class Asset extends BaseModel implements Serializable { @Column @Comment("单价") - @ColDefine(customType = "decimal(6,2)") + @ColDefine(customType = "decimal(10,2)") private BigDecimal assetUnitPrice; @Column diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetDepreciationRecord.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetDepreciationRecord.java index 848a6b3..d7ce4ea 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetDepreciationRecord.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetDepreciationRecord.java @@ -43,22 +43,22 @@ public class AssetDepreciationRecord extends BaseModel implements Serializable { @Column @Comment("资产全部的价值") - @ColDefine(customType = "decimal(6,2)") + @ColDefine(customType = "decimal(10,2)") private BigDecimal assetAllMoney; @Column @Comment("剩余价值") - @ColDefine(customType = "decimal(6,2)") + @ColDefine(customType = "decimal(10,2)") private BigDecimal assetSurplusMoney; @Column @Comment("累计折旧多少钱") - @ColDefine(customType = "decimal(6,2)") + @ColDefine(customType = "decimal(10,2)") private BigDecimal assetDepreciationMoney; @Column @Comment("平均一个月多少钱") - @ColDefine(customType = "decimal(6,2)") + @ColDefine(customType = "decimal(10,2)") private BigDecimal assetAverageMonthMoney; @Column diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java index 3bba553..02e3237 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java @@ -18,9 +18,11 @@ import com.budwk.app.zhgh.dayofficework.qsv.service.QsvQuizService; import com.budwk.app.zhgh.dayofficework.qsv.service.QsvUserAnswerRecordService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.util.cri.Static; +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; @@ -61,10 +63,11 @@ public class H5QsvQuizController { @At @SaCheckLogin + @Aop(TransAop.READ_COMMITTED) public Result subjects(@Valid String activityId) { QsvActivity activity = dao.fetch(QsvActivity.class, activityId); - if(activity.getGroupId() != null){ + if (activity.getGroupId() != null) { int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getGroupId()) .and("userId", "=", SecurityUtil.getUserId())); if (count != 1) { @@ -102,7 +105,7 @@ public class H5QsvQuizController { cnd.and(new Static("1=1 ORDER BY FIELD (id," + dynamic + ")")); resultSubjects = dao.query(QsvSubject.class, cnd); answerRecordId = lastRecordOptional.get().getId(); - }else{ + } else { //没生成过 那就看全部的题目 List subjects = dao.query(QsvSubject.class, Cnd.where("activityId", "=", activityId)); QsvUserAnswerRecord answerRecord = qsvUserAnswerRecordService.insertRecord(activityId, subjects.stream().map(QsvSubject::getId).collect(Collectors.toList())); @@ -319,14 +322,14 @@ public class H5QsvQuizController { return Result.success(result); } -// 答题记录 + // 答题记录 @At public Result answerRecord(@Valid String answerRecordId) { QsvUserAnswerRecord record = dao.fetch(QsvUserAnswerRecord.class, answerRecordId); return Result.success(record); } -// 提交答题 + // 提交答题 @At @ApiOperation("提交答题") @SLog(type = "qsv.quiz", tag = "提交答题", msg = "问卷调查提交答题") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryComprehensiveController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryComprehensiveController.java index d211bcf..4e8aaa1 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryComprehensiveController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryComprehensiveController.java @@ -77,25 +77,25 @@ public class ProposalQueryComprehensiveController { $condition """); Cnd cnd = Cnd.NEW(); - if(ArrayUtil.isNotEmpty(pageForm.getOrigins())){ + if (ArrayUtil.isNotEmpty(pageForm.getOrigins()) && StrUtil.isNotBlank(pageForm.getCommonKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); // 案名 - if(ArrayUtil.contains(pageForm.getOrigins(),"name")){ + if (ArrayUtil.contains(pageForm.getOrigins(), "name")) { for (String keyword : pageForm.getCommonKeyword().split(" ")) { seg.orLike("info.name", keyword); } } // 案由 - if(ArrayUtil.contains(pageForm.getOrigins(),"brief")){ + if (ArrayUtil.contains(pageForm.getOrigins(), "brief")) { for (String keyword : pageForm.getCommonKeyword().split(" ")) { seg.orLike("info.brief", keyword); } } // 提案人 - if(ArrayUtil.contains(pageForm.getOrigins(),"createUserName")){ + if (ArrayUtil.contains(pageForm.getOrigins(), "createUserName")) { for (String keyword : pageForm.getCommonKeyword().split(" ")) { seg.orLike("info.createUserName", keyword); seg.orLike("info.createUserLoginName", keyword); @@ -103,18 +103,18 @@ public class ProposalQueryComprehensiveController { } // 答复内容 - if(ArrayUtil.contains(pageForm.getOrigins(),"answer")){ + if (ArrayUtil.contains(pageForm.getOrigins(), "answer")) { for (String keyword : pageForm.getCommonKeyword().split(" ")) { seg.orLike("JSON_EXTRACT(replyTask.variable,'$.tf_opinion')", keyword); } } - if(!seg.isEmpty()){ + if (!seg.isEmpty()) { cnd.and(seg); } } - if(StrUtil.isNotBlank(pageForm.getUnderTakeUnitId())){ + if (StrUtil.isNotBlank(pageForm.getUnderTakeUnitId())) { cnd.andEX("pru.unitId", "=", pageForm.getUnderTakeUnitId()); } ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java index 3402a56..5b34eaf 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java @@ -123,7 +123,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl delegationList = listMap(delegationSql); - //查询所有的团长、副团长 + //查询所有的团长 Sys_role tzRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD); Sql tzSql = Sqls.create(""" SELECT @@ -142,6 +142,25 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl tzList = listMap(tzSql); + //查询所有的副团长 + Sys_role ftzRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD); + Sql ftzSql = Sqls.create(""" + SELECT + t2.id, + t2.username, + t2.sex, + t1.tcDelegationId + FROM + sys_user_role t1 + LEFT JOIN sys_user t2 ON t2.id = t1.userId + WHERE + t1.tcSessionId = @sessionId + AND t1.roleId IN (@ftzRoles) + """); + ftzSql.setParam("sessionId", pageForm.getSessionId()); + ftzSql.setParam("ftzRoles", List.of(ftzRole.getId())); + List ftzList = listMap(ftzSql); + //查询代表 Sql delegateSql = Sqls.create(""" SELECT @@ -161,6 +180,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl tz.getString("tcDelegationId").equals(delegation.getString("id"))).toList()); + delegation.put("ftz", ftzList.stream().filter(ftz -> ftz.getString("tcDelegationId").equals(delegation.getString("id"))).toList()); //过滤本代表团的代表 List delegateList = delegateAllList.stream().filter(delegate -> delegate.getString("delegationId").equals(delegation.getString("id"))).toList(); //按5人平均分组 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 index d6f6897..26b144d 100644 --- 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 @@ -74,7 +74,8 @@ layout("/layouts/platform.html"){ - + @@ -226,7 +227,7 @@ layout("/layouts/platform.html"){ } }, watch: { - 'formData.activityType': function(newVal, oldVal) { + 'formData.activityType': function (newVal, oldVal) { if (newVal !== oldVal) { this.$set(this.formData, "deductionBudgetId", null) this.getBudgetByYear() @@ -277,46 +278,55 @@ layout("/layouts/platform.html"){ // 提交 onSubmit() { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - if (this.formData.planDate && this.formData.planDate.length > 0) { - this.formData.planStartTime = this.formData.planDate[0] - this.formData.planEndTime = this.formData.planDate[1] + this.$refs.formRef.validate().then((valid) => { + if (valid) { + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + if (this.formData.planDate && this.formData.planDate.length > 0) { + this.formData.planStartTime = this.formData.planDate[0] + this.formData.planEndTime = this.formData.planDate[1] + } + this.$axios.post('/platform/activityDeclare/apply/submit', { + data: JSON.stringify(this.formData) + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + commonUtil.pjaxPush('/platform/activityDeclare/mine') + } + }) + }) } - this.$axios.post('/platform/activityDeclare/apply/submit', { - data: JSON.stringify(this.formData) - }).then(res => { - if (res.code === 0) { - this.$message.success("提交成功") - commonUtil.pjaxPush('/platform/activityDeclare/mine') - } - }) }) }, onFinishTask() { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - if (this.formData.planDate && this.formData.planDate.length > 0) { - this.formData.planStartTime = this.formData.planDate[0] - this.formData.planEndTime = this.formData.planDate[1] + this.$refs.formRef.validate().then((valid) => { + if (valid) { + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + if (this.formData.planDate && this.formData.planDate.length > 0) { + this.formData.planStartTime = this.formData.planDate[0] + this.formData.planEndTime = this.formData.planDate[1] + } + this.$axios.post('/platform/activityDeclare/apply/submitAgain', { + data: JSON.stringify(this.formData), + taskId: GetQueryString("taskId") + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + commonUtil.pjaxPush('/platform/activityDeclare/mine') + } + }) + }) } - this.$axios.post('/platform/activityDeclare/apply/submitAgain', { - data: JSON.stringify(this.formData), - taskId: GetQueryString("taskId") - }).then(res => { - if (res.code === 0) { - this.$message.success("提交成功") - commonUtil.pjaxPush('/platform/activityDeclare/mine') - } - }) }) + }, // 设置申报主体名称 setDeclareUnitName(val) { 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 index 9c4ae55..0d010d3 100644 --- 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 @@ -28,7 +28,8 @@ layout("/layouts/platform.html"){ - + 活动报销 日常报销 @@ -522,14 +523,14 @@ layout("/layouts/platform.html"){ } }) } - if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER","UNION_REIMBURSEMENT_MANAGER"])) { + if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) { this.budgetTypeOption.map(v => { if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) { budgetTypeCloseOption.push(v) } }) } - if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER","CLUB_PRESIDENT"])) { + if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER", "CLUB_PRESIDENT"])) { this.budgetTypeOption.map(v => { if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) { budgetTypeCloseOption.push(v) diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js index 8ef712f..9c589ff 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js @@ -27,14 +27,15 @@ const INFO = {