From 6fad5623c5a78554dc5288261bdb9b5d7b75f483 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 5 Sep 2025 11:50:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8-=20=E6=96=87=E5=8C=96?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E3=80=81=E4=BD=9C=E5=93=81=E5=BE=81=E9=9B=86?= =?UTF-8?q?bug=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctivityCultureApplyActivityController.java | 83 +++++- ...ctivityCultureAuditActivityController.java | 40 ++- ...tivityCultureUserStatisticsController.java | 35 ++- .../ActivityCultureApplyUserServiceImpl.java | 6 +- .../impl/ActivityCultureServiceImpl.java | 23 +- ...ActivityWorksCollectionReadController.java | 2 +- ...tivityWorksCollectionUploadController.java | 5 +- .../Activity_works_collection_upload.java | 4 + .../UnionReimburseMineController.java | 2 +- .../h5controller/H5ChildManageController.java | 2 +- .../activity/culture/common/applyActivity.js | 87 +++++- .../zhgh/activity/culture/common/applyUser.js | 4 +- .../activity/culture/common/auditActivity.js | 190 +++++++------ .../activity/culture/common/infoActivity.js | 263 +++++++++--------- .../zhgh/activity/culture/common/infoMange.js | 61 ++-- 15 files changed, 541 insertions(+), 266 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index f483a3df..67fd8116 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -1,11 +1,20 @@ package com.budwk.app.zhgh.activity.culture.controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.result.Result; +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowEngine; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; +import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; @@ -13,11 +22,15 @@ import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService; import com.budwk.app.zhgh.club.model.SysClub; import com.budwk.app.zhgh.club.service.SysClubService; +import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse; 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.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Strings; @@ -41,6 +54,17 @@ import java.util.stream.Collectors; @At("/platform/activity/culture/applyActivity") public class ActivityCultureApplyActivityController { + @Inject + private Dao dao; + @Inject + private FlowEngine flowEngine; + @Inject + private FlowCommonService flowCommonService; + @Inject + private SysClubService sysClubService; + @Inject + private ActivityCultureService activityCultureService; + @At("/school") @Ok("beetl:platform/zhgh/activity/culture/school/applyActivity/index.html") @SaCheckPermission("activity.culture.applyActivity.school") @@ -59,12 +83,6 @@ public class ActivityCultureApplyActivityController { public void clubIndex() { } - @Inject - private ActivityCultureService activityCultureService; - - @Inject - private SysClubService sysClubService; - /** * @param activityScopeGroupId @@ -94,6 +112,59 @@ public class ActivityCultureApplyActivityController { return Result.success(); } + @At + @SaCheckLogin + @ApiOperation("提交申请") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + public Result submit(@Param("data") ActivityTissue tissue) { + if (tissue.getActivity_type() == 40002) { + tissue.setUnionId(SecurityUtil.getUnionId()); + } + tissue.setUserId(SecurityUtil.getUserId()); + tissue.setApplyTime(DateUtil.now()); + activityCultureService.insertOrUpdate(tissue); + + if (tissue.getActivity_type() == 40002 || tissue.getActivity_type() == 40003){ + // 开启流程实例 + Dict args = Dict.create(); + args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); + args.set(FlowConst.FORM_DATA, tissue); + ProcessInstance instance = flowEngine.startProcessInstanceByKey("WHHD", tissue.getId(), SecurityUtil.getUserId(), args); + + // 自动完成第一个申请任务 + List doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); + for (ProcessTask task : doingTaskList) { + flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args); + } + return Result.success(); + } + return Result.success(); + } + + @At + @SaCheckLogin + @ApiOperation("重新提交申请") + @Aop(TransAop.READ_COMMITTED) + public Result submitAgain(@Param("data") ActivityTissue tissue, @Param("taskId") Long taskId) { + if (tissue.getActivity_type() == 40002) { + tissue.setUnionId(SecurityUtil.getUnionId()); + } + tissue.setUserId(SecurityUtil.getUserId()); + tissue.setApplyTime(DateUtil.now()); + activityCultureService.insertOrUpdate(tissue); + + if (tissue.getActivity_type() == 40002 || tissue.getActivity_type() == 40003){ + Dict dict = Dict.create(); + dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId); + dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode()); + flowCommonService.executeTask(dict); + } + return Result.success(); + } + + + @At @SLog(tag = "文化活动", msg = "编辑了一条文化活动记录", param = true, result = true) @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index 2bd8acaf..55efcfd8 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -7,6 +7,7 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.model.Audit; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService; @@ -20,6 +21,8 @@ import org.nutz.lang.Strings; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import java.util.List; + /** * @ClassName ActivityCultureAuditActivityController * @Description TODO @@ -50,7 +53,7 @@ public class ActivityCultureAuditActivityController { @At @SaCheckPermission(value = {"activity.culture.auditActivity.union", "activity.culture.auditActivity.club"}, mode = SaMode.OR) - public Result pageData(PageForm page, Boolean state, + public Result pageData(PageForm page, boolean approval, String year, String name, String unionId, @@ -62,19 +65,46 @@ public class ActivityCultureAuditActivityController { tissue.*, uni.name unionname , club.clubName, - abs.`name` projectTypeName + abs.`name` projectTypeName, + 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, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke FROM - activity_tissue tissue + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN activity_tissue tissue ON tissue.id = ins.businessNo LEFT JOIN sys_union uni ON uni.id = tissue.unionId LEFT JOIN sys_club club ON club.id = tissue.clubId LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 $condition """); + cnd.and("t.taskName", "=", "76a03838-caa4-4561-ba0f-0da0d3a17c37"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(tissue.startTime)", "=", year); cnd.andEX("tissue.unionId", "=", unionId); cnd.andEX("tissue.activity_type", "=", activity_type); - cnd.andEX("tissue.state", state ? ">" : "=", 1); + if (approval) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } if (Strings.isNotBlank(name)) { cnd.where().andLike("tissue.name", name); @@ -86,7 +116,7 @@ public class ActivityCultureAuditActivityController { } else { cnd.desc("tissue.startTime"); } - + cnd.groupBy("t.id"); sql.setCondition(cnd); return Result.success(activityCultureService.listPageMap(page.getPageNumber(), page.getPageSize(), sql)); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index a22b253a..ef6daba6 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -133,17 +133,38 @@ public class ActivityCultureUserStatisticsController { @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.union", "activity.culture.userStatistics.club"}, mode = SaMode.OR) public Result getActivityByYearOrType(Integer year, @Valid Integer activity_type) { - Cnd cnd = Cnd.where("activity_type", "=", activity_type); - cnd.and("projectTypeCode", "!=", 50004); + Sql sql = Sqls.create(""" + SELECT + tissue.*, + uni.name unionname , + club.clubName, + abs.`name` projectTypeName, + atp.applyUserId, + ins.state instanceState, + CASE WHEN atp.id IS NOT NULL THEN 1 ELSE 0 END AS isEnrolled + FROM + activity_tissue tissue + LEFT JOIN sys_union uni ON uni.id = tissue.unionId + LEFT JOIN sys_club club ON club.id = tissue.clubId + LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode + LEFT JOIN activity_tissue_person atp on atp.tissueId=tissue.id AND (atp.applyUserId = @userId OR atp.userId = @userId) + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = tissue.id AND ins.state = 20 + $condition + """).setParam("userId", SecurityUtil.getUserId()); + + Cnd cnd =Cnd.where("tissue.activity_type", "=", activity_type); + cnd.and("tissue.projectTypeCode", "!=", 50004); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - cnd.and("signUpMethod", "in", List.of(1, 2, 3)); + cnd.and("tissue.signUpMethod", "in", List.of(1, 2, 3)); if (activity_type == 40002) { - cnd.and("unionId", "=", SecurityUtil.getUnionId()); + cnd.and("tissue.unionId", "=", SecurityUtil.getUnionId()); } } - cnd.andEX("YEAR(startTime)", "=", year).desc("startTime"); - List list = activityCultureApplyUserService.dao().query(ActivityTissue.class, cnd); - return Result.success(list); + // 只查询流程实例状态为20的数据（已完成状态） + cnd.and("ins.state", "=", 20); + cnd.andEX("YEAR(tissue.startTime)", "=", year).desc("tissue.startTime"); + sql.setCondition(cnd); + return Result.success(activityCultureApplyUserService.list(sql)); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java index 8e1f1072..3c5d15a8 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java @@ -49,6 +49,7 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl gh.id, gh.name unionname, ( SELECT count( 1 ) FROM `user` WHERE id IN ( SELECT userid FROM activity_user_scope WHERE groupId = @activityScopeGroupId ) AND unionId = gh.id ) as teacherCount - + FROM sys_union gh LEFT JOIN `vw_user` u ON u.unionid = gh.id @@ -85,12 +85,31 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl tissue.*, uni.name unionname , club.clubName, - abs.`name` projectTypeName + abs.`name` projectTypeName, + 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') AS startTaskId FROM activity_tissue tissue LEFT JOIN sys_union uni ON uni.id = tissue.unionId LEFT JOIN sys_club club ON club.id = tissue.clubId LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = tissue.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 """); diff --git a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java index abe7d5f6..c8317917 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java @@ -179,7 +179,7 @@ public class ActivityWorksCollectionReadController { response.setHeader("Content-Disposition", "attachment;filename=" + URLUtil.encode("作品征集数据.zip")); Cnd cnd = Cnd.NEW(); - cnd.andEX("up.activityId", "=", pageForm.getActivityId()); + cnd.andEX("activityId", "=", pageForm.getActivityId()); cnd.andEX("typeName", "=", pageForm.getTypeName()); if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); diff --git a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionUploadController.java b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionUploadController.java index 4fad198b..11ee496d 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionUploadController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionUploadController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.activity.workscollection.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; @@ -26,6 +27,7 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.validation.Valid; +import java.util.Date; import java.util.List; /** @@ -56,7 +58,7 @@ public class ActivityWorksCollectionUploadController { */ @At @SaCheckPermission("activity.workscollection.upload") - public Result pageData(@Valid PageForm pageForm, String activityId, String subjectId, String worksId) { + public Result pageData(@Valid PageForm pageForm, String activityId, String subjectId, String worksId, Long year) { Sql sql = Sqls.create(""" select up.*, @@ -72,6 +74,7 @@ public class ActivityWorksCollectionUploadController { """); Cnd cnd = Cnd.NEW(); cnd.and("userId", "=", SecurityUtil.getUserId()); + cnd.andEX("YEAR(co.startDateTime)","=",year); cnd.andEX("up.activityId", "=", activityId); cnd.andEX("up.subjectId", "=", subjectId); cnd.andEX("up.worksId", "=", worksId); diff --git a/src/main/java/com/budwk/app/zhgh/activity/workscollection/models/Activity_works_collection_upload.java b/src/main/java/com/budwk/app/zhgh/activity/workscollection/models/Activity_works_collection_upload.java index fd8595ac..245268cf 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/workscollection/models/Activity_works_collection_upload.java +++ b/src/main/java/com/budwk/app/zhgh/activity/workscollection/models/Activity_works_collection_upload.java @@ -9,7 +9,9 @@ import org.nutz.dao.interceptor.annotation.PrevInsert; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import java.util.Date; import java.util.List; @Data @@ -97,4 +99,6 @@ public class Activity_works_collection_upload extends BaseModel { @NotEmpty(message = "附件不能为空") private List files; + + } diff --git a/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseMineController.java b/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseMineController.java index e414a65e..5cdbbc95 100644 --- a/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseMineController.java +++ b/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseMineController.java @@ -37,7 +37,7 @@ import org.nutz.mvc.annotation.Param; @At("/platform/unionReimburse/mine") @Api("工会报销我的") @Ok("json:full") -public class UnionReimburseMineController { +public class UnionReimburseMineController { @Inject private UnionReimburseService unionReimburseService; diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java index 19cd57be..d73fd701 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java +++ b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java @@ -21,7 +21,7 @@ public class H5ChildManageController { @At("") @Ok("beetl:/platform/zhghh5/staffmanage/childmanage/") - @SaCheckPermission("childManage.h5") + @SaCheckPermission("h5.childManage") public void index() { } } diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index 4106b217..2b1003d1 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -45,7 +45,6 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { 活动报名 - 活动管理 @@ -529,6 +528,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { mixins: [initTableMixins], data() { return { + bizId: GetQueryString("bizId"), taskId: GetQueryString("taskId"), activeName: "1", @@ -613,7 +613,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { formData.plannedDate = null } - this.$axios.post('/platform/activity/culture/applyActivity/save', {data: JSON.stringify(this.formData)}).then(res => { + this.$axios.post('/platform/activity/culture/applyActivity/save', {data: JSON.stringify(formData)}).then(res => { if (res.code === 0) { this.$message.success("保存成功") if (this.activity_type === 40002) { @@ -627,6 +627,89 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { }) }) }, + // 提交 + onSubmit() { + this.$confirm("您确定保存吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const formData = JSON.parse(JSON.stringify(this.formData)) + formData.activity_type = this.activity_type + const {time, applyTime2, plannedDate} = formData + if (applyTime2 && applyTime2.length) { + formData.applyStartTime = applyTime2[0] + formData.applyEndTime = applyTime2[1] + formData.applyTime2 = null + } + if (time && time.length) { + formData.startTime = formData.time[0] + formData.endTime = formData.time[1] + formData.time = null + } + if (plannedDate && plannedDate.length) { + formData.startPlannedDate = formData.plannedDate[0] + formData.endPlannedDate = formData.plannedDate[1] + formData.plannedDate = null + } + this.$axios.post('/platform/activity/culture/applyActivity/submit', { + data: JSON.stringify(formData) + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + if (this.activity_type === 40002) { + window.location.href = "/platform/activity/culture/infoManage/union" + } else if (this.activity_type === 40003) { + window.location.href = "/platform/activity/culture/infoManage/club" + } else { + window.location.href = "/platform/activity/culture/infoManage/school" + } + } + }) + }) + }, + // 再次提交 + onFinishTask() { + this.$confirm("您确定保存吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const formData = JSON.parse(JSON.stringify(this.formData)) + formData.activity_type = this.activity_type + const {time, applyTime2, plannedDate} = formData + if (applyTime2 && applyTime2.length) { + formData.applyStartTime = applyTime2[0] + formData.applyEndTime = applyTime2[1] + formData.applyTime2 = null + } + if (time && time.length) { + formData.startTime = formData.time[0] + formData.endTime = formData.time[1] + formData.time = null + } + if (plannedDate && plannedDate.length) { + formData.startPlannedDate = formData.plannedDate[0] + formData.endPlannedDate = formData.plannedDate[1] + formData.plannedDate = null + } + this.$axios.post('/platform/activity/culture/applyActivity/submitAgain', { + data: JSON.stringify(formData), + taskId: GetQueryString("taskId") + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + if (this.activity_type === 40002) { + window.location.href = "/platform/activity/culture/infoManage/union" + } else if (this.activity_type === 40003) { + window.location.href = "/platform/activity/culture/infoManage/club" + } else { + window.location.href = "/platform/activity/culture/infoManage/school" + } + } + }) + }) + }, async remoteMethod(query) { if (query) { this.selectLoading = true diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js index bae52eee..56ae75a8 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js @@ -17,7 +17,7 @@ const ACTIVITY_CULTURE_APPLY_USER = { > - + @@ -132,7 +132,7 @@ const ACTIVITY_CULTURE_APPLY_USER = { }, openView(row) { this.$refs.guava.view(() => { - this.$refs.infoActivity.findOne(row.id) + this.$refs.infoActivity.onOpen(row) }) }, pageData() { diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js index a203a097..fee1a6ba 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js @@ -38,7 +38,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { - + {{i.name}} @@ -70,89 +70,62 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { {{row.projectTypeName}}({{row.projectTypeCode}}) -