diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java index f79ace4d..ef0c603b 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java @@ -5,7 +5,11 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.ObjectUtil; 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.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; @@ -13,21 +17,32 @@ import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.flow.service.FlowCommonService; +import com.budwk.app.sys.models.Sys_role; +import com.budwk.app.sys.models.Sys_user_role; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush; +import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; 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.json.Json; 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.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.ArrayList; import java.util.List; @@ -45,6 +60,9 @@ public class TeacherCongressDelegatePushZgAuditController { @Inject private BaseService baseService; + @Inject + private FlowCommonService flowCommonService; + @At("") @Ok("beetl:/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html") @SaCheckPermission("tc.delegate.push.zcAudit") @@ -182,4 +200,64 @@ public class TeacherCongressDelegatePushZgAuditController { } + @At + @ApiOperation("审查通过") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("tc.delegate.push.zcAudit") + @SLog(tag = "代表管理-代表资格审查", msg = "审查通过") + public Result submit(@Param("data") String param, @Valid String id) { + + TeacherCongressDelegatePush delegatePush = baseService.dao().fetch(TeacherCongressDelegatePush.class, id); + View_user user = baseService.dao().fetch(View_user.class, Cnd.where("id", "=", delegatePush.getUserId())); + + if (delegatePush.getIsJdh()) { + Teacher_congress_delegate delegate = new Teacher_congress_delegate(); + Sys_user_role userRole = new Sys_user_role(); + + delegate.setUserId(user.getId()); + delegate.setLoginName(user.getLoginname()); + delegate.setUserName(user.getUsername()); + delegate.setSex(user.getSex()); + delegate.setAge(delegatePush.getAge()); + delegate.setMobile(user.getMobile()); + delegate.setUnitId(user.getUnitId()); + delegate.setUnitName(user.getUnitName()); + delegate.setUnionId(user.getUnionId()); + delegate.setUnionName(user.getUnionName()); + + delegate.setSessionId(delegatePush.getSessionId()); + + Teacher_congress_delegation_union delegation_union = baseService.dao().fetch(Teacher_congress_delegation_union.class, + Cnd.where(Teacher_congress_delegation_union::getUnionId, "=", user.getUnionId()) + .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId())); + + if (ObjectUtil.isNotEmpty(delegation_union)) { + delegate.setDelegationId(delegation_union.getId()); + userRole.setTcDelegationId(delegation_union.getId()); + } else { + return Result.error(user.getUnionName() + "没有设置到代表团,请先在代表团管理里设置。"); + } + if ("正式代表".equals(delegatePush.getRepresentativeType())) { + Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name())); + delegate.setRoleId(sys_role.getId()); + userRole.setRoleId(sys_role.getId()); + } + if ("列席代表".equals(delegatePush.getRepresentativeType())) { + Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_ATTENDANCE.name())); + delegate.setRoleId(sys_role.getId()); + delegate.setRoleId(sys_role.getId()); + userRole.setRoleId(sys_role.getId()); + } + userRole.setUserId(user.getId()); + userRole.setTcSessionId(delegatePush.getSessionId()); + baseService.dao().insert(delegate); + baseService.dao().insert(userRole); + + } + Dict args = Json.fromJson(Dict.class, param); + flowCommonService.executeTask(args); + return Result.success(); + } + + } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java index c27ef162..24b993b4 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java @@ -1,45 +1,29 @@ package com.budwk.app.zhgh.staffmanage.member.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -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.base.utils.PageUtil; -import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; -import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; -import com.budwk.app.bpm.param.BpmTaskApprovalParam; import com.budwk.app.bpm.service.BpmService; import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.base.Globals; import com.budwk.app.web.controllers.open.commons.service.CommonService; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; -import com.budwk.app.zhgh.staffmanage.member.vo.MemberCommonVo; import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -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; 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.ArrayList; import java.util.List; -import java.util.Map; /** * 会员入会申请分工会审核 diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html index b2b7d497..679ec3cd 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html @@ -14,7 +14,7 @@ layout("/layouts/platform.html"){ - + @@ -33,7 +33,7 @@ layout("/layouts/platform.html"){ 已审核 未审核 - 导出 + 导出 - + - + @@ -175,11 +175,11 @@ layout("/layouts/platform.html"){ processTaskId: row.taskId, taskName: row.curTaskName } - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/teacherCongress/delegate/push/zcAudit/submit", { data: JSON.stringify({ ...this.formData, submitType: submitType - }) + }), id: row.id }).then((res) => { if (res.code === 0) { this.$message.success(res.msg) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index 00ddb345..0bf0f85d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -393,6 +393,7 @@ layout("/layouts/platform.html"){ campus, userState, personType, + preparedBy, idCard, mobile, email, @@ -414,6 +415,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "campus", campus) this.$set(this.formData, "userState", userState) this.$set(this.formData, "personType", personType) + this.$set(this.formData, "preparedBy", preparedBy) this.$set(this.formData, "unitName", unit ? unit.name : unitName) this.$set(this.formData, "unitId", unit ? unit.id : unitId) this.$set(this.formData, "unionName", union ? union.name : unionName) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js index d3bf9f4a..442bc013 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js @@ -31,7 +31,7 @@ const INFO = { {{ viewData.userState }} {{ viewData.personType }} - {{ viewData.schoolTime }} + {{ viewData.preparedBy }}