增加工代会委员会管理

src/main/java/com/budwk/app/flow/enums/ProcessSubmitTypeEnum.java

@@ -1,5 +1,6 @@
 package com.budwk.app.flow.enums;
 
+import com.budwk.app.base.annotation.DictEnum;
 import lombok.Getter;
 
 /**
@@ -9,6 +10,7 @@ import lombok.Getter;
  * @date 2023/10/7
  */
 @Getter
+@DictEnum(key = "ProcessSubmitTypeEnum", name = "流程提交类型（操作类型）")
 public enum ProcessSubmitTypeEnum {
     APPLY(0, "发起申请"),
     AGREE(1, "同意"),

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

@@ -104,7 +104,7 @@ public class TeacherCongressDelegatePushDwSjAuditController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "tcDelegatePushDwSj");
+        cnd.and("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62");
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
             cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
         }
@@ -142,11 +142,11 @@ public class TeacherCongressDelegatePushDwSjAuditController {
     @SaCheckPermission("tc.delegate.push.dwSjAudit")
     public Result batchSubmit(String sessionId) {
 
-        String str = teacherCongressDelegatePushService.batchSubmitWhere(sessionId, null);
+    /*    String str = teacherCongressDelegatePushService.batchSubmitWhere(sessionId, null);
         if (StrUtil.isNotBlank(str)) {
             return Result.error(str);
-        }
-        teacherCongressDelegatePushService.batchSubmit("", sessionId);
+        }*/
+        teacherCongressDelegatePushService.batchSubmit(SecurityUtil.getUnionId(), 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;
@@ -124,4 +126,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/service/TeacherCongressDelegatePushServiceImpl.java

@@ -1,6 +1,5 @@
 package com.budwk.app.zhgh.democratic.teachercongress.delegate.service;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
@@ -107,8 +106,8 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl<Teac
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "tcDelegatePushUnionFzr");
-        cnd.and("info.pushUnionId", "=", unionId);
+        cnd.and("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378");
+        cnd.and("info.unionId", "=", unionId);
         sql.setCondition(cnd);
         List<NutMap> delegatePushList = listMap(sql);
 
@@ -171,10 +170,10 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl<Teac
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("info.sessionId", "=", sessionId);
-        cnd.andEX("info.pushUnionId", "=", unionId);
+        cnd.andEX("info.unionId", "=", unionId);
         cnd.andEX("info.schoolLeader", "!=", 1);
         SqlExpressionGroup group = new SqlExpressionGroup();
-        group.or("t.taskName", "=", "tcDelegatePushUnionFzr");
+        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());