diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeFormalPushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeFormalPushController.java index 9dce55a3..3c27b743 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeFormalPushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeFormalPushController.java @@ -49,7 +49,7 @@ public class ExecutiveCommitteeFormalPushController { @Inject private BaseService baseService; - @At("/index") + @At("") @SaCheckPermission("executiveCommittee.formalPush") @Ok("beetl:/platform/zhgh/democratic/executiveCommittee/formalPush/index.html") public void index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java index 594c45e8..cc6d88f7 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java @@ -1,22 +1,21 @@ package com.budwk.app.zhgh.democratic.executiveCommittee.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeTwoPush; +import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig; +import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -30,8 +29,10 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.validation.Valid; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author zhf @@ -42,7 +43,7 @@ import java.util.Map; @At("/platform/executiveCommittee/preparatoryGroupPush") @Ok("json:full") @Slf4j -@Api(tags = "执委会推选-正式委员录入") +@Api(tags = "执委会推选-筹备组推选") public class ExecutiveCommitteePushController { @Inject @@ -62,49 +63,38 @@ public class ExecutiveCommitteePushController { public Result pageData(PageForm pageForm, String teacherMeetId, String delegationId, - String unionId, - String roleCode) { + String unionId) { Sql sql = Sqls.create(""" - SELECT + SELECT t1.*, - t2.loginName, - t2.userName, - t3.name AS unitName, - t4.name unionName, - t5.sex, + t2.name AS unitName, + t3.name unionName, + t4.sex, TIMESTAMPDIFF( YEAR, - t5.birthday, + t4.birthday, CURDATE()) AS age, - t6.name AS delegationName + t5.name AS delegationName FROM - `executive_committee_two_push` t1 - LEFT JOIN executive_committee_one_push t2 on t2.userId=t1.userId and t2.teacherMeetId=t1.teacherMeetId - LEFT JOIN sys_unit t3 ON t2.unitId = t3.id - LEFT JOIN `sys_union` t4 ON t4.id = t3.unionid - LEFT JOIN `vw_user` t5 ON t5.id = t1.userId - LEFT JOIN teacher_congress_delegation t6 ON t6.id = t2.delegationId + `executive_committee_one_push` t1 + LEFT JOIN sys_unit t2 ON t1.unitId = t2.id + LEFT JOIN `sys_union` t3 ON t3.id = t2.unionid + LEFT JOIN `vw_user` t4 ON t4.id = t1.userId + LEFT JOIN teacher_congress_delegation t5 ON t5.id = t1.delegationId $condition """); Cnd cnd = Cnd.NEW(); cnd.andEX("t1.teacherMeetId", "=", teacherMeetId); - cnd.andEX("t2.delegationId", "=", delegationId); - cnd.andEX("t1.roleCode", "=", roleCode); - cnd.andEX("t1.isFormal", "=", true); - if (StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || - StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || - StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { - cnd.andEX("t4.id", "=", unionId); - } else { - cnd.andEX("t4.id", "=", SecurityUtil.getUnionId()); - } + cnd.andEX("t1.delegationId", "=", delegationId); + cnd.andEX("t3.id", "=", unionId); + cnd.andEX("t1.addType", "=", 2); if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup group = new SqlExpressionGroup(); - group.orLike("t2.userName", pageForm.getSearchKeyword()); - group.orLike("t2.loginName", pageForm.getSearchKeyword()); + group.orLike("t1.userName", pageForm.getSearchKeyword()); + group.orLike("t1.loginName", pageForm.getSearchKeyword()); cnd.and(group); } - cnd.asc("t6.code").asc("t2.firstLetter"); + cnd.asc("t5.code").asc("t1.firstLetter"); sql.setCondition(cnd); return Result.success(baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql)); } @@ -114,53 +104,93 @@ public class ExecutiveCommitteePushController { @SaCheckPermission("executiveCommittee.preparatoryGroupPush") @ApiOperation("查询可以推选委员和已经推选的人员") public Result getDelegationUser(String teacherMeetId) { - List twoPushList = dao.query(ExecutiveCommitteeTwoPush.class, - Cnd.where("teacherMeetId", "=", teacherMeetId).and(ExecutiveCommitteeTwoPush::getRoleCode, "is not", null)); - - List userValue = twoPushList.stream().filter(ExecutiveCommitteeTwoPush::getIsFormal).toList(); - List userIds = userValue.stream().map(ExecutiveCommitteeTwoPush::getUserId).toList(); + List userValue = dao.query(ExecutiveCommitteeOnePush.class, + Cnd.where("teacherMeetId", "=", teacherMeetId) + .and("addType", "=", 2)); + List onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW()); + List userIds = onePushList.stream().map(ExecutiveCommitteeOnePush::getUserId).collect(Collectors.toList()); + ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, + Cnd.where("teacherMeetId", "=", teacherMeetId)); + Cnd cnd = Cnd.NEW(); + cnd.andEX("db.sessionId", "=", teacherMeetId); + cnd.andEX("db.userId", "not in", userIds); + cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); Sql sql = Sqls.create(""" - SELECT - t2.id userId, - t2.username userName, - t2.loginname loginName, - t2.unitName, - t2.sex, - t2.professionalTitle, - t2.professionalLevel, - t1.roleCode, - TIMESTAMPDIFF( - YEAR, - t2.birthday, - CURDATE()) age + SELECT + db.*, + u.professionalTitle, + u.professionalLevel, + TIMESTAMPDIFF(YEAR, u.birthday, CURDATE()) AS age FROM - executive_committee_two_push t1 - LEFT JOIN `vw_user` t2 ON t1.userId = t2.id + teacher_congress_delegate db + LEFT JOIN `vw_user` u ON db.userId = u.id $condition """); - Cnd cnd = Cnd.NEW(); - cnd.andEX("t1.teacherMeetId", "=", teacherMeetId); - cnd.andEX("t1.userId", "not in", userIds); sql.setCondition(cnd); List userData = baseService.listMap(sql); - return Result.success(Map.of("userData", userData, "userValue", userValue)); + return Result.success(Map.of("userData", userData, "userValue", userValue,"prepareGroupQuotaCount",config.getPrepareGroupQuotaCount())); } @At @SaCheckPermission("executiveCommittee.preparatoryGroupPush") - @SLog(tag = "执委会推选-正式委员录入", msg = "推选委员") + @SLog(tag = "执委会推选-筹备组推选", msg = "推选委员") public Result addOnePush(@Param("userValue") String[] userValue, String teacherMeetId) { try { - if (ObjectUtil.isEmpty(userValue)) { - return Result.error("请选择要录入的委员!"); + + ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, + Cnd.where("teacherMeetId", "=", teacherMeetId)); + if (ObjectUtil.isEmpty(config)) { + return Result.error("请先配置基础信息"); } - if (ObjectUtil.isEmpty(teacherMeetId)) { - return Result.error("请选择教代会!"); + if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) { + return Result.error("请等待一次预选开始时间"); } - List twoPushList = dao.query(ExecutiveCommitteeTwoPush.class, Cnd.where(ExecutiveCommitteeTwoPush::getTeacherMeetId, "=", teacherMeetId).and(ExecutiveCommitteeTwoPush::getUserId, "in", userValue)); - List ids = twoPushList.stream().map(ExecutiveCommitteeTwoPush::getId).toList(); - dao.update(ExecutiveCommitteeTwoPush.class, Chain.make("isFormal", true), Cnd.where("id", "in", ids)); + if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) { + return Result.error("一次预选已结束"); + } + + int dbCount = dao.count(ExecutiveCommitteeOnePush.class, + Cnd.where("teacherMeetId", "=", teacherMeetId) + .and("addType", "=", 2)); + if (dbCount + userValue.length > config.getPrepareGroupQuotaCount()) { + return Result.error("推选人数限制" + config.getPrepareGroupQuotaCount() + "人"); + } + + Sql sql = Sqls.create(""" + SELECT + t1.* + FROM + teacher_congress_delegate t1 + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("t1.sessionId", "=", teacherMeetId); + cnd.andEX("t1.userId", "in", userValue); + sql.setCondition(cnd); + List dbList = baseService.listMap(sql); + + List list = new ArrayList<>(); + for (String id : userValue) { + NutMap jdhDb = dbList.stream().filter(v -> v.getString("userId").equals(id)).findFirst().orElse(null); + if (ObjectUtil.isEmpty(jdhDb)) { + return Result.error("请选择正确的代表!"); + } + ExecutiveCommitteeOnePush onePush = new ExecutiveCommitteeOnePush(); + onePush.setPushDate(DateUtil.date()); + onePush.setUserId(jdhDb.getString("userId")); + onePush.setUserName(jdhDb.getString("userName")); + onePush.setLoginName(jdhDb.getString("loginName")); + onePush.setDelegationId(jdhDb.getString("delegationId")); + onePush.setUnionId(jdhDb.getString("unionId")); + onePush.setUnitId(jdhDb.getString("unitId")); + onePush.setTeacherMeetId(teacherMeetId); + String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName"))); + onePush.setFirstLetter(firstLetter); + onePush.setAddType(2); + list.add(onePush); + } + dao.insert(list); return Result.success("添加成功!"); } catch (Exception e) { e.printStackTrace(); @@ -172,9 +202,16 @@ public class ExecutiveCommitteePushController { @SaCheckPermission("executiveCommittee.preparatoryGroupPush") @SLog(tag = "执委会推选-筹备组推选", msg = "删除推选的人") public Result doDelete(@Valid String id, @Valid String teacherMeetId) { - dao.update(ExecutiveCommitteeTwoPush.class, Chain.make("isFormal", false), Cnd.where("id", "=", id)); - return Result.success("删除成功!"); + ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, + Cnd.where("teacherMeetId", "=", teacherMeetId)); + if (ObjectUtil.isEmpty(config)) { + return Result.error("请先配置基础信息"); + } + int num = dao.clear(ExecutiveCommitteeOnePush.class, Cnd.where("id", "=", id)); + return num >= 0 ? Result.success() : Result.error(); } + + public static char getFirstLetter(String str) { if (str == null || str.isEmpty()) { throw new IllegalArgumentException("字符串不能为空"); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java index 3c8abafd..5260a170 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java @@ -40,6 +40,7 @@ public class ExecutiveCommitteeMemberServiceImpl extends BaseServiceImpl impleme ( SELECT count( 1 ) FROM executive_committee_two_push tp WHERE tp.userId = op.userId ) as pushCount, CASE op.addType WHEN 1 THEN '执委会委员' + WHEN 2 THEN '筹备组推选' WHEN 3 THEN '工会委员会委员' ELSE '未知' END AS addTypeName diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java index c411adc2..03ac17ab 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java @@ -1,22 +1,30 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.entity.ProcessTask; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.flow.service.FlowCommonService; +import com.budwk.app.flow.service.ProcessTaskService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo; import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge; import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam; import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService; +import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -26,12 +34,14 @@ import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; import org.nutz.lang.random.R; +import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.validation.Valid; import java.util.List; +import java.util.Objects; @IocBean @At("/platform/proposal/committeeFiling") @@ -47,6 +57,12 @@ public class ProposalCommitteeFilingController { @Inject private FlowCommonService flowCommonService; + @Inject + private ProposalCommonService proposalCommonService; + + @Inject + private ProcessTaskService processTaskService; + @At("") @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html") @@ -121,6 +137,7 @@ public class ProposalCommitteeFilingController { List taskIds = (List) args.get("processTaskIds"); List proposalIds = (List) args.get("proposalIds"); + List proposals = (List) args.get("proposals"); // 记录提案并案 dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "in", proposalIds)); @@ -136,10 +153,81 @@ public class ProposalCommitteeFilingController { for (Integer taskId : taskIds) { Dict taskArgs = args.clone(); taskArgs.put(FlowConst.PROCESS_TASK_ID_KEY, taskId); + NutMap proposal = proposals.stream().filter(v -> v.getInt("taskId") == taskId).findFirst().orElse(null); + taskArgs.put("tf_proposalId", proposal.getString("id")); + taskArgs.put("tf_code", proposal.getString("tf_code")); + taskArgs.put("tf_oldCode", proposal.getString("tf_oldCode")); + taskArgs.put("tf_typeId", proposal.getString("tf_typeId")); + taskArgs.put("tf_oldTypeId", proposal.getString("tf_oldTypeId")); + if (!proposal.getString("tf_code").equals(proposal.getString("tf_oldCode"))) { + dao.update(ProposalInfo.class, Chain.make("code", proposal.getString("tf_code")), Cnd.where(ProposalInfo::getId, "=", proposal.getString("id"))); + } + if (!proposal.getString("tf_typeId").equals(proposal.getString("tf_oldTypeId"))) { + dao.update(ProposalInfo.class, Chain.make("typeId", proposal.getString("tf_typeId")), Cnd.where(ProposalInfo::getId, "=", proposal.getString("id"))); + } flowCommonService.executeTask(taskArgs); } return Result.success(); } + + @At + @SaCheckLogin + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("proposal.committeeFiling") + @ApiOperation("撤销任务") + public Result revokeTask(@Param("taskId") Long taskId, @Param("proposalId") String proposalId) { + // 单条撤回 + List mergeProposalIds = proposalCommonService.mergeProposal(proposalId); + if (ObjectUtil.isEmpty(mergeProposalIds)) { + //撤回要把修改的提案编号和提案类型同步改回来 + ProcessTask processTask = dao.fetch(ProcessTask.class, taskId); + Dict processTaskArgs = JSONUtil.toBean(processTask.getVariable(), Dict.class); + String tfOldCode = processTaskArgs.getStr("tf_oldCode"); + String tfOldTypeId = processTaskArgs.getStr("tf_oldTypeId"); + dao.update(ProposalInfo.class, + Chain.make("code", tfOldCode).add("typeId", tfOldTypeId), + Cnd.where(ProposalInfo::getId, "=", proposalId)); + + flowCommonService.revokeTask(taskId); + return Result.success(); + } + // 并案撤回 + ProcessTask thisTask = dao.fetch(ProcessTask.class, taskId); + List mergeTasks = processTaskService.getDoneTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName()); + for (ProcessTask mergeTask : mergeTasks) { + //撤回要把修改的提案编号和提案类型同步改回来 + Dict processTaskArgs = JSONUtil.toBean(mergeTask.getVariable(), Dict.class); + String tfOldCode = processTaskArgs.getStr("tf_oldCode"); + String tfOldTypeId = processTaskArgs.getStr("tf_oldTypeId"); + dao.update(ProposalInfo.class, + Chain.make("code", tfOldCode).add("typeId", tfOldTypeId), + Cnd.where(ProposalInfo::getId, "=", processTaskArgs.getStr("tf_proposalId"))); + flowCommonService.revokeTask(mergeTask.getId()); + } + // 删除并案信息 + dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "in", mergeProposalIds)); + return Result.success(); + } + + @At + @ApiOperation("执行任务") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("proposal.committeeFiling") + public Result executeTask(@Param("data") String data) { + Dict args = Json.fromJson(Dict.class, data); + + if (Objects.isNull(args.getStr("proposalId"))) { + return Result.error("参数错误！"); + } + // 审核修改提案编号和提案类型 + dao.update( + ProposalInfo.class, + Chain.make("code", args.getStr("tf_code")).add("typeId", args.getStr("tf_typeId")), + Cnd.where(ProposalInfo::getId, "=", args.getStr("proposalId"))); + flowCommonService.executeTask(args); + return Result.success(); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingUnitController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingUnitController.java index 85694228..9b5c9e18 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingUnitController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingUnitController.java @@ -17,7 +17,7 @@ import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.flow.service.ProcessTaskService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo; +import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge; import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam; import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService; import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; @@ -148,8 +148,7 @@ public class ProposalCommitteeFilingUnitController { flowCommonService.executeTask(cloneArgs); } - ProposalInfo info = proposalCommonService.fetch(proposalId); - info.setCaseFilingResult(args.getStr("caseFilingResult")); + baseService.dao().clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "in", mergeProposalIds)); return Result.success(); } @@ -178,30 +177,30 @@ public class ProposalCommitteeFilingUnitController { @At @SaCheckPermission("proposal.committeeFilingUnit") public Result doUpData(){ - List tasks = baseService.dao().query(ProcessTask.class, Cnd.where("taskName", "=", "personnelOffice")); + List tasks = baseService.dao().query(ProcessTask.class, Cnd.where("taskName", "=", "committee")); List list = tasks.stream().map(ProcessTask::getId).toList(); List actorList = baseService.dao().query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "in", list)); - List instanceList = baseService.dao().query(ProcessInstance.class, Cnd.where(ProcessInstance::getProcessDefineId, "=", 396)); + List instanceList = baseService.dao().query(ProcessInstance.class, Cnd.where(ProcessInstance::getProcessDefineId, "=", 399)); for (ProcessTask task : tasks) { task.setTaskName("committee"); - task.setDisplayName("提案委员会立案"); + task.setDisplayName("人事处审核"); task.setFormKey("/platform/proposal/committee"); task.setH5FormKey(""); } for (ProcessTaskActor actor : actorList) { - actor.setActorId("1fb89886bf4c43dcb48409c83d3363c3"); - actor.setActorAccount("018054"); - actor.setActorName("赵丽霞"); - actor.setActorUnitName("工会"); - actor.setActorUnitId("0011"); + actor.setActorId("a2e5874eb28e42e9811f1af4d4bcb5a5"); + actor.setActorAccount("001094"); + actor.setActorName("郑胜水"); + actor.setActorUnitName("人事处(党委教师工作部、人才工作办公室)"); + actor.setActorUnitId("1001"); } for (ProcessInstance instance : instanceList) { - instance.setProcessDefineId(399L); + instance.setProcessDefineId(400L); } baseService.update(tasks); diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html index 52d3b53c..a59437e3 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html @@ -67,6 +67,7 @@ layout("/layouts/platform.html"){ :data="tableData" row-key="id" @sort-change="pageOrder" + v-loading="tableLoading" > - - - - - - - @@ -63,7 +50,7 @@ layout("/layouts/platform.html"){ size="small" type="primary" @click="$refs.onePushFormalRef.onOpen(pageForm.teacherMeetId)" - >正式委员录入 + >委员推选 @@ -86,13 +73,6 @@ layout("/layouts/platform.html"){ - - - @@ -174,6 +202,7 @@ layout("/layouts/platform.html"){ new Vue({ el: "#app", store, + dicts: ["PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE"], mixins: [initTableMixins], components: { @@ -202,10 +231,16 @@ layout("/layouts/platform.html"){ showApprovalForm: false, sessionOptions: [], delegationOptions: [], - underTakeOptions: [] + underTakeOptions: [], + typeOptions: [], } }, methods: { + mergeClose() { + this.doSearch() + this.$refs.guava.index() + this.$refs.tableRef.clearSelection(); + }, openView(row) { this.$refs.guava.edit(() => { this.showApprovalForm = false @@ -216,7 +251,12 @@ layout("/layouts/platform.html"){ this.$refs.guava.edit(() => { this.showApprovalForm = true this.formData = { + tf_code: row.code, + tf_oldCode: row.code, + tf_typeId: row.typeId, + tf_oldTypeId: row.typeId, processTaskId: row.taskId, + proposalId: row.id, taskName: row.curTaskName, tf_masterUnitId: null, tf_slaveUnitIds: [] @@ -242,7 +282,7 @@ layout("/layouts/platform.html"){ } const loading = createLoading('提交中') - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/proposal/committeeFiling/executeTask", { data: JSON.stringify({ ...this.formData, submitType: val, @@ -287,7 +327,10 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "info" }).then(() => { - this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { + this.$axios.post("/platform/proposal/committeeFiling/revokeTask", { + taskId: row.taskId, + proposalId: row.id + }).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.doSearch() @@ -321,12 +364,21 @@ layout("/layouts/platform.html"){ this.underTakeOptions = res.data } }) - } + }, + // 获取提案类别 + listProposalType() { + this.$axios.post("/platform/proposal/common/listProposalType").then((res) => { + if (res.code === 0) { + this.typeOptions = res.data + } + }) + }, }, created() { this.pageData() this.listOpenSession() this.listUnderTake() + this.listProposalType() } }) diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js index 7a1f3b8b..24c69603 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js @@ -6,13 +6,26 @@ const merge = { - + + + - + + + -