Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/flow/handler/FlowAssignUserHandler.java

@@ -0,0 +1,34 @@
+package com.budwk.app.flow.handler;
+
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.lang.Lang;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2025/11/22 16:06
+ * @description 指定用户
+ */
+public class FlowAssignUserHandler implements AssignmentHandler {
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        String userId = execution.getArgs().getStr("userId");
+        if (Lang.isEmpty(userId)){
+            throw new RuntimeException("流程参数错误！");
+        }
+        return List.of(userId);
+    }
+
+    @Override
+    public String getMessage() {
+        return "指定下一个流程人(根据args中的userId)）";
+    }
+
+    @Override
+    public int getOrder() {
+        return AssignmentHandler.super.getOrder();
+    }
+}

src/main/java/com/budwk/app/flow/handler/FlowUnitPartySecretaryHandler.java

@@ -6,8 +6,10 @@ import com.budwk.app.flow.engine.core.Execution;
 import com.budwk.app.flow.engine.core.ServiceContext;
 import com.budwk.app.flow.engine.model.TaskModel;
 import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_unit;
 import com.budwk.app.sys.models.Sys_user_role;
 import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -31,11 +33,23 @@ public class FlowUnitPartySecretaryHandler implements AssignmentHandler {
 		SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
 		Sys_role role = sysRoleService.getByCode(RoleConstant.UNIT_PARTY_SECRETARY);
 
-		List<Sys_user_role> roles = ServiceContext.find(Dao.class).query(
+		View_user user = ServiceContext.find(Dao.class).fetch(View_user.class, Cnd.where(View_user::getId, "=", SecurityUtil.getUserId()));
-				Sys_user_role.class,
+		List<Sys_user_role> roles;
-				Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+		if(user.getUnionName().contains("行政")){
-						.and(Sys_user_role::getUnitId, "=", unitId)
+			List<Sys_unit> unitList = ServiceContext.find(Dao.class).query(Sys_unit.class, Cnd.where(Sys_unit::getUnionId, "=", user.getUnionId()));
-		);
+			List<String> unitIds = unitList.stream().map(Sys_unit::getId).toList();
+			roles = ServiceContext.find(Dao.class).query(
+					Sys_user_role.class,
+					Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+							.and(Sys_user_role::getUnitId, "in", unitIds)
+			);
+		}else{
+			roles = ServiceContext.find(Dao.class).query(
+					Sys_user_role.class,
+					Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+							.and(Sys_user_role::getUnitId, "=", unitId)
+			);
+		}
 
 		if (Lang.isEmpty(roles)) {
 			throw new RuntimeException("当前登录用户所在单位未设置单位党委书记，请联系校工会进行设置。");
@@ -45,7 +59,7 @@ public class FlowUnitPartySecretaryHandler implements AssignmentHandler {
 
 	@Override
 	public String getMessage() {
-		return "获取当前登录用户所在单位党委书记";
+		return "获取当前登录用户所在单位党委书记，若是行政就找出行政分下的党委书记。因为行政只有一个党委书记";
 	}
 
 	@Override

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java

@@ -25,6 +25,7 @@ import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_con
 import com.budwk.app.zhgh.democratic.teachercongress.delegate.param.*;
 import com.budwk.app.zhgh.democratic.teachercongress.delegate.service.TeacherCongressDelegateService;
 import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation;
+import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union;
 import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -479,4 +480,45 @@ public class TeacherCongressDelegateManageController {
     }
 
 
+    @At
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("tc.delegate.manage")
+    public Result doAllocateDelegation(String sessionId) {
+        List<Teacher_congress_delegate> delegateList = dao.query(Teacher_congress_delegate.class,
+                Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId)
+                        .and(Teacher_congress_delegate::getDelegationId, "is", null));
+
+        for (Teacher_congress_delegate delegate : delegateList) {
+            Teacher_congress_delegation_unit delegation_unit = dao.fetch(Teacher_congress_delegation_unit.class,
+                    Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", delegate.getUnitId())
+                            .and(Teacher_congress_delegation_union::getSessionId, "=", sessionId));
+            if (ObjectUtil.isNotEmpty(delegation_unit)) {
+                delegate.setDelegationId(delegation_unit.getDelegationId());
+                dao.update(delegate);
+                Sys_user_role userRole = new Sys_user_role();
+                userRole.setTcDelegationId(delegation_unit.getDelegationId());
+                userRole.setUserId(delegate.getUserId());
+                userRole.setTcSessionId(delegate.getSessionId());
+                Sys_role sys_role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()));
+
+                if (sys_role.getId().equals(delegate.getRoleId())) {
+                    delegate.setRoleId(sys_role.getId());
+                    userRole.setRoleId(sys_role.getId());
+                }
+
+                Sys_role sys_role2 = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_ATTENDANCE.name()));
+                if (sys_role2.getId().equals(delegate.getRoleId())) {
+                    delegate.setRoleId(sys_role2.getId());
+                    userRole.setRoleId(sys_role2.getId());
+                }
+                userRole.setTcDelegationId(delegate.getDelegationId());
+                dao.insert(userRole);
+            }
+            sysUserService.clearCache();
+        }
+        return Result.success();
+    }
+
+
+
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
@@ -16,8 +17,8 @@ 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.ProcessInstanceStateEnum;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -124,9 +125,15 @@ public class TeacherCongressDelegatePushController {
             cnd.and(group);
         }
         cnd.desc("info.createdAt");
-        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-            cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+            if (AuthUtil.hasRole(RoleConstant.UNIT_PARTY_SECRETARY.name())){
+                cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId());
+            }else{
+                cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+            }
+
         }
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
@@ -172,7 +179,7 @@ public class TeacherCongressDelegatePushController {
                 """);
         sql.setParam("sessionId", sessionId);
         Cnd cnd = Cnd.NEW();
-        cnd.and("u.member", "=", 1);
+//        cnd.and("u.member", "=", 1);
         cnd.and("u.username", "is not", null);
         cnd.andEX("u.id", "not in", userIds);
         cnd.and("tcd.userId", "is", null);
@@ -326,7 +333,9 @@ public class TeacherCongressDelegatePushController {
         // 已上报专任教师人数
         int ordinaryTeacher = (int) writeList.stream().filter(v -> v.getBoolean("ordinaryTeacher")).count();
         // 已上报45岁以下代表
-        int under45 = (int) writeList.stream().filter(v -> Convert.toInt(v.getInt("age"), 0) <= 45).count();
+//        int under45 = (int) writeList.stream().filter(v -> Convert.toInt(v.getInt("age"), 0) <= 45).count();
+        //已上报聘用制人员
+        int employ = (int) writeList.stream().filter(v -> v.getBoolean("employ")).count();
 
         StringBuffer tips = new StringBuffer();
 
@@ -352,8 +361,12 @@ public class TeacherCongressDelegatePushController {
             tips.append("女教师代表数不满足分配名额数！");
         }
 
-        if (under45 < allocation.getLess45Num()) {
+//        if (under45 < allocation.getLess45Num()) {
-            tips.append("45岁以下教师代表数不满足分配名额数！");
+//            tips.append("45岁以下教师代表数不满足分配名额数！");
+//        }
+
+        if (employ < allocation.getEmployNum()) {
+            tips.append("聘用制代表数不满足分配名额数！");
         }
 
         if (StrUtil.isNotBlank(tips)) {
@@ -366,7 +379,7 @@ public class TeacherCongressDelegatePushController {
 
     @At
     @ApiOperation("本单位代表上报情况")
-    @SaCheckPermission("tc.delegate.push")
+    @SaCheckPermission(value = {"tc.delegate.push","tc.delegate.push.dwSjAudit"}, mode = SaMode.OR)
     public Result selfUnionPushMetric(String sessionId, String unionId) {
         if (StrUtil.isBlank(unionId)) {
             unionId = SecurityUtil.getUnionId();
@@ -378,14 +391,37 @@ public class TeacherCongressDelegatePushController {
         if (allocation == null) {
             return Result.success();
         }
-
         Sql sql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  teacher_congress_delegate_push 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
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("info.unionId", "=", unionId);
+        SqlExpressionGroup group = new SqlExpressionGroup();
+        group.or("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62");
+        group.or("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378");
+        group.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801");
+        group.or("t.taskName", "is", null);
+        cnd.and(group);
+        cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode());
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.andEX("info.schoolLeader", "!=", 1);
+        cnd.andEX("info.representativeType", "=", "正式代表");
+        sql.setCondition(cnd);
+        List<NutMap> writeList = baseService.listMap(sql);
+  /*      Sql sql = Sqls.create("""
                 SELECT
                   info.*,
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,
-                  ins.variable instanceVariale,
+                  ins.variable instanceVariable,
                   ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,
@@ -395,23 +431,27 @@ public class TeacherCongressDelegatePushController {
                   t.taskState,
                   t.finishTime,
                   t.taskParentId,
-                  t.variable taskVariale,
+                  t.variable taskVariable,
-                  IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
-                  (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask' AND taskState IN (10, 20)) AS startTaskId
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
                 FROM
-                  teacher_congress_delegate_push info
+                  wf_process_task t
-                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
-                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id
+                  LEFT JOIN teacher_congress_delegate_push info ON info.id = ins.businessNo
-                  AND t.taskState = 10
+                  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 cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62");
+        cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
         cnd.andEX("info.sessionId", "=", sessionId);
         cnd.andEX("info.unionId", "=", unionId);
         cnd.andEX("info.representativeType", "=", "正式代表");
-        cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
+        cnd.groupBy("t.id");
         sql.setCondition(cnd);
-        List<NutMap> writeList = baseService.listMap(sql);
+        List<NutMap> writeList = baseService.listMap(sql);*/
 
 
         // 上报总人数
@@ -436,6 +476,8 @@ public class TeacherCongressDelegatePushController {
         long schoolLeader = writeList.stream().filter(v -> v.getBoolean("schoolLeader")).count();
         // 中层领导数
         long middleLevelLeader = writeList.stream().filter(v -> v.getBoolean("middleLevelLeader")).count();
+        // 聘用制
+        int employ = (int) writeList.stream().filter(v -> v.getBoolean("employ")).count();
 
         HashMap<String, Object> hashMap = new HashMap<>();
 
@@ -478,7 +520,7 @@ public class TeacherCongressDelegatePushController {
         workerMap.put("current", worker);
         workerMap.put("target", allocation.getWorkerNum());
         workerMap.put("progress", allocation.getWorkerNum() != 0 ? (double) worker / allocation.getWorkerNum() : 0.0);
-        workerMap.put("remaining", allocation.getWorkerNum() - cadre);
+        workerMap.put("remaining", allocation.getWorkerNum() - worker);
         hashMap.put("worker", workerMap);
 
         HashMap<String, Object> ordinaryTeaMap = new HashMap<>();
@@ -488,12 +530,20 @@ public class TeacherCongressDelegatePushController {
         ordinaryTeaMap.put("remaining", allocation.getOrdinaryTeaNum() - ordinaryTeacher);
         hashMap.put("ordinaryTeacher", ordinaryTeaMap);
 
-        HashMap<String, Object> under45Map = new HashMap<>();
+//        HashMap<String, Object> under45Map = new HashMap<>();
-        under45Map.put("current", under45);
+//        under45Map.put("current", under45);
-        under45Map.put("target", allocation.getLess45Num());
+//        under45Map.put("target", allocation.getLess45Num());
-        under45Map.put("progress", allocation.getLess45Num() != 0 ? (double) under45 / allocation.getLess45Num() : 0.0);
+//        under45Map.put("progress", allocation.getLess45Num() != 0 ? (double) under45 / allocation.getLess45Num() : 0.0);
-        under45Map.put("remaining", allocation.getLess45Num() - under45);
+//        under45Map.put("remaining", allocation.getLess45Num() - under45);
-        hashMap.put("under45", under45Map);
+//        hashMap.put("under45", under45Map);
+
+        // 聘用制
+        HashMap<String, Object> employMap = new HashMap<>();
+        employMap.put("current", employ);
+        employMap.put("target", allocation.getEmployNum());
+        employMap.put("progress", allocation.getEmployNum() != 0 ? (double) employ / allocation.getEmployNum() : 0.0);
+        employMap.put("remaining", allocation.getEmployNum() - employ);
+        hashMap.put("employ", employMap);
 
 /*        HashMap<String, Object> ethnicMinorityMap = new HashMap<>();
         ethnicMinorityMap.put("current", (int) ethnicMinority);

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushDwSjAuditController.java

@@ -0,0 +1,160 @@
+package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+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;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.teachercongress.delegate.service.TeacherCongressDelegatePushService;
+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.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.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2025/11/22 11:07
+ * @description 党委书记审核
+ */
+@IocBean
+@At("/platform/teacherCongress/delegate/push/dwSjAudit")
+@Ok("json:full")
+@Slf4j
+@Api(value = "/platform/teacherCongress/delegate/push/dwSjAudit", tags = "党委书记审核")
+public class TeacherCongressDelegatePushDwSjAuditController {
+
+
+    @Inject
+    private Dao dao;
+
+    @Inject
+    private BaseService baseService;
+
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @Inject
+    private FlowEngine flowEngine;
+
+    @Inject
+    private TeacherCongressDelegatePushService teacherCongressDelegatePushService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html")
+    @SaCheckPermission("tc.delegate.push.dwSjAudit")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("tc.delegate.push.dwSjAudit")
+    public Result pageData(PageForm pageForm,
+                           @Param(value = "sessionId") String sessionId,
+                           @Param(value = "unionId") String unionId,
+                           @Param(value = "approval") Boolean approval,
+                           @Param(value = "isFormalOrAttendance") String isFormalOrAttendance) {
+
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  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
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN teacher_congress_delegate_push info ON info.id = ins.businessNo
+                  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 cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62");
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+        if (!"全部".equals(isFormalOrAttendance)) {
+            cnd.and("info.representativeType", "=", isFormalOrAttendance);
+        }
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.andEX("info.unionId", "=", unionId);
+        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 (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.orLike("info.userName", pageForm.getSearchKeyword());
+            group.orLike("info.loginName", pageForm.getSearchKeyword());
+            cnd.and(group);
+        }
+
+        cnd.groupBy("t.id");
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("t.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+    @At
+    @ApiOperation("党委书记提交")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("tc.delegate.push.dwSjAudit")
+    public Result batchSubmit(String sessionId) {
+        String unionId = SecurityUtil.getUnionId();
+
+
+        String str = teacherCongressDelegatePushService.batchSubmitWhere(sessionId, unionId);
+        if (StrUtil.isNotBlank(str)) {
+            return Result.error(str);
+        }
+        teacherCongressDelegatePushService.batchSubmit(unionId, sessionId);
+
+        return Result.success();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushWriteController.java

@@ -14,10 +14,12 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -112,6 +114,7 @@ public class TeacherCongressDelegatePushWriteController {
     @At
     @ApiOperation("代表信息填写提交")
     @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
     public Result submit(TeacherCongressDelegatePush teacherCongressDelegatePush,String taskId){
         dao.updateIgnoreNull(teacherCongressDelegatePush);
 
@@ -124,4 +127,15 @@ public class TeacherCongressDelegatePushWriteController {
     }
 
 
+
+    @At
+    @ApiOperation("代表信息填写的信息")
+    @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
+    public Result finOne(String id){
+        TeacherCongressDelegatePush delegatePush = baseService.dao().fetch(TeacherCongressDelegatePush.class, Cnd.where("id", "=", id));
+        return Result.success(delegatePush);
+    }
+
+
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java

@@ -6,8 +6,8 @@ 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 cn.hutool.json.JSONUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -19,16 +19,16 @@ 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;
 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 com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit;
 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.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
@@ -46,6 +46,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author zhf
@@ -228,16 +231,16 @@ public class TeacherCongressDelegatePushZgAuditController {
 
             delegate.setSessionId(delegatePush.getSessionId());
 
-            Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class,
+            /*Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class,
                     Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", user.getUnitId())
                             .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId()));
 
             if (ObjectUtil.isNotEmpty(delegation_unit)) {
-                delegate.setDelegationId(delegation_unit.getId());
+                delegate.setDelegationId(delegation_unit.getDelegationId());
-                userRole.setTcDelegationId(delegation_unit.getId());
+                userRole.setTcDelegationId(delegation_unit.getDelegationId());
             } else {
                 return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。");
-            }
+            }*/
             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());
@@ -246,14 +249,19 @@ public class TeacherCongressDelegatePushZgAuditController {
             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);
+//            baseService.dao().insert(userRole);
 
+            // 去改改用户表的手机号
+            baseService.dao().update(
+                    Sys_user.class,
+                    Chain.make("mobile", delegatePush.getMobile()),
+                    Cnd.where(Sys_user::getId, "=", user.getId())
+            );
         }
         Dict args = Json.fromJson(Dict.class, param);
         flowCommonService.executeTask(args);
@@ -261,4 +269,93 @@ public class TeacherCongressDelegatePushZgAuditController {
     }
 
 
+
+    @At
+    @ApiOperation("批量审查")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("tc.delegate.push.zcAudit")
+    @SLog(tag = "代表管理-代表资格批量审查", msg = "批量审查")
+    public Result submitBatch(@Param("data") String param) {
+        List<NutMap> list = JSONUtil.parseArray(param).toList(NutMap.class);
+
+        // 审核的 id 列表 Map
+        Map<String, NutMap> dataMap = list.stream().collect(Collectors.toMap(v -> v.getString("id"), v -> v));
+        Set<String> idKeySet = dataMap.keySet();
+
+        List<TeacherCongressDelegatePush> pushList = baseService.dao().query(
+                TeacherCongressDelegatePush.class,
+                Cnd.where(TeacherCongressDelegatePush::getId, "in", idKeySet)
+        );
+
+        List<String> userIdList = pushList.stream().map(TeacherCongressDelegatePush::getUserId).toList();
+
+        Map<String, View_user> userMap = baseService.dao().query(View_user.class, Cnd.where("id", "in", userIdList))
+                .stream().collect(Collectors.toMap(View_user::getId, v -> v));
+
+        // 去循环审核数据
+        for (TeacherCongressDelegatePush delegatePush : pushList) {
+            View_user user = userMap.get(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_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class,
+                        Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", user.getUnitId())
+                                .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId()));
+
+                if (ObjectUtil.isNotEmpty(delegation_unit)) {
+                    delegate.setDelegationId(delegation_unit.getDelegationId());
+                    userRole.setTcDelegationId(delegation_unit.getDelegationId());
+                } else {
+                    return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。");
+                }*/
+                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());
+                    userRole.setRoleId(sys_role.getId());
+                }
+                userRole.setUserId(user.getId());
+                userRole.setTcSessionId(delegatePush.getSessionId());
+
+                baseService.dao().insert(delegate);
+
+                // 去改改用户表的手机号
+                baseService.dao().update(
+                        Sys_user.class,
+                        Chain.make("mobile", delegatePush.getMobile()),
+                        Cnd.where(Sys_user::getId, "=", user.getId())
+                );
+
+                NutMap nutMap = dataMap.get(delegatePush.getId());
+
+                Dict args = Dict.create();
+                args.set("processTaskId", nutMap.getString("processTaskId"));
+                args.set("taskName", nutMap.getString("taskName"));
+                args.set("submitType", nutMap.getString("submitType"));
+                flowCommonService.executeTask(args);
+            }
+        }
+
+        return Result.success();
+    }
+
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateTransitionController.java

@@ -13,6 +13,7 @@ import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -29,6 +30,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+@Slf4j
 @IocBean
 @At("/platform/zhgh/democratic/teacherCongress/delegate/transition")
 @Api(tags = "教代会代表换届变动信息")
@@ -50,72 +52,77 @@ public class TeacherCongressDelegateTransitionController {
     @At
     @SaCheckPermission("tc.delegate.transition")
     public Result pageData(String sessionId) {
-        // 当前届次
+        try {
-        Teacher_congress_session session = dao.fetch(Teacher_congress_session.class, sessionId);
+            // 当前届次
-        // 上一届次
+            Teacher_congress_session session = dao.fetch(Teacher_congress_session.class, sessionId);
-        Teacher_congress_session lastSession = dao.fetch(Teacher_congress_session.class, Cnd.where(Teacher_congress_session::getStartDate, "<", session.getStartDate()).desc(Teacher_congress_session::getStartDate));
+            // 上一届次
-        // 当前届次代表团
+            Teacher_congress_session lastSession = dao.fetch(Teacher_congress_session.class, Cnd.where(Teacher_congress_session::getStartDate, "<", session.getStartDate()).desc(Teacher_congress_session::getStartDate));
-        List<Teacher_congress_delegation> delegations = dao.query(Teacher_congress_delegation.class, Cnd.where(Teacher_congress_delegation::getSessionId, "=", sessionId).asc(Teacher_congress_delegation::getCode));
+            // 当前届次代表团
+            List<Teacher_congress_delegation> delegations = dao.query(Teacher_congress_delegation.class, Cnd.where(Teacher_congress_delegation::getSessionId, "=", sessionId).asc(Teacher_congress_delegation::getCode));
 
-        // 当前届次代表
+            // 当前届次代表
-        List<Teacher_congress_delegate> delegates = dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId));
+            List<Teacher_congress_delegate> delegates = dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId));
-        dao.fetchLinks(delegates, "delegation");
+            dao.fetchLinks(delegates, "delegation");
-        // 上一届次代表
+            // 上一届次代表
-        List<Teacher_congress_delegate> lastDelegates;
+            List<Teacher_congress_delegate> lastDelegates;
-        if (lastSession != null) {
+            if (lastSession != null) {
-            lastDelegates =  dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", lastSession.getId()));
+                lastDelegates =  dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", lastSession.getId()));
-            dao.fetchLinks(lastDelegates, "delegation");
+                dao.fetchLinks(lastDelegates, "delegation");
-        } else {
+            } else {
-            lastDelegates = new ArrayList<>();
+                lastDelegates = new ArrayList<>();
+            }
+
+            // 代表数据
+            List<NutMap> delegateFull = delegates.stream().map(delegate -> {
+                NutMap delegateMap = NutMap.NEW();
+                delegateMap.put("userId", delegate.getUserId());
+                delegateMap.put("userName", delegate.getUserName());
+
+                // 本届次代表团信息
+                delegateMap.put("delegationId", delegate.getDelegationId());
+                delegateMap.put("delegationName", delegate.getDelegation().getName());
+                delegateMap.put("delegationCode", delegate.getDelegation().getCode());
+
+                // 上一届次代表团信息
+                lastDelegates.stream().filter(lastDelegate -> lastDelegate.getUserId().equals(delegate.getUserId())).findFirst().ifPresentOrElse(lastDelegate -> {
+                    delegateMap.put("lastDelegationId", lastDelegate.getDelegationId());
+                    delegateMap.put("lastDelegationName", lastDelegate.getDelegation().getName());
+                    delegateMap.put("lastDelegationCode", lastDelegate.getDelegation().getCode());
+                }, () -> {
+                    delegateMap.put("lastDelegationId", "");
+                    delegateMap.put("lastDelegationName", "");
+                    delegateMap.put("lastDelegationCode", "");
+                });
+
+                return delegateMap;
+            }).toList();
+
+
+            List<NutMap> list = delegations.stream().map(delegation -> {
+                NutMap map = NutMap.NEW();
+                map.put("id", delegation.getId());
+                map.put("name", delegation.getName());
+                map.put("code", delegation.getCode());
+                // 上一届次人数
+                map.put("lastCount", delegateFull.stream().filter(delegate -> delegate.getString("lastDelegationCode").equals(delegation.getCode())).count());
+                // 增补代表数 （上一届次不是代表 但是本届次是代表）
+                map.put("addCount", delegateFull.stream().filter(delegate -> StrUtil.isBlank(delegate.getString("lastDelegationCode")) && delegate.getString("delegationCode").equals(delegation.getCode())).count());
+                // 转入代表数 （上一届次是代表 但是在别的代表团）
+                map.put("transferCount", delegateFull.stream().filter(delegate -> StrUtil.isNotBlank(delegate.getString("lastDelegationCode")) && !delegate.getString("lastDelegationCode").equals(delegation.getCode()) && delegate.getString("delegationCode").equals(delegation.getCode())).count());
+                // 转出代表数 （上一届次在本团 本届次转出去了）
+                map.put("transferOutCount", delegateFull.stream().filter(delegate -> delegate.getString("lastDelegationCode").equals(delegation.getCode()) && StrUtil.isNotBlank(delegate.getString("delegationCode")) && !delegate.getString("delegationCode").equals(delegation.getCode())).count());
+                // 减少代表数 （上一届次是代表 本届次不是代表）
+                map.put("reduceCount", delegateFull.stream().filter(delegate -> delegate.getString("lastDelegationCode").equals(delegation.getCode()) && StrUtil.isBlank(delegate.getString("delegationCode"))).count());
+                // 当前代表数
+                map.put("currentCount", delegateFull.stream().filter(delegate -> delegate.getString("delegationCode").equals(delegation.getCode())).count());
+                return map;
+            }).toList();
+
+            return Result.success(list);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return Result.success();
         }
-
-        // 代表数据
-        List<NutMap> delegateFull = delegates.stream().map(delegate -> {
-            NutMap delegateMap = NutMap.NEW();
-            delegateMap.put("userId", delegate.getUserId());
-            delegateMap.put("userName", delegate.getUserName());
-
-            // 本届次代表团信息
-            delegateMap.put("delegationId", delegate.getDelegationId());
-            delegateMap.put("delegationName", delegate.getDelegation().getName());
-            delegateMap.put("delegationCode", delegate.getDelegation().getCode());
-
-            // 上一届次代表团信息
-            lastDelegates.stream().filter(lastDelegate -> lastDelegate.getUserId().equals(delegate.getUserId())).findFirst().ifPresentOrElse(lastDelegate -> {
-                delegateMap.put("lastDelegationId", lastDelegate.getDelegationId());
-                delegateMap.put("lastDelegationName", lastDelegate.getDelegation().getName());
-                delegateMap.put("lastDelegationCode", lastDelegate.getDelegation().getCode());
-            }, () -> {
-                delegateMap.put("lastDelegationId", "");
-                delegateMap.put("lastDelegationName", "");
-                delegateMap.put("lastDelegationCode", "");
-            });
-
-            return delegateMap;
-        }).toList();
-
-
-        List<NutMap> list = delegations.stream().map(delegation -> {
-            NutMap map = NutMap.NEW();
-            map.put("id", delegation.getId());
-            map.put("name", delegation.getName());
-            map.put("code", delegation.getCode());
-            // 上一届次人数
-            map.put("lastCount", delegateFull.stream().filter(delegate -> delegate.getString("lastDelegationCode").equals(delegation.getCode())).count());
-            // 增补代表数 （上一届次不是代表 但是本届次是代表）
-            map.put("addCount", delegateFull.stream().filter(delegate -> StrUtil.isBlank(delegate.getString("lastDelegationCode")) && delegate.getString("delegationCode").equals(delegation.getCode())).count());
-            // 转入代表数 （上一届次是代表 但是在别的代表团）
-            map.put("transferCount", delegateFull.stream().filter(delegate -> StrUtil.isNotBlank(delegate.getString("lastDelegationCode")) && !delegate.getString("lastDelegationCode").equals(delegation.getCode()) && delegate.getString("delegationCode").equals(delegation.getCode())).count());
-            // 转出代表数 （上一届次在本团 本届次转出去了）
-            map.put("transferOutCount", delegateFull.stream().filter(delegate -> delegate.getString("lastDelegationCode").equals(delegation.getCode()) && StrUtil.isNotBlank(delegate.getString("delegationCode")) && !delegate.getString("delegationCode").equals(delegation.getCode())).count());
-            // 减少代表数 （上一届次是代表 本届次不是代表）
-            map.put("reduceCount", delegateFull.stream().filter(delegate -> delegate.getString("lastDelegationCode").equals(delegation.getCode()) && StrUtil.isBlank(delegate.getString("delegationCode"))).count());
-            // 当前代表数
-            map.put("currentCount", delegateFull.stream().filter(delegate -> delegate.getString("delegationCode").equals(delegation.getCode())).count());
-            return map;
-        }).toList();
-
-        return Result.success(list);
     }
 
 

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/models/TeacherCongressDelegatePush.java

@@ -135,6 +135,12 @@ public class TeacherCongressDelegatePush extends BaseModel {
     @Default("0")
     private Boolean middleLevelLeader;
 
+    @Column
+    @Comment("是否聘用制")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean employ;
+
     @Column
     @Comment("年龄")
     @ColDefine(type = ColType.INT)

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushService.java

@@ -7,4 +7,9 @@ public interface TeacherCongressDelegatePushService extends BaseService<TeacherC
 
     void batchSubmit(String[] ids, String sessionId);
 
+
+    void batchSubmit(String unionId ,String sessionId);
+
+
+    String batchSubmitWhere(String sessionId,String unionId);
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java

@@ -1,15 +1,20 @@
 package com.budwk.app.zhgh.democratic.teachercongress.delegate.service;
 
 import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush;
+import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_quota_allocation;
 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.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -67,8 +72,198 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl<Teac
             Dict dict = Dict.create();
             dict.set(FlowConst.PROCESS_TASK_ID_KEY, push.getString("taskId"));
             dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.AGREE.getCode());
-            dict.set(FlowConst.EXT_ENABLE_OPERATOR,true);
+            dict.set(FlowConst.EXT_ENABLE_OPERATOR, true);
             flowCommonService.executeTask(dict);
         });
     }
+
+
+    @Override
+    public void batchSubmit(String unionId, String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  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
+                  teacher_congress_delegate_push 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
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378");
+        cnd.and("info.unionId", "=", unionId);
+        sql.setCondition(cnd);
+        List<NutMap> delegatePushList = listMap(sql);
+
+        delegatePushList.forEach(push -> {
+            Dict dict = Dict.create();
+            dict.set(FlowConst.PROCESS_TASK_ID_KEY, push.getString("taskId"));
+            dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.AGREE.getCode());
+            dict.set(FlowConst.EXT_ENABLE_OPERATOR, true);
+            dict.set("sessionId", sessionId);
+            flowCommonService.executeTask(dict);
+        });
+    }
+
+
+    @Override
+    public String batchSubmitWhere(String sessionId, String unionId) {
+        if (StrUtil.isBlank(sessionId)) {
+            return "参数错误！";
+        }
+
+        if (StrUtil.isBlank(unionId)) {
+            unionId = SecurityUtil.getUnionId();
+        }
+
+        Teacher_congress_quota_allocation allocation = dao().fetch(Teacher_congress_quota_allocation.class,
+                Cnd.where(Teacher_congress_quota_allocation::getSessionId, "=", sessionId)
+                        .and(Teacher_congress_quota_allocation::getUnionId, "=", unionId));
+
+
+        if (allocation == null) {
+            return "请先设置名额分配";
+        }
+        if (allocation.getAllocationNum() == 0) {
+            return "请先设置名额分配";
+        }
+
+        Sql countSql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  teacher_congress_delegate_push 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
+                $condition
+                """);
+        Cnd countCnd = Cnd.NEW();
+        SqlExpressionGroup countGroup = new SqlExpressionGroup();
+        countGroup.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801");
+        countGroup.or("t.taskName", "is", null);
+        countCnd.and(countGroup);
+        countCnd.and("info.unionId", "=", unionId);
+        countSql.setCondition(countCnd);
+        List<NutMap> delegatePushList = listMap(countSql);
+
+
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  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
+                FROM
+                  teacher_congress_delegate_push 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();
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.schoolLeader", "!=", 1);
+        SqlExpressionGroup group = new SqlExpressionGroup();
+        group.or("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378");
+        group.or("t.taskName", "is", null);
+        cnd.and(group);
+        cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode());
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        List<NutMap> writeList = listMap(sql);
+
+        if (!delegatePushList.isEmpty() && writeList.isEmpty()) {
+            return "您已提交无需再提交！";
+        }
+
+
+        // 已上报总人数
+        int total = writeList.size();
+        // 已上报女代表人数
+        int female = (int) writeList.stream().filter(v -> List.of("女", "女性").contains(v.getString("sex"))).count();
+        // 已上报高级职称人数
+        int seniorTeacher = (int) writeList.stream().filter(v -> v.getBoolean("seniorTeacher")).count();
+        //已上报中级职称及以下代表数
+        int intermediateBelow = (int) writeList.stream().filter(v -> v.getBoolean("intermediateBelow")).count();
+        //已上报干部代表数
+        int cadre = (int) writeList.stream().filter(v -> v.getBoolean("cadre")).count();
+        //已上报工人代表数
+        int worker = (int) writeList.stream().filter(v -> v.getBoolean("worker")).count();
+        // 已上报专任教师人数
+        int ordinaryTeacher = (int) writeList.stream().filter(v -> v.getBoolean("ordinaryTeacher")).count();
+        // 已上报45岁以下代表
+//        int under45 = (int) writeList.stream().filter(v -> Convert.toInt(v.getInt("age"), 0) <= 45).count();
+        // 聘用值代表
+        int employ = (int) writeList.stream().filter(v -> v.getBoolean("employ")).count();
+
+        StringBuffer tips = new StringBuffer();
+
+        if (total > allocation.getAllocationNum()) {
+            tips.append("上报总人数超出分配名额！");
+        }
+        if (total < allocation.getAllocationNum()) {
+            tips.append("上报总人数不满足分配名额！");
+        }
+
+        if (seniorTeacher < allocation.getSeniorTeaNum()) {
+            tips.append("高级职称专任教师数不满足分配名额数！");
+        }
+        if (intermediateBelow < allocation.getIntermediateBelowNum()) {
+            tips.append("中级职称及以下代表数不满足分配名额数！");
+        }
+
+        if (cadre < allocation.getCadreNum()) {
+            tips.append("干部代表数不满足分配名额数！");
+        }
+
+        if (worker < allocation.getWorkerNum()) {
+            tips.append("工人代表数不满足分配名额数！");
+        }
+        if (female < allocation.getFemaleNum()) {
+            tips.append("女教师代表数不满足分配名额数！");
+        }
+
+//        if (under45 < allocation.getLess45Num()) {
+//            tips.append("45岁以下教师代表数不满足分配名额数！");
+//        }
+
+        if (employ < allocation.getEmployNum()) {
+            tips.append("聘用制代表数不满足分配名额数！");
+        }
+
+
+        if (StrUtil.isNotBlank(tips)) {
+            return tips.toString();
+        }
+        return null;
+    }
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/controller/TeacherCongressQuotaAllocationController.java

@@ -63,6 +63,7 @@ public class TeacherCongressQuotaAllocationController {
                   tcqa.workerNum,
                   tcqa.femaleNum,
                   tcqa.less45Num,
+                  tcqa.employNum,
                   COALESCE(u_count, 0) AS memberCount,
                   COALESCE(db_count, 0) AS dbCount
                 FROM
@@ -102,7 +103,8 @@ public class TeacherCongressQuotaAllocationController {
                   t2.cadreNum,
                   t2.workerNum,
                   t2.femaleNum,
-                  t2.less45Num
+                  t2.less45Num,
+                  t2.employNum
                 FROM
                   `sys_union` un
                   LEFT JOIN (SELECT unionId, COUNT(id) AS u_count FROM vw_user WHERE member = 1 GROUP BY unionId) u ON u.unionId = un.id

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/models/Teacher_congress_quota_allocation.java

@@ -89,6 +89,10 @@ public class Teacher_congress_quota_allocation extends BaseModel {
     @Default("0")
     private Integer less45Num;
 
-
+    @Column
+    @Comment("聘用制代表数")
+    @ColDefine(type = ColType.INT, width = 4)
+    @Default("0")
+    private Integer employNum;
 
 }

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html

@@ -38,6 +38,9 @@ layout("/layouts/platform.html"){
 
     <el-card shadow="never">
         <table-tool>
+            <el-button size="small" type="primary" icon="el-icon-plus" @click="doAllocateDelegation">
+                根据单位分配代表团
+            </el-button>
             <el-button size="small" type="primary" icon="el-icon-plus" @click="excelImportDialog = true">导入代表</el-button>
             <el-button size="small" type="primary" icon="el-icon-plus" @click="$refs.addFormRef.onOpen(pageForm.sessionId,pageForm.delegationId)">新增代表</el-button>
             <el-button
@@ -139,6 +142,20 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            doAllocateDelegation() {
+                this.$confirm("确定要一键给没有代表团的代表，根据单位所在代表团设置代表团吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post(loc() + "/doAllocateDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
             sessionChange() {
                 this.pageForm.delegationId = null
                 this.delegationOptions = []

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/auditInfo.js

@@ -0,0 +1,113 @@
+const auditInfo = {
+    template: /*language=HTML*/ `
+        <div>
+            <div class="proposal-info">
+                <div class="process-title">
+                    基础信息
+                    <el-link type="primary" @click="openChart">点击查看流程图</el-link>
+                </div>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="姓名">{{ viewData.userName }}</el-descriptions-item>
+                    <el-descriptions-item label="工号">{{viewData.loginName }}</el-descriptions-item>
+                    <el-descriptions-item label="性别">{{viewData.sex }}</el-descriptions-item>
+                    <el-descriptions-item label="出生年月">{{$moment(viewData.birthday).format("YYYY-MM-DD") }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="手机号">{{viewData.mobile }}</el-descriptions-item>
+                    <el-descriptions-item label="民族">{{viewData.nation }}</el-descriptions-item>
+                    <el-descriptions-item label="政治面貌">{{viewData.political }}</el-descriptions-item>
+                    <el-descriptions-item label="所属工会">{{viewData.unionName }}</el-descriptions-item>
+                    <el-descriptions-item label="所属单位">{{viewData.unitName }}</el-descriptions-item>
+                    <el-descriptions-item label="文化程度">{{viewData.education }}</el-descriptions-item>
+                    <el-descriptions-item label="职务">{{viewData.position }}</el-descriptions-item>
+                    <el-descriptions-item label="职称">{{viewData.professionalTitle }}</el-descriptions-item>
+                    <el-descriptions-item label="是否聘用制">{{viewData.employ?'是':'否' }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="是否高级职称">{{viewData.seniorTeacher?'是':'否' }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="是否中级职称及以下">{{viewData.intermediateBelow?'是':'否' }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="是否干部">{{viewData.cadre?'是':'否' }}</el-descriptions-item>
+                    <el-descriptions-item label="是否工人">{{viewData.worker?'是':'否' }}</el-descriptions-item>
+                    <el-descriptions-item label="校级领导">{{viewData.schoolLeader?'是':'否' }}</el-descriptions-item>
+                    <el-descriptions-item label="中层领导">{{viewData.middleLevelLeader?'是':'否' }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </div>
+
+            <template v-for="task in doneTasks">
+                <div class="mt10"
+                     v-if="['0cacd1e7-7bb2-47dd-818b-6a73062e0c62'].includes(task.taskName)">
+                    <div class="process-title">{{ task.displayName }}</div>
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
+                    >
+                        <el-descriptions-item label="办理用户">{{ task.taskFormData.userName
+                            }}({{task.taskFormData.loginName}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            {{processSubmitTypeEnums.find(v=>v.name===task.ext.tf_type)?.message}}
+<!--                            {{dict.type.PROCESS_TASK_SUBMIT_TYPE.find(v=>v.code==task.ext.tf_type)}}-->
+                           <!-- <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value=""></dict-tag>-->
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
+                            task.taskFormData.opinion }}
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </div>
+            </template>
+            <slot></slot>
+
+            <snaker-chart ref="snakerChartRef"></snaker-chart>
+        </div>
+
+    `,
+    dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
+    data() {
+        return {
+            visible: false,
+            userData: [],
+            viewData: {},
+            row: null,
+            doneTasks: [],
+            loading: true,
+            search: "",
+            tableKey: "",
+            activeName: "1",
+            processSubmitTypeEnums:[]
+        }
+    },
+    methods: {
+        findOne() {
+            this.$axios.post("/platform/teacherCongress/delegate/push/write/finOne", {id: this.row.id}).then(resp => {
+                if (resp.code === 0) {
+                    this.viewData = resp.data
+                }
+            })
+        },
+        // 打开
+        onOpen(row) {
+            this.row = row;
+            this.visible = true;
+            this.findOne();
+            this.getDoneTasks();
+            this.getEnumOptions()
+        },
+        // 获取已办任务审批记录
+        getDoneTasks() {
+            this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.doneTasks = res.data
+                }
+            })
+        },
+        async getEnumOptions() {
+            const resp = await this.$axios.post("/open/common/dictEnumOptions", { name: "ProcessSubmitTypeEnum" })
+            this.processSubmitTypeEnums=resp.data
+        },
+        // 查看流程图
+        openChart() {
+            this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
+        }
+    }
+}

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html

@@ -0,0 +1,295 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+                </search-item>
+                <search-item label="教代会">
+                    <el-select v-model="pageForm.sessionId">
+                        <el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
+                                   :key="item.id"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <push-progress ref="pushProgressRef"></push-progress>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool>
+                <el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
+                </el-button>
+                <el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small">
+                    <el-radio-button label="全部"></el-radio-button>
+                    <el-radio-button label="正式代表"></el-radio-button>
+                    <el-radio-button label="列席代表"></el-radio-button>
+                </el-radio-group>
+                <el-radio-group v-model="pageForm.approval" size="small"
+                                @change="doSearch">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+
+            </table-tool>
+            <el-table
+                    ref="tableRef"
+                    :data="tableData"
+                    row-key="id"
+                    @sort-change="pageOrder"
+            >
+                <el-table-column type="index" width="55" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column label="姓名" prop="userName" width="100"></el-table-column>
+                <el-table-column label="工号" prop="loginName"></el-table-column>
+                <el-table-column label="性别" prop="sex" width="50"></el-table-column>
+                <el-table-column label="分工会" prop="unionName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="职务" prop="position"></el-table-column>
+                <el-table-column label="职称" prop="professionalTitle"></el-table-column>
+                <el-table-column label="是否聘用制" prop="employ">
+                    <template v-slot="{row}">
+                        <span v-if="row.employ" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否高级职称" prop="seniorTeacher">
+                    <template v-slot="{row}">
+                        <span v-if="row.seniorTeacher" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否中级职称及以下" prop="intermediateBelow">
+                    <template v-slot="{row}">
+                        <span v-if="row.intermediateBelow" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否干部" prop="cadre">
+                    <template v-slot="{row}">
+                        <span v-if="row.cadre" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否工人" prop="worker">
+                    <template v-slot="{row}">
+                        <span v-if="row.worker" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="教代会/工代会代表" prop="isJdh">
+                    <template v-slot="{row}">
+                        <span v-if="row.isJdh" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <!--                <el-table-column label="工代会代表" prop="isGdh">-->
+                <!--                    <template v-slot="{row}">-->
+                <!--                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
+                <!--                        <span v-else>否</span>-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
+                <el-table-column label="代表类型" prop="representativeType"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">
+                            审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #edit>
+            <audit-info ref="auditInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction('ROLLBACK')" size="small" type="info">退回修改</el-button>
+                        <el-button @click="handleTaskAction('AGREE')" size="small" type="primary">同意</el-button>
+                    </el-row>
+                </div>
+            </audit-info>
+        </template>
+
+    </guava>
+</div>
+
+
+<script nonce="${cspNonce!}">
+    <!--#include('push-progress.js'){}#-->
+    <!--#include('auditInfo.js'){}#-->
+    new Vue({
+        el: '#app',
+        mixins: [initTableMixins],
+        components: {
+            'push-progress': pushProgress,
+            'audit-info': auditInfo
+        },
+
+        data() {
+            return {
+                sessionOptions: [],
+                units: [],
+                pageForm: {
+                    isFormalOrAttendance: "全部",
+                    unionId: "",
+                    sessionId: "",
+                    approval: false,
+                },
+
+                showApprovalForm: false,
+            }
+        },
+        methods: {
+            async doSearch() {
+                await this.pageData()
+                const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
+
+                await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId, "JG")
+            },
+            async pageData() {
+                try {
+                    const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/dwSjAudit/pageData", this.pageForm)
+                    if (resp.code === 0) {
+                        this.tableData = resp.data.list
+                        this.pageForm.totalCount = resp.data.totalCount
+                    }
+                } catch (e) {
+                    console.log(e)
+                }
+            },
+            onBatchSubmit() {
+                this.$confirm('您确定要上报吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(async () => {
+                    const loading = createLoading('正在提交中')
+                    this.$axios.post('/platform/teacherCongress/delegate/push/dwSjAudit/batchSubmit', {
+                        sessionId: this.pageForm.sessionId
+                    }).then(resp => {
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg)
+                            this.doSearch()
+                        }
+                    }).finally(() => {
+                        loading.close()
+                    })
+
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        bizId: row.id,
+                        userId: row.userId,
+                        processTaskId: row.taskId,
+                        taskKey: row.taskKey,
+                        taskName: row.taskName,
+                        instanceId: row.instanceId,
+                        submitType: 1,
+                    }
+                    this.$refs.auditInfoRef.onOpen(row)
+                })
+
+            },
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.auditInfoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(tf_type) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要提交吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.formData.tf_type = tf_type
+                            this.$axios.post("/flow/common/executeTask", {
+                                data: JSON.stringify({
+                                    ...this.formData,
+                                })
+                            }).then((res) => {
+                                if (res.code === 0) {
+                                    this.$message.success(res.msg)
+                                    this.doSearch()
+                                    this.$refs.guava.index()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            listUnion() {
+                this.$businessTool.listUnit().then((res) => {
+                    this.units = res
+                })
+            },
+            listSession() {
+                this.$axios.post("/platform/teacherCongress/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions && this.sessionOptions.length > 0) {
+                            this.pageForm.sessionId = this.sessionOptions[0].id
+                            this.doSearch()
+                        }
+                    }
+                })
+            }
+        },
+        async created() {
+            this.listUnion()
+            this.listSession()
+        }
+    })
+
+
+</script>
+
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html

@@ -2,193 +2,211 @@
 layout("/layouts/platform.html"){
 #-->
 <div id="app" v-cloak>
-    <el-card shadow="never">
+    <guava ref="guava">
-        <search @search="doSearch">
+        <el-card shadow="never">
-            <search-item label="姓名/工号">
+            <search @search="doSearch">
-                <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+                <search-item label="姓名/工号">
-            </search-item>
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
-            <search-item label="教代会">
+                </search-item>
-                <el-select v-model="pageForm.sessionId">
+                <search-item label="教代会">
-                    <el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
+                    <el-select v-model="pageForm.sessionId">
-                               :key="item.id"></el-option>
+                        <el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
-                </el-select>
+                                   :key="item.id"></el-option>
-            </search-item>
+                    </el-select>
-            <search-item label="分工会" v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')">
+                </search-item>
-                <el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
+                <search-item label="分工会" v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')">
-                    <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
+                    <el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
-                </el-select>
+                        <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
-            </search-item>
+                    </el-select>
-        </search>
+                </search-item>
-    </el-card>
+            </search>
+        </el-card>
 
-    <el-card shadow="never">
+        <el-card shadow="never">
-        <push-progress ref="pushProgressRef"></push-progress>
+            <push-progress ref="pushProgressRef" @max-count="setMaxCount"></push-progress>
-    </el-card>
+        </el-card>
 
-    <el-card shadow="never">
+        <el-card shadow="never">
-        <table-tool>
+            <table-tool>
-            <el-button
+                <el-button
-                    icon="el-icon-plus"
+                        icon="el-icon-plus"
-                    size="small"
+                        size="small"
-                    type="primary"
+                        type="primary"
-                    @click="$refs.pushFormalRef.onOpen(pageForm.sessionId,pageForm.unionId)"
+                        @click="doPushFormal"
-            >正式代表预选
+                >正式代表预选
-            </el-button>
+                </el-button>
-            <el-button
+                <el-button
-                    icon="el-icon-plus"
+                        icon="el-icon-plus"
-                    size="small"
+                        size="small"
-                    type="primary"
+                        type="primary"
-                    @click="$refs.pushAttendanceRef.onOpen(pageForm.sessionId,pageForm.unionId)"
+                        @click="$refs.pushAttendanceRef.onOpen(pageForm.sessionId,pageForm.unionId)"
-            >列席代表预选
+                >列席代表预选
-            </el-button>
+                </el-button>
-            <!--            <el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>-->
+                <!--            <el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>-->
 
-            <el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
-            </el-button>
 
-            <el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
+                <el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
-                            @change="doSearch">
+                                @change="doSearch">
-                <el-radio-button label="全部"></el-radio-button>
+                    <el-radio-button label="全部"></el-radio-button>
-                <el-radio-button label="正式代表"></el-radio-button>
+                    <el-radio-button label="正式代表"></el-radio-button>
-                <el-radio-button label="列席代表"></el-radio-button>
+                    <el-radio-button label="列席代表"></el-radio-button>
-            </el-radio-group>
+                </el-radio-group>
-        </table-tool>
+            </table-tool>
 
-        <el-table
+            <el-table
-                ref="tableRef"
+                    ref="tableRef"
-                :data="tableData"
+                    :data="tableData"
-                row-key="id"
+                    row-key="id"
-                @sort-change="pageOrder"
+                    @sort-change="pageOrder"
-        >
+            >
-            <!--            <el-table-column type="selection" width="55" reserve-selection fixed="left" :selectable="(row)=>{return row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62'}"></el-table-column>-->
+                <!--            <el-table-column type="selection" width="55" reserve-selection fixed="left" :selectable="(row)=>{return row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62'}"></el-table-column>-->
-            <el-table-column type="index" width="55" label="序号" :index="indexMethod" fixed="left"></el-table-column>
+                <el-table-column type="index" width="55" label="序号" :index="indexMethod"
-            <el-table-column label="姓名" prop="userName" width="100" fixed="left"></el-table-column>
+                                 fixed="left"></el-table-column>
-            <el-table-column label="年龄" prop="age" width="80"></el-table-column>
+                <el-table-column label="姓名" prop="userName" width="100" fixed="left"></el-table-column>
-            <el-table-column label="性别" prop="sex" width="80" fixed="left"></el-table-column>
+                <el-table-column label="年龄" prop="age" width="80"></el-table-column>
-            <!--            <el-table-column label="民族" prop="nation" min-width="100"></el-table-column>-->
+                <el-table-column label="性别" prop="sex" width="80" fixed="left"></el-table-column>
-            <el-table-column label="职称" prop="professionalTitle" min-width="150"></el-table-column>
+                <!--            <el-table-column label="民族" prop="nation" min-width="100"></el-table-column>-->
-            <el-table-column label="职级" prop="professionalLevel" min-width="100"></el-table-column>
+                <el-table-column label="职称" prop="professionalTitle" min-width="150"></el-table-column>
-            <!--            :style="{'pointer-events':(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)?'auto':'none'}"-->
+                <el-table-column label="职级" prop="professionalLevel" min-width="100"></el-table-column>
-            <!--          <el-table-column label="校级领导" prop="schoolLeader" min-width="100">
+                <!--            :style="{'pointer-events':(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)?'auto':'none'}"-->
-                          <template v-slot="{row}">
+                <!--          <el-table-column label="校级领导" prop="schoolLeader" min-width="100">
-                              <el-checkbox
+                              <template v-slot="{row}">
-                                      v-if="row"
+                                  <el-checkbox
-                                      v-model="row.schoolLeader"
+                                          v-if="row"
-                                      style="pointer-events:none"
+                                          v-model="row.schoolLeader"
-                              ></el-checkbox>
+                                          style="pointer-events:none"
-                          </template>
+                                  ></el-checkbox>
-                      </el-table-column>
+                              </template>
-                      <el-table-column label="中层领导" prop="middleLevelLeader" min-width="100">
+                          </el-table-column>
-                          <template v-slot="{row}">
+                          <el-table-column label="中层领导" prop="middleLevelLeader" min-width="100">
-                              <el-checkbox
+                              <template v-slot="{row}">
-                                      v-if="row"
+                                  <el-checkbox
-                                      v-model="row.middleLevelLeader"
+                                          v-if="row"
-                                      style="pointer-events:none"
+                                          v-model="row.middleLevelLeader"
-                              ></el-checkbox>
+                                          style="pointer-events:none"
-                          </template>
+                                  ></el-checkbox>
-                      </el-table-column>-->
+                              </template>
-            <!--
+                          </el-table-column>-->
-            <el-table-column label="专任教师" prop="ordinaryTeacher" min-width="100">
+                <!--
-                <template v-slot="{row}">
+                <el-table-column label="专任教师" prop="ordinaryTeacher" min-width="100">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.ordinaryTeacher"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.ordinaryTeacher"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>-->
+                    </template>
-            <el-table-column label="高级职称" prop="seniorTeacher" width="80">
+                </el-table-column>-->
-                <template v-slot="{row}">
+                <el-table-column label="高级职称" prop="seniorTeacher" width="80">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.seniorTeacher"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.seniorTeacher"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="中级职称及以下" prop="intermediateBelow" width="120">
+                </el-table-column>
-                <template v-slot="{row}">
+                <el-table-column label="中级职称及以下" prop="intermediateBelow" width="120">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.intermediateBelow"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.intermediateBelow"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="干部" prop="cadre" width="80">
+                </el-table-column>
-                <template v-slot="{row}">
+                <el-table-column label="干部" prop="cadre" width="80">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.cadre"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.cadre"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="工人" prop="worker" width="80">
+                </el-table-column>
-                <template v-slot="{row}">
+                <el-table-column label="工人" prop="worker" width="80">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.worker"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.worker"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="教代会代表" prop="isJdh" min-width="100">
+                </el-table-column>
-                <template v-slot="{row}">
+                <el-table-column label="是否聘用制" prop="employ" width="80">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.isJdh"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.employ"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="工代会代表" prop="isGdh" min-width="100">
+                </el-table-column>
-                <template v-slot="{row}">
+                <el-table-column label="教代会代表" prop="isJdh" min-width="100">
-                    <el-checkbox
+                    <template v-slot="{row}">
-                            v-if="row"
+                        <el-checkbox
-                            v-model="row.isGdh"
+                                v-if="row"
-                            style="pointer-events:none"
+                                v-model="row.isJdh"
-                    ></el-checkbox>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip
+                </el-table-column>
-                             width="100"></el-table-column>
+                <el-table-column label="工代会代表" prop="isGdh" min-width="100">
-            <el-table-column prop="taskName" label="当前节点" width="120" fixed="right"></el-table-column>
+                    <template v-slot="{row}">
-            <el-table-column prop="instanceState" label="流程状态" fixed="right">
+                        <el-checkbox
-                <template slot-scope="{row}">
+                                v-if="row"
-                    <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                v-model="row.isGdh"
-                              size="small"></enum-tag>
+                                style="pointer-events:none"
-                </template>
+                        ></el-checkbox>
-            </el-table-column>
+                    </template>
-            <el-table-column label="操作" fixed="right" width="300">
+                </el-table-column>
-                <template slot-scope="{row}">
+                <el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip
-                    <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                                 width="100"></el-table-column>
-                    <el-button
+                <el-table-column prop="taskName" label="当前节点" width="120" fixed="right"></el-table-column>
-                            v-if="row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId"
+                <el-table-column prop="instanceState" label="流程状态" fixed="right">
-                            @click="onEdit(row)" size="mini"
+                    <template slot-scope="{row}">
-                            type="primary">编辑
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
-                    </el-button>
+                                  size="small"></enum-tag>
-                    <template>
+                    </template>
-                        <el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)"
+                </el-table-column>
-                                   size="mini" type="danger">
+                <el-table-column label="操作" fixed="right" width="300">
-                            删除
+                    <template slot-scope="{row}">
-                        </el-button>
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
                         <el-button
-                                v-else-if="row.taskKey === 'startTask'
+                                v-if="row.taskKey === 'startTask'
+                            || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
+                            || row.taskKey==='97b0846b-22c6-4d34-9002-a6b67d592944'
+                            || !row.instanceId"
+                                @click="onEdit(row)" size="mini"
+                                type="primary">编辑
+                        </el-button>
+                        <template>
+                            <el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)"
+                                       size="mini" type="danger">
+                                删除
+                            </el-button>
+                            <el-button
+                                    v-else-if="row.taskKey === 'startTask'
                                 || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
                                 || row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId"
-                                @click="onDelete(row.id)"
+                                    @click="onDelete(row.id)"
-                                size="mini" type="danger">删除
+                                    size="mini" type="danger">删除
-                        </el-button>
+                            </el-button>
+                        </template>
+
                     </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
 
-                </template>
+        <template #view>
-            </el-table-column>
+            <audit-info ref="auditInfoRef">
-        </el-table>
+            </audit-info>
-        <!--#include("/layouts/pagination.html"){}#-->
+        </template>
-    </el-card>
+    </guava>
 
-    <push-formal-dialog ref="pushFormalRef" @refresh="doSearch"></push-formal-dialog>
+    <push-formal-dialog ref="pushFormalRef" @refresh="doSearch" :max-push="formalPush"></push-formal-dialog>
     <push-attendance-dialog ref="pushAttendanceRef" @refresh="doSearch"></push-attendance-dialog>
 
 
@@ -213,6 +231,7 @@ layout("/layouts/platform.html"){
     <!--#include('push-formal-dialog.js'){}#-->
     <!--#include('push-attendance-dialog.js'){}#-->
     <!--#include('write.js'){}#-->
+    <!--#include('auditInfo.js'){}#-->
     new Vue({
         el: '#app',
         mixins: [initTableMixins],
@@ -220,7 +239,8 @@ layout("/layouts/platform.html"){
             'push-progress': pushProgress,
             'push-formal-dialog': pushFormalDialog,
             'push-attendance-dialog': pushAttendanceDialog,
-            'formal-write': write
+            'formal-write': write,
+            'audit-info': auditInfo
         },
         data() {
             return {
@@ -232,20 +252,36 @@ layout("/layouts/platform.html"){
 
                 writeDialog: false,
                 isRead: false,
-                userId: null
+                userId: null,
+
+                // 当前分工会的最大推选人员
+                maxPush: 0,
+                // 剩余正式代表推选名额
+                formalPush: 0
             }
         },
         methods: {
-            doSearch() {
+            doPushFormal() {
-                this.pageData()
+                if (this.tableData.length >= this.maxPush) {
-                const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
+                    this.$message.warning("当前正式代表已超过最大推选人员数，如需调整请在表格数据列中选中【删除】按钮")
+                    return
+                }
 
-                this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
+                this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
+            },
+            setMaxCount(data) {
+                this.maxPush = data
+            },
+            async doSearch() {
+	            await this.pageData()
+                const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
+                await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
+	            this.formalPush = this.maxPush - this.tableData.length
             },
             onView(row) {
-                this.writeDialog = true
+                this.$refs.guava.view(() => {
-                this.userId = row.userId
+                    this.$refs.auditInfoRef.onOpen(row)
-                this.isRead = true
+                })
             },
             onEdit(row) {
                 this.writeDialog = true
@@ -268,33 +304,6 @@ layout("/layouts/platform.html"){
             },
             doExport() {
             },
-            onBatchSubmit() {
-                const selection = this.$refs.tableRef.selection
-                /*if (selection.length === 0){
-                    this.$message.warning('请选择要上报的记录')
-                    return
-                }*/
-                this.$confirm('您确定要上报吗?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(async () => {
-                    const loading = createLoading('正在提交中')
-                    this.$axios.post('/platform/teacherCongress/delegate/push/batchSubmit', {
-                        ids: JSON.stringify(selection.map(v => v.id)),
-                        sessionId: this.pageForm.sessionId
-                    }).then(resp => {
-                        if (resp.code === 0) {
-                            this.$message.success(resp.msg)
-                            this.doSearch()
-                            this.$refs.tableRef.clearSelection()
-                        }
-                    }).finally(() => {
-                        loading.close()
-                    })
-
-                })
-            },
             listUnion() {
                 this.$businessTool.listUnion().then((res) => {
                     this.unionOptions = res
@@ -310,6 +319,18 @@ layout("/layouts/platform.html"){
                         }
                     }
                 })
+            },
+            async pageData() {
+                try {
+                    const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/pageData", this.pageForm)
+                    if (resp.code === 0) {
+                        this.tableData = resp.data.list
+                        this.pageForm.totalCount = resp.data.totalCount
+
+                    }
+                } catch (e) {
+                    console.log(e)
+                }
             }
         },
         created() {

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-formal-dialog.js

@@ -11,8 +11,9 @@ const pushFormalDialog = {
                     :data="userData"
                     :filter-method="filterMethod"
                     :props="{key: 'id',label: 'name'}"
-                    :titles="['可报人员名单', '当前选择']"
+                    :titles="['教职工名单', '当前选择']"
                     filterable
+                    @change="onTransferChange"
             >
                 <div slot-scope="{ option }">
                     <div class="transfer-item">
@@ -35,6 +36,9 @@ const pushFormalDialog = {
             </span>
         </el-dialog>
     `,
+    props: {
+        maxPush: { type: Number, default: 1}
+    },
     data() {
         return {
             dialogVisible: false,
@@ -42,10 +46,23 @@ const pushFormalDialog = {
             userData: [],
             rightChecked: [],
             attendanceRightChecked: [],
-            sessionId: null
+            sessionId: null,
         }
     },
     methods: {
+        onTransferChange(targetKeys, direction, movedKeys) {
+            // targetKeys 是新的 userValue
+            if (targetKeys.length > this.maxPush) {
+                this.$message.warning("剩余正式代表名额为【" + this.maxPush + "】人，请合理调配！");
+
+                // 只保留前 maxSelectCount 个（或根据业务逻辑决定保留哪些）
+                const validKeys = targetKeys.slice(0, this.maxPush);
+
+                // 更新 model 值（注意：避免无限触发 change）
+                this.userValue = validKeys;
+
+            }
+        },
         async onOpen(sessionId, unionId) {
             this.dialogVisible = true
             this.sessionId = sessionId

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js

@@ -247,7 +247,7 @@ const pushProgress = {
                         </div>
 
                         <!-- 45岁以下代表数 -->
-                        <div class="metric-card">
+                        <!--<div class="metric-card">
                             <div class="metric-header">
                                 <div>
                                     <div class="metric-title">45岁以下代表</div>
@@ -275,8 +275,41 @@ const pushProgress = {
                                       metrics.under45.remaining
                                     }} 人</span>
                             </div>
-                        </div>
+                        </div>-->
-
+                        
+	                    
+                        <!-- 聘用制代表数 -->
+	                    <div class="metric-card">
+		                    <div class="metric-header">
+			                    <div>
+				                    <div class="metric-title">聘用制代表</div>
+				                    <div class="metric-value">{{ metrics.employ.current }}<span
+						                    class="metric-target"
+				                    >/ {{ metrics.employ.target }}</span></div>
+			                    </div>
+			                    <div class="metric-icon bg-primary-light">
+				                    <i class="fas fa-user-graduate text-primary"></i>
+			                    </div>
+		                    </div>
+		                    <div class="progress-bar">
+			                    <div class="progress-bar-inner bg-primary"
+			                         :style="{width: metrics.employ.progress * 100 + '%'}"></div>
+		                    </div>
+		                    <div class="progress-info">
+                                  <span v-if="metrics.employ.progress>=1 || metrics.employ.target===0"
+                                        class="text-success">
+                                    已达标
+                                  </span>
+			                    <span v-else-if="metrics.employ.progress<1" class="text-primary">
+                                    未达标
+                                  </span>
+			                    <span v-if="metrics.employ.remaining>0" class="text-gray-500">剩余 {{
+                                      metrics.employ.remaining
+                                    }} 人</span>
+		                    </div>
+	                    </div>
+                        
+                        
                         <!--   &lt;!&ndash; 少数民族数 &ndash;&gt;
                            <div class="metric-card">
                                <div class="metric-header">
@@ -388,15 +421,20 @@ const pushProgress = {
                     <div class="update-time"></div>
                 </div>
 
-                <div class="card">
+               <!-- <div class="card">
                     <h2 class="legend-title">上报说明</h2>
                     <div class="legend-container">
                         <div class="legend-item">
                             <div class="legend-color bg-warning "></div>
-                            <span class="legend-text">正式代表完成信息填写后才能进行上报，列席代表可直接上报且不计入名额</span>
+	                        <span class="legend-text">正式代表完成信息填写后才能进行上报，列席代表可直接上报且不计入名额</span>
                         </div>
+	                    
+	                    <div class="legend-item">
+		                    <div class="legend-color bg-warning "></div>
+		                    <span class="legend-text" style="color: red">当前代表为预推选，不计入代表总额，需等待党委书记审核后方才记录</span>
+	                    </div>
                     </div>
-                </div>
+                </div>-->
 
             </div>
         </div>
@@ -417,70 +455,76 @@ const pushProgress = {
         return {
             metrics: {
                 total: {
-                    current: 15,
+                    current: 0,
-                    target: 15,
+                    target: 0,
-                    progress: 100,
+                    progress: 0,
                     remaining: 0
                 },
                 female: {
-                    current: 3,
+                    current: 0,
-                    target: 5,
+                    target: 0,
-                    progress: 60,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
                 seniorTeacher: {
-                    current: 4,
+                    current: 0,
-                    target: 6,
+                    target: 0,
-                    progress: 66.7,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
                 intermediateBelow: {
-                    current: 4,
+                    current: 0,
-                    target: 6,
+                    target: 0,
-                    progress: 66.7,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
                 cadre: {
-                    current: 4,
+                    current: 0,
-                    target: 6,
+                    target: 0,
-                    progress: 66.7,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
                 worker: {
-                    current: 4,
+                    current: 0,
-                    target: 6,
+                    target: 0,
-                    progress: 66.7,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
                 ordinaryTeacher: {
-                    current: 8,
+                    current: 0,
-                    target: 10,
+                    target: 0,
-                    progress: 80,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
                 under45: {
-                    current: 5,
+                    current: 0,
-                    target: 7,
+                    target: 0,
-                    progress: 71.4,
+                    progress: 0,
-                    remaining: 2
+                    remaining: 0
                 },
-                ethnicMinority:{
+                ethnicMinority: {
-                  current: 1,
+                    current: 0,
-                  target: 2,
+                    target: 0,
-                  progress: 50,
+                    progress: 0,
-                  remaining: 1
+                    remaining: 0
                 },
-                schoolLeader:{
+                schoolLeader: {
-                    current: 2,
+                    current: 0,
-                    target: 3,
+                    target: 0,
-                    progress: 66.7,
+                    progress: 0,
-                    remaining: 1
+                    remaining: 0
                 },
-                middleLevelLeader:{
+                middleLevelLeader: {
-                    current: 1,
+                    current: 0,
-                    target: 2,
+                    target: 0,
-                    progress: 33.3,
+                    progress: 0,
-                    remaining: 1
+                    remaining: 0
+                },
+                employ: {
+                    current: 0,
+                    target: 0,
+                    progress: 0,
+                    remaining: 0
                 }
             },
             teacherMeetName: null
@@ -501,6 +545,7 @@ const pushProgress = {
             if (code === 0) {
                 if (data) {
                     this.metrics = data
+                    this.$emit('max-count', this.metrics.total.target)
                 } else {
                     this.$message.error('暂未分配名额')
                 }

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js

@@ -47,172 +47,199 @@ const write = {
                     </div>
                 </div>
 
-                <el-form
+                <el-tabs v-model="activeName">
-                        ref="formRef"
+                    <el-tab-pane label="填写信息" name="one">
-                        :model="formData"
+                        <el-form
-                        :rules="rules"
+                                ref="formRef"
-                        label-width="150px"
+                                :model="formData"
-                        :class="{ hidden: !isSelected }"
+                                :rules="rules"
-                        :disabled="(formData && formData.taskKey!=='53ff0c2a-ba93-45e9-a9fd-db51cdab3080') || is_read"
+                                label-width="150px"
-                >
+                                :class="{ hidden: !isSelected }"
-                    <div class="form-section">
+                                :disabled="(formData && !['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)) || is_read"
-                        <h3 class="section-title">基本信息</h3>
+                        >
-                        <div class="form-grid">
+                            <div class="form-section">
-                            <el-row :gutter="20">
+                                <h3 class="section-title">基本信息</h3>
-                                <el-col :span="12">
+                                <div class="form-grid">
-                                    <el-form-item label="姓名" prop="userName">
+                                    <el-row :gutter="20">
-                                        <el-input v-model="formData.userName" readonly></el-input>
+                                        <el-col :span="12">
-                                    </el-form-item>
+                                            <el-form-item label="姓名" prop="userName">
-                                </el-col>
+                                                <el-input v-model="formData.userName" readonly></el-input>
-                                <el-col :span="12">
+                                            </el-form-item>
-                                    <el-form-item label="工号" prop="loginName">
+                                        </el-col>
-                                        <el-input v-model="formData.loginName" readonly></el-input>
+                                        <el-col :span="12">
-                                    </el-form-item>
+                                            <el-form-item label="工号" prop="loginName">
-                                </el-col>
+                                                <el-input v-model="formData.loginName" readonly></el-input>
-                                <el-col :span="12">
+                                            </el-form-item>
-                                    <el-form-item label="性别" prop="sex">
+                                        </el-col>
-                                        <el-radio-group v-model="formData.sex" size="small">
+                                        <el-col :span="12">
-                                            <el-radio border label="男">男</el-radio>
+                                            <el-form-item label="性别" prop="sex">
-                                            <el-radio border label="女">女</el-radio>
+                                                <el-radio-group v-model="formData.sex" size="small">
-                                        </el-radio-group>
+                                                    <el-radio border label="男">男</el-radio>
-                                    </el-form-item>
+                                                    <el-radio border label="女">女</el-radio>
-                                </el-col>
+                                                </el-radio-group>
-                                <el-col :span="12">
+                                            </el-form-item>
-                                    <el-form-item label="出生年月" prop="birthday">
+                                        </el-col>
-                                        <el-date-picker
+                                        <el-col :span="12">
-                                                v-model="formData.birthday"
+                                            <el-form-item label="出生年月" prop="birthday">
-                                                type="date"
+                                                <el-date-picker
-                                                placeholder="选择日期"
+                                                        v-model="formData.birthday"
-                                                value-format="yyyy-MM-dd"
+                                                        type="date"
-                                                style="width: 100%"
+                                                        placeholder="选择日期"
-                                        ></el-date-picker>
+                                                        value-format="yyyy-MM-dd"
-                                    </el-form-item>
+                                                        style="width: 100%"
-                                </el-col>
+                                                ></el-date-picker>
-                                <el-col :span="12">
+                                            </el-form-item>
-                                    <el-form-item label="民族" prop="nation">
+                                        </el-col>
-                                        <dict-select v-model="formData.nation" style="width: 100%" placeholder="请选择民族"
+                                        <el-col :span="12">
-                                                     code="USER_NATION"></dict-select>
+                                            <el-form-item label="民族" prop="nation">
-                                    </el-form-item>
+                                                <dict-select v-model="formData.nation" style="width: 100%"
-                                </el-col>
+                                                             placeholder="请选择民族"
-                                <el-col :span="12">
+                                                             code="USER_NATION"></dict-select>
-                                    <el-form-item label="政治面貌" prop="political">
+                                            </el-form-item>
-                                        <el-input maxlength="100" placeholder="政治面貌"
+                                        </el-col>
-                                                  v-model="formData.political"></el-input>
+                                        <el-col :span="12">
-                                    </el-form-item>
+                                            <el-form-item label="政治面貌" prop="political">
-                                </el-col>
+                                                <el-input maxlength="100" placeholder="政治面貌"
-                                <el-col :span="12">
+                                                          v-model="formData.political"></el-input>
-                                    <el-form-item label="所属工会">
+                                            </el-form-item>
-                                        <el-input
+                                        </el-col>
-                                                v-model="formData.unionName"
+                                        <el-col :span="12">
-                                                readonly
+                                            <el-form-item label="所属工会">
-                                                placeholder="请输入所属工会"
+                                                <el-input
-                                                clearable
+                                                        v-model="formData.unionName"
-                                        ></el-input>
+                                                        readonly
-                                    </el-form-item>
+                                                        placeholder="请输入所属工会"
-                                </el-col>
+                                                        clearable
-                                <el-col :span="12">
+                                                ></el-input>
-                                    <el-form-item label="所属单位">
+                                            </el-form-item>
-                                        <el-input
+                                        </el-col>
-                                                v-model="formData.unitName"
+                                        <el-col :span="12">
-                                                readonly
+                                            <el-form-item label="所属单位">
-                                                placeholder="请输入所属单位"
+                                                <el-input
-                                                clearable
+                                                        v-model="formData.unitName"
-                                        ></el-input>
+                                                        readonly
-                                    </el-form-item>
+                                                        placeholder="请输入所属单位"
-                                </el-col>
+                                                        clearable
-                                <el-col :span="12">
+                                                ></el-input>
-                                    <el-form-item label="职称" prop="professionalTitle">
+                                            </el-form-item>
-                                        <dict-select v-model="formData.professionalTitle" style="width: 100%"
+                                        </el-col>
-                                                     placeholder="请选择职称"
+                                        <el-col :span="12">
-                                                     code="technical_title_level"></dict-select>
+                                            <el-form-item label="职称" prop="professionalTitle">
-                                    </el-form-item>
+                                                <dict-select v-model="formData.professionalTitle" style="width: 100%"
-                                </el-col>
+                                                             placeholder="请选择职称"
-                                <el-col :span="12">
+                                                             code="technical_title_level"></dict-select>
-                                    <el-form-item label="是否高级职称" prop="seniorTeacher">
+                                            </el-form-item>
-                                        <el-radio-group v-model="formData.seniorTeacher" size="small">
+                                        </el-col>
-                                            <el-radio border :label="true">是</el-radio>
+                                        <el-col :span="12">
-                                            <el-radio border :label="false">否</el-radio>
+                                            <el-form-item label="是否聘用制" prop="employ">
-                                        </el-radio-group>
+                                                <el-radio-group v-model="formData.employ" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                        </el-col>
+                                        <el-col :span="12">
+                                            <el-form-item label="是否高级职称" prop="seniorTeacher">
+                                                <el-radio-group v-model="formData.seniorTeacher" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+
+                                        </el-col>
+                                        <el-col :span="12">
+                                            <el-form-item label="是否中级职称及以下" prop="intermediateBelow">
+                                                <el-radio-group v-model="formData.intermediateBelow" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                        </el-col>
+                                        <el-col :span="12">
+                                            <el-form-item label="是否干部" prop="cadre">
+                                                <el-radio-group v-model="formData.cadre" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                        </el-col>
+                                        <el-col :span="12">
+                                            <el-form-item label="是否工人" prop="worker">
+                                                <el-radio-group v-model="formData.worker" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                        </el-col>
+
+                                        <el-col :span="12">
+                                            <el-form-item label="校级领导" prop="schoolLeader">
+                                                <el-radio-group v-model="formData.schoolLeader" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                        </el-col>
+
+                                        <el-col :span="12">
+                                            <el-form-item label="中层领导" prop="middleLevelLeader">
+                                                <el-radio-group v-model="formData.middleLevelLeader" size="small">
+                                                    <el-radio border :label="true">是</el-radio>
+                                                    <el-radio border :label="false">否</el-radio>
+                                                </el-radio-group>
+                                            </el-form-item>
+                                        </el-col>
+
+                                    </el-row>
+
+
+                                </div>
+                                <div class="form-grid">
+
+                                    <el-form-item label="手机号" prop="mobile">
+                                        <el-input v-model="formData.mobile" maxlength="11"></el-input>
                                     </el-form-item>
 
-                                </el-col>
+                                    <!--<el-form-item label="电子邮箱" prop="email">
-                                <el-col :span="12">
+                                        <el-input v-model="formData.email" maxlength="255"></el-input>
-                                    <el-form-item label="是否中级职称及以下" prop="intermediateBelow">
+                                    </el-form-item>-->
-                                        <el-radio-group v-model="formData.intermediateBelow" size="small">
+                                </div>
-                                            <el-radio border :label="true">是</el-radio>
+                            </div>
-                                            <el-radio border :label="false">否</el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="是否干部" prop="cadre">
-                                        <el-radio-group v-model="formData.cadre" size="small">
-                                            <el-radio border :label="true">是</el-radio>
-                                            <el-radio border :label="false">否</el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="是否工人" prop="worker">
-                                        <el-radio-group v-model="formData.worker" size="small">
-                                            <el-radio border :label="true">是</el-radio>
-                                            <el-radio border :label="false">否</el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                                
-                                <el-col :span="12">
-                                    <el-form-item label="校级领导" prop="schoolLeader">
-                                        <el-radio-group v-model="formData.schoolLeader" size="small">
-                                            <el-radio border :label="true">是</el-radio>
-                                            <el-radio border :label="false">否</el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                                
-                                <el-col :span="12">
-                                    <el-form-item label="中层领导" prop="middleLevelLeader">
-                                        <el-radio-group v-model="formData.middleLevelLeader" size="small">
-                                            <el-radio border :label="true">是</el-radio>
-                                            <el-radio border :label="false">否</el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                               
-                            </el-row>
 
-                          
+                            <div v-if="formData && ['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)"
-                           
+                                 class="form-actions">
+                                <el-button @click="onSave">保存草稿</el-button>
+                                <el-button type="primary" @click="onSubmit">提交信息</el-button>
+                            </div>
+                        </el-form>
+                    </el-tab-pane>
+                    <el-tab-pane label="审核信息" name="two" v-if="doneTasks&&doneTasks.length>0">
+                        <template v-for="task in doneTasks">
+                            <div class="mt10"
+                                 v-if="['0cacd1e7-7bb2-47dd-818b-6a73062e0c62'].includes(task.taskName)">
+                                <div class="process-title">{{ task.displayName }}</div>
 
-                           
+                                <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
-
+                                >
-                          
+                                    <el-descriptions-item label="办理用户">{{ task.taskFormData.userName
-
+                                        }}({{task.taskFormData.loginName}})
-                            
+                                    </el-descriptions-item>
-
+                                    <el-descriptions-item label="办理时间">{{ task.finishTime }}
-                           
+                                    </el-descriptions-item>
-
+                                    <el-descriptions-item label="办理结果">
-                        </div>
+                                        {{processSubmitTypeEnums.find(v=>v.name===task.ext.tf_type)?.message}}
-                        <div class="form-grid">
+                                        <!-- <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
-
+                                                   :value="task.ext.submitType"></dict-tag>-->
-                            <el-form-item label="手机号" prop="mobile">
+                                    </el-descriptions-item>
-                                <el-input v-model="formData.mobile" maxlength="11"></el-input>
+                                    <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
-                            </el-form-item>
+                                        task.taskFormData.opinion }}
-
+                                    </el-descriptions-item>
-                            <!--<el-form-item label="电子邮箱" prop="email">
+                                </el-descriptions>
-                                <el-input v-model="formData.email" maxlength="255"></el-input>
+                            </div>
-                            </el-form-item>-->
+                        </template>
-                        </div>
+                    </el-tab-pane>
-                    </div>
+                </el-tabs>
-
+                <div v-if="isSelected && formData && !['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)"
-                    <div v-if="formData && formData.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'"
-                         class="form-actions">
-                        <el-button @click="onSave">保存草稿</el-button>
-                        <el-button type="primary" @click="onSubmit">提交信息</el-button>
-                    </div>
-                </el-form>
-
-                <div v-if="isSelected && formData && formData.taskKey!=='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'"
                      class="completion-panel">
                     <div>
                         <i class="el-icon-success completion-icon"></i>
@@ -247,6 +274,9 @@ const write = {
     },
     data() {
         return {
+            doneTasks: [],
+            activeName: "one",
+            processSubmitTypeEnums:[],
             isSelected: true,
             formData: {
                 teacherMeetId: null
@@ -300,6 +330,14 @@ const write = {
         }
     },
     methods: {
+        // 获取已办任务审批记录
+        getDoneTasks() {
+            this.$axios.post("/flow/common/doneTasks", {bizId: this.formData.id}).then((res) => {
+                if (res.code === 0) {
+                    this.doneTasks = res.data
+                }
+            })
+        },
         async listSession() {
             const res = await this.$axios.post("/platform/teacherCongress/common/listSession")
             if (res.code === 0) {
@@ -321,7 +359,10 @@ const write = {
                 }
             }
         },
-
+        async getEnumOptions() {
+            const resp = await this.$axios.post("/open/common/dictEnumOptions", { name: "ProcessSubmitTypeEnum" })
+            this.processSubmitTypeEnums=resp.data
+        },
         async initInfo() {
             const {code, data} = await $.get('/platform/teacherCongress/delegate/push/write/info', {
                 sessionId: this.formData.sessionId
@@ -330,6 +371,8 @@ const write = {
                 this.isSelected = data.isSelected
                 if (this.isSelected) {
                     this.formData = data.delegate
+                    this.getDoneTasks()
+                    this.getEnumOptions()
                 }
             }
         },
@@ -347,19 +390,21 @@ const write = {
                         type: 'warning'
                     }).then(async () => {
                         const loading = createLoading('正在提交中')
-                        const {code} = await $.post('/platform/teacherCongress/delegate/push/write/save', this.formData)
+                        this.$axios.post('/platform/teacherCongress/delegate/push/write/save', this.formData).then(async resp => {
-                        loading.close()
+                            loading.close()
-                        if (code === 0) {
+                            if (resp.code === 0) {
-                            this.$message.success('保存成功')
+                                this.$message.success('保存成功')
-                            this.$emit('refresh')
+                                this.$emit('refresh')
-                            if (this.session_id && this.user_id) {
+                                if (this.session_id && this.user_id) {
-                                await this.initOtherInfo()
+                                    await this.initOtherInfo()
+                                } else {
+                                    await this.initInfo()
+                                }
                             } else {
-                                await this.initInfo()
+                                this.$message.warning('保存失败')
                             }
-                        } else {
+                        })
-                            this.$message.warning('保存失败')
+
-                        }
                     }).catch(() => {
 
                     })
@@ -375,18 +420,20 @@ const write = {
                         cancelButtonText: '取消',
                         type: 'warning'
                     }).then(async () => {
-                        const {code} = await $.post('/platform/teacherCongress/delegate/push/write/submit', this.formData)
+                        this.$axios.post('/platform/teacherCongress/delegate/push/write/submit', this.formData).then(async resp => {
-                        if (code === 0) {
+                            if (resp.code === 0) {
-                            this.$message.success('提交成功')
+                                this.$message.success('提交成功')
-                            this.$emit('refresh')
+                                this.$emit('refresh')
-                            if (this.session_id && this.user_id) {
+                                if (this.session_id && this.user_id) {
-                                await this.initOtherInfo()
+                                    await this.initOtherInfo()
+                                } else {
+                                    await this.initInfo()
+                                }
                             } else {
-                                await this.initInfo()
+                                this.$message.warning('提交失败')
                             }
-                        } else {
+                        })
-                            this.$message.warning('提交失败')
+
-                        }
                     }).catch(() => {
 
                     })

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html

@@ -2,6 +2,7 @@
 layout("/layouts/platform.html"){
 #-->
 <div id="app" v-cloak>
+    <guava ref="guava">
     <el-card shadow="never">
         <search @search="doSearch">
             <search-item label="姓名/工号">
@@ -23,26 +24,38 @@ layout("/layouts/platform.html"){
 
     <el-card shadow="never">
         <table-tool>
-            <el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small">
+	        <el-radio-group v-model="pageForm.approval" size="small" class="ml10"
+	                        @change="doSearch">
+		        <el-radio-button :label="true">已审核</el-radio-button>
+		        <el-radio-button :label="false">未审核</el-radio-button>
+	        </el-radio-group>
+
+	        <template v-if="!pageForm.approval">
+		        <el-button type="primary" size="small" @click="doBatchApproval(1)"
+		                   :disabled="!selectDataList || selectDataList.length <= 0"
+		                   class="ml10">批量通过</el-button>
+
+		        <el-button type="danger" size="small" @click="doBatchApproval(2)"
+		                   :disabled="!selectDataList || selectDataList.length <= 0"
+		                   class="ml10">批量拒绝</el-button>
+	        </template>
+
+            <el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small" style="margin-left: 10px">
                 <el-radio-button label="全部"></el-radio-button>
                 <el-radio-button label="正式代表"></el-radio-button>
                 <el-radio-button label="列席代表"></el-radio-button>
             </el-radio-group>
-            <el-radio-group v-model="pageForm.approval" size="small" class="ml10"
+            <el-button type="primary" size="small" @click="exportExcel" class="ml10">导出</el-button>
-                            @change="doSearch">
-                <el-radio-button :label="true">已审核</el-radio-button>
-                <el-radio-button :label="false">未审核</el-radio-button>
-            </el-radio-group>
-            <el-button type="primary" size="small" @click="exportExcel" class="ml5">导出</el-button>
 
         </table-tool>
         <el-table
                 ref="tableRef"
                 :data="tableData"
                 row-key="id"
+                @selection-change="tableHandleSelectionChange"
                 @sort-change="pageOrder"
         >
-            <!--            <el-table-column type="selection" width="55" reserve-selection></el-table-column>-->
+            <el-table-column type="selection" width="55" reserve-selection></el-table-column>
             <el-table-column type="index" width="55" label="序号" :index="indexMethod"></el-table-column>
             <el-table-column label="姓名" prop="userName" width="100"></el-table-column>
             <el-table-column label="工号" prop="loginName"></el-table-column>
@@ -115,6 +128,11 @@ layout("/layouts/platform.html"){
         <!--#include("/layouts/pagination.html"){}#-->
     </el-card>
 
+        <template #edit>
+            <audit-info ref="auditInfoRef">
+            </audit-info>
+        </template>
+    </guava>
     <el-dialog :close-on-click-modal="false"
                class="write-dialog"
                :visible.sync="writeDialog"
@@ -134,11 +152,13 @@ layout("/layouts/platform.html"){
 
 <script nonce="${cspNonce!}">
     <!--#include('write.js'){}#-->
+    <!--#include('auditInfo.js'){}#-->
     new Vue({
         el: '#app',
         mixins: [initTableMixins],
         components: {
-            'formal-write': write
+            'formal-write': write,
+            'audit-info': auditInfo
         },
         data() {
             return {
@@ -153,17 +173,63 @@ layout("/layouts/platform.html"){
 
                 writeDialog: false,
                 isRead: false,
-                userId: null
+                userId: null,
+
+	            selectDataList: [],
             }
         },
         methods: {
+	        /**
+	         * 批量审核
+	         */
+	        tableHandleSelectionChange(val) {
+				this.selectDataList = val
+	        },
+
+	        /**
+	         * 批量审核
+	         */
+	        doBatchApproval(submitType) {
+		        this.$confirm("您确定要提交吗？", "提示", {
+			        confirmButtonText: "确定",
+			        cancelButtonText: "取消",
+			        type: "warning"
+		        }).then(() => {
+
+			        const loading = createLoading()
+			        const data = this.selectDataList.map(v => {
+						return {
+							processTaskId: v.taskId,
+							taskName: v.curTaskName,
+							submitType: submitType,
+							id: v.id
+						}
+			        })
+
+			        this.$axios.post("/platform/teacherCongress/delegate/push/zcAudit/submitBatch", {
+						data: JSON.stringify(data)
+			        }).then(res => {
+				        loading.close()
+				        if (res.code === 0) {
+					        this.$message.success(res.msg)
+					        this.$refs.tableRef.clearSelection()
+					        this.doSearch()
+				        } else {
+							this.$message.error(res.msg)
+				        }
+			        })
+
+		        })
+	        },
+
             exportExcel() {
                 this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm)
             },
             onView(row) {
-                this.writeDialog = true
+                this.$refs.guava.edit(() => {
-                this.userId = row.userId
+                    this.showApprovalForm = false
-                this.isRead = true
+                    this.$refs.auditInfoRef.onOpen(row)
+                })
             },
             handleTaskAction(row, submitType) {
                 this.$confirm("您确定要提交吗？", "提示", {
@@ -179,7 +245,8 @@ layout("/layouts/platform.html"){
                         data: JSON.stringify({
                             ...this.formData,
                             submitType: submitType
-                        }), id: row.id
+                        }),
+	                    id: row.id
                     }).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)

src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html

@@ -43,16 +43,19 @@ layout("/layouts/platform.html"){
         <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
             <el-table-column type="index" width="50" :index="indexMethod" label="序号"></el-table-column>
             <el-table-column prop="unionName" label="工会名称"></el-table-column>
-            <el-table-column prop="memberCount" label="会员人数"></el-table-column>
+            <template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
-<!--            <el-table-column prop="dbCount" label="代表人数"></el-table-column>-->
+                <el-table-column prop="memberCount" label="会员人数"></el-table-column>
+            </template>
+            <!--            <el-table-column prop="dbCount" label="代表人数"></el-table-column>-->
             <el-table-column prop="allocationNum" label="名额分配人数"></el-table-column>
             <el-table-column prop="seniorTeaNum" label="高级职称代表数"></el-table-column>
             <el-table-column prop="intermediateBelowNum" label="中级职称及以下代表数"></el-table-column>
             <el-table-column prop="cadreNum" label="干部代表数"></el-table-column>
             <el-table-column prop="workerNum" label="工人代表数"></el-table-column>
-<!--            <el-table-column prop="ordinaryTeaNum" label="专任教师代表数"></el-table-column>-->
+            <!--            <el-table-column prop="ordinaryTeaNum" label="专任教师代表数"></el-table-column>-->
             <el-table-column prop="femaleNum" label="女代表数"></el-table-column>
-            <el-table-column prop="less45Num" label="45岁以下代表数"></el-table-column>
+            <!--            <el-table-column prop="less45Num" label="45岁以下代表数"></el-table-column>-->
+            <el-table-column prop="employNum" label="聘用制代表数"></el-table-column>
         </el-table>
     </el-card>
 

src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js

@@ -72,11 +72,13 @@ const MANUAL_ALLOCATION_DIALOG = {
             </table-tool>
 
             <el-table :data="unionLimit" max-height="500" :summary-method="getSummaries"
-                      show-summary>
+                      width="100%" show-summary>
                 <el-table-column prop="unionName" label="分工会"></el-table-column>
-                <el-table-column prop="memberCount" label="会员人数"></el-table-column>
+	            <template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
+		            <el-table-column prop="memberCount" label="会员人数"></el-table-column>
+	            </template>
                 <el-table-column align="center" prop="ratio" label="比例(%)">
-                    <template v-slot="{$index,row}">
+                    <template v-slot="{$index, row}">
                         <el-input-number
                                 style="width: 100%"
                                 v-model="row.ratio"
@@ -96,7 +98,6 @@ const MANUAL_ALLOCATION_DIALOG = {
                                 :precision="0"
                                 :step="1"
                                 :min="0"
-                                :max="row.memberCount"
                         ></el-input-number>
                     </template>
                 </el-table-column>
@@ -172,11 +173,23 @@ const MANUAL_ALLOCATION_DIALOG = {
                         ></el-input-number>
                     </template>
                 </el-table-column>
-                <el-table-column prop="less45Num" label="45岁以下代表数">
+<!--                <el-table-column prop="less45Num" label="45岁以下代表数">-->
+<!--                    <template v-slot="{row}">-->
+<!--                        <el-input-number-->
+<!--                                style="width: 100%"-->
+<!--                                v-model="row.less45Num"-->
+<!--                                :precision="0"-->
+<!--                                :step="1"-->
+<!--                                :min="0"-->
+<!--                                :max="row.allocationNum"-->
+<!--                        ></el-input-number>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column prop="employNum" label="聘用制代表数">
                     <template v-slot="{row}">
                         <el-input-number
                                 style="width: 100%"
-                                v-model="row.less45Num"
+                                v-model="row.employNum"
                                 :precision="0"
                                 :step="1"
                                 :min="0"
@@ -212,10 +225,33 @@ const MANUAL_ALLOCATION_DIALOG = {
                 {label: "干部代表数", value: "cadreNum"},
                 {label: "工人代表数", value: "workerNum"},
                 {label: "女代表数", value: "femaleNum"},
-                {label: "45岁以下代表数", value: "less45Num"},
+                // {label: "45岁以下代表数", value: "less45Num"},
+                {label: "聘用制代表数", value: "employNum"},
             ]
         }
     },
+    // watch: {
+    //     unionLimit: {
+    //         handler(list) {
+    //             list.forEach(row => {
+    //                 const keys = [
+    //                     'seniorTeaNum',
+    //                     'intermediateBelowNum',
+    //                     'cadreNum',
+    //                     'workerNum',
+    //                     'femaleNum',
+    //                     'employNum'
+    //                 ]
+    //                 const sum = keys.reduce((s, k) => s + (row[k] || 0), 0)
+    //                 if (sum > row.allocationNum) {
+    //                     const excess = sum - row.allocationNum
+    //                     row.seniorTeaNum = Math.max(0, row.seniorTeaNum - excess)
+    //                 }
+    //             })
+    //         },
+    //         deep: true
+    //     }
+    // },
     methods: {
         getSummaries(param) {
             const {columns, data} = param;
@@ -270,6 +306,7 @@ const MANUAL_ALLOCATION_DIALOG = {
         },
         unionLimitQuickSetting() {
             this.unionUserNumCalc.forEach((v, i) => {
+                const that = this
                 const startNum = v.startNum
                 const endNum = v.endNum
                 const resultNum = v.resultNum
@@ -279,8 +316,10 @@ const MANUAL_ALLOCATION_DIALOG = {
                     this.unionLimit.forEach((x) => {
                         if (x.memberCount >= startNum && x.memberCount <= endNum) {
                             x.ratio = resultNum
-                            const num = parseFloat((v.memberCount * x.ratio / 100).toFixed(0))
+                            const num = parseFloat((x.memberCount * resultNum / 100).toFixed(0))
-                            v.allocationNum = (num === 0 ? 1 : num)
+                            debugger
+                            that.$set(x, "allocationNum", (num ? num : 0))
+                            // v.allocationNum = num ? num : 0
                         }
                     })
                     this.$forceUpdate()
@@ -321,9 +360,17 @@ const MANUAL_ALLOCATION_DIALOG = {
                 type: 'warning'
             }).catch(err => err)
             if (confirm === 'confirm') {
-                this.unionLimit = []
+                // this.unionLimit = []
                 this.unionUserNumOneKeyRatio = null
-                await this.getUnionUsers()
+                // await this.getUnionUsers()
+
+                // 除了工会和会员数据，其他设置为0
+                this.unionLimit.forEach(v => {
+                    v.ratio = 0
+                    this.settingsTypeOptions.forEach( item => {
+                        v[item.value] = 0
+                    })
+                })
             }
         },
         applyScaleSettings() {