first commit

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java

@@ -0,0 +1,84 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig;
+import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeConfigService;
+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.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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 java.util.List;
+
+/**
+ * @ClassName ExecutiveCommitteeConfigController
+ * @Author JyuHsin
+ * @Date 2025/6/20 15:30
+ * @Version 1.0
+ * @Description TODO
+ */
+
+@IocBean
+@At("/platform/executiveCommittee/executiveCommitteeConfig")
+@Ok("json:full")
+@Slf4j
+@Api(tags = "执委会成员推选配置")
+public class ExecutiveCommitteeConfigController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private ExecutiveCommitteeConfigService committeeConfigService;
+
+
+	@At("/index")
+	@SaCheckPermission("executiveCommittee.executiveCommitteeConfig")
+	@Ok("beetl:/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html")
+	public void index() {
+	}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission("executiveCommittee.executiveCommitteeConfig")
+	public Result fetchConfig(String sessionId) {
+		ExecutiveCommitteeConfig config = committeeConfigService.fetch(Cnd.where("teacherMeetId", "=", sessionId));
+		if(config == null) {
+			config = new ExecutiveCommitteeConfig();
+			Sql sql = Sqls.create("""
+					SELECT
+						dbt.id as delegationId,
+						dbt.name as delegationName,
+						dbt.code as delegationCode,
+						(SELECT count( 1 ) FROM vw_user where unitId IN ( SELECT unitId FROM teacher_congress_delegation_unit unit WHERE unit.delegationId = dbt.id ) and member = 1) as memberCount,
+						(SELECT count( 1 ) FROM teacher_congress_delegate where unitId IN ( SELECT unitId FROM teacher_congress_delegation_unit unit WHERE unit.delegationId = dbt.id ) and sessionId=@sessionId) as dbCount,
+						0 as quotaCount
+					FROM
+						teacher_congress_delegation dbt
+					WHERE dbt.sessionId = @sessionId
+					ORDER BY CODE ASC
+					""").setParam("sessionId", sessionId);
+			List<NutMap> listMap = committeeConfigService.listMap(sql);
+			config.setDelegationQuotaList(listMap);
+		}
+		return Result.success(config);
+	}
+
+	@At
+	@ApiOperation("新增、修改预选名额分配")
+	@SaCheckPermission("executiveCommittee.executiveCommitteeConfig")
+	@SLog(type = "executiveCommitteeConfig", tag = "执委会推选-预选名额分配", msg ="新增、修改预选名额分配" )
+	public Result onHandle(ExecutiveCommitteeConfig config) {
+		committeeConfigService.insertOrUpdate(config);
+		return Result.success();
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java

@@ -0,0 +1,286 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush;
+import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
+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.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.Lang;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhf
+ * @date 2025/8/25 15:18
+ * @description 团长一次推选
+ */
+@IocBean
+@At("/platform/executiveCommittee/delegationOnePush")
+@Ok("json:full")
+@Slf4j
+@Api(tags = "执委会推选-团长一次推选")
+public class ExecutiveCommitteeDelegationOnePushController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private BaseService baseService;
+
+    @At("/index")
+    @SaCheckPermission("executiveCommittee.delegationOnePush")
+    @Ok("beetl:/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("查询某个代表团的团长一次推选的委员")
+    @SaCheckPermission("executiveCommittee.delegationOnePush")
+    public Result pageData(PageForm pageForm,
+                           String teacherMeetId,
+                           String delegationId,
+                           String unionId) {
+
+        Sql sql = Sqls.create("""
+                SELECT
+                  t1.*,
+                  t2.name AS unitName,
+                  t3.name unionName,
+                  t4.sex,
+                  TIMESTAMPDIFF(
+                    YEAR,
+                    t4.birthday,
+                  CURDATE()) AS age,
+                  t5.name AS delegationName
+                FROM
+                  `executive_committee_one_push` t1
+                   LEFT JOIN sys_unit t2 ON t1.unitId = t2.id
+                   LEFT JOIN `sys_union` t3 ON t3.id = t2.unionid
+                   LEFT JOIN `vw_user` t4 ON t4.id = t1.userId
+                   LEFT JOIN teacher_congress_delegation t5 ON t5.id = t1.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
+        if (StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
+            StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            cnd.andEX("t1.delegationId", "=", delegationId);
+        }else{
+            Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+                    Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                            .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+            if (ObjectUtil.isEmpty(db)) {
+                return Result.error("没有权限,只有代表团团长才能推选");
+            }
+            cnd.andEX("t1.delegationId", "=", db.getDelegationId());
+        }
+
+        cnd.andEX("t3.id", "=", unionId);
+        cnd.andEX("t1.addType", "=", 1);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.orLike("t1.userName", pageForm.getSearchKeyword());
+            group.orLike("t1.loginName", pageForm.getSearchKeyword());
+            cnd.and(group);
+        }
+        cnd.asc("t1.firstLetter");
+        sql.setCondition(cnd);
+        return Result.success(baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql));
+    }
+
+
+    @At
+    @ApiOperation("查询可以推选委员和已经推选的人员")
+    @SaCheckPermission("executiveCommittee.delegationOnePush")
+    public Result getDelegationUser(String teacherMeetId) {
+        Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+                Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                        .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+        if (ObjectUtil.isEmpty(db)) {
+            return Result.error("没有权限,只有代表团团长才能推选");
+        }
+        ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                Cnd.where(ExecutiveCommitteeConfig::getTeacherMeetId, "=", teacherMeetId));
+        if (ObjectUtil.isEmpty(config)) {
+            return Result.error("请先配置基础信息");
+        }
+        if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) {
+            return Result.error("请等待一次预选开始时间");
+        }
+        if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
+            return Result.error("一次预选已结束");
+        }
+        List<ExecutiveCommitteeOnePush> userValue = dao.query(ExecutiveCommitteeOnePush.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId)
+                        .and("addType", "=", 1));
+        List<ExecutiveCommitteeOnePush> onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW());
+        List<String> userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList());
+
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("db.sessionId", "=", teacherMeetId);
+        cnd.andEX("db.userId", "not in", userIds);
+        cnd.andEX("db.userId", "!=", SecurityUtil.getUserId());
+        cnd.and("db.delegationId", "=", db.getDelegationId());
+        Sql sql = Sqls.create("""
+                SELECT
+                  db.*,
+                  u.professionalTitle,
+                  u.professionalLevel,
+                  TIMESTAMPDIFF(YEAR, u.birthday, CURDATE()) AS age
+                FROM
+                  teacher_congress_delegate db
+                  LEFT JOIN `vw_user` u ON db.userId = u.id
+                $condition
+                """);
+        sql.setCondition(cnd);
+        List<NutMap> userData = baseService.listMap(sql);
+
+
+        List<NutMap> delegationQuotaList = config.getDelegationQuotaList();
+        NutMap delegationQuota = delegationQuotaList.stream().filter(v -> v.get("delegationId").equals(db.getDelegationId())).findFirst().orElse(null);
+        if (Lang.isNotEmpty(delegationQuota)) {
+            return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", delegationQuota.getInt("quotaCount")));
+        }
+        return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", 0));
+    }
+
+    @At
+    @SaCheckPermission("executiveCommittee.delegationOnePush")
+    @SLog(tag = "执委会推选-团长推选委员", msg = "推选委员")
+    public Result addOnePush(@Param("userValue") String[] userValue,
+                             String teacherMeetId) {
+        try {
+            Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+                    Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                            .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+            if (ObjectUtil.isEmpty(db)) {
+                return Result.error("没有权限,只有代表团团长才能推选");
+            }
+
+            ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                    Cnd.where("teacherMeetId", "=", teacherMeetId));
+            if (ObjectUtil.isEmpty(config)) {
+                return Result.error("请先配置基础信息");
+            }
+            if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) {
+                return Result.error("请等待一次预选开始时间");
+            }
+            if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
+                return Result.error("一次预选已结束");
+            }
+            List<NutMap> delegationQuotaList = config.getDelegationQuotaList();
+
+            NutMap delegationQuota = delegationQuotaList.stream().filter(v -> v.getString("delegationId").equals(db.getDelegationId())).findFirst().orElse(null);
+            if (ObjectUtil.isEmpty(delegationQuota)) {
+                return Result.error("请先配置代表团人数");
+            }
+
+            int dbCount = dao.count(ExecutiveCommitteeOnePush.class,
+                    Cnd.where("delegationId", "=", db.getDelegationId())
+                            .and("teacherMeetId", "=", teacherMeetId)
+                            .and("addType", "=", 1));
+            if (dbCount + userValue.length > delegationQuota.getInt("quotaCount")) {
+                return Result.error("推选人数限制" + delegationQuota.getInt("quotaCount") + "人");
+            }
+            Sql sql = Sqls.create("""
+                     SELECT
+                       t1.*
+                     FROM
+                       teacher_congress_delegate t1
+                    $condition
+                    """);
+            Cnd cnd = Cnd.NEW();
+            cnd.and("t1.sessionId", "=", teacherMeetId);
+            cnd.andEX("t1.userId", "in", userValue);
+            sql.setCondition(cnd);
+            List<NutMap> dbList = baseService.listMap(sql);
+
+
+            List<ExecutiveCommitteeOnePush> list = new ArrayList<>();
+            for (String id : userValue) {
+                NutMap jdhDb = dbList.stream().filter(v -> v.getString("userId").equals(id)).findFirst().orElse(null);
+                if (ObjectUtil.isEmpty(jdhDb)) {
+                    return Result.error("请选择正确的代表!");
+                }
+                ExecutiveCommitteeOnePush onePush = new ExecutiveCommitteeOnePush();
+                onePush.setPushDate(DateUtil.date());
+                onePush.setUserId(jdhDb.getString("userId"));
+                onePush.setUserName(jdhDb.getString("userName"));
+                onePush.setLoginName(jdhDb.getString("loginName"));
+                onePush.setDelegationId(jdhDb.getString("delegationId"));
+                onePush.setUnitId(jdhDb.getString("unitId"));
+                onePush.setTeacherMeetId(teacherMeetId);
+                String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName")));
+                onePush.setFirstLetter(firstLetter);
+                onePush.setAddType(1);
+                list.add(onePush);
+            }
+            dao.insert(list);
+            return Result.success("添加成功!");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("添加失败!");
+        }
+    }
+
+    @At
+    @SaCheckPermission("executiveCommittee.delegationOnePush")
+    @SLog(tag = "执委会推选-团长推选委员", msg = "删除推选的人")
+    public Result doDelete(@Valid String id, @Valid String teacherMeetId) {
+        ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId));
+        if (ObjectUtil.isEmpty(config)) {
+            return Result.error("请先配置基础信息");
+        }
+        if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
+            return Result.error("一次预选已结束不能删除！");
+        }
+        int num = dao.clear(ExecutiveCommitteeOnePush.class, Cnd.where("id", "=", id));
+        return num >= 0 ? Result.success() : Result.error();
+    }
+
+
+    public static char getFirstLetter(String str) {
+        if (str == null || str.isEmpty()) {
+            throw new IllegalArgumentException("字符串不能为空");
+        }
+        char firstChar = str.charAt(0);
+        if (Validator.isChinese(String.valueOf(firstChar))) {
+            return Character.toUpperCase(PinyinUtil.getPinyin(firstChar).charAt(0));
+        } else if (Character.isLetter(firstChar)) {
+            return Character.toUpperCase(firstChar);
+        } else {
+            return firstChar;
+        }
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationTwoPushController.java

@@ -0,0 +1,229 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeTwoPush;
+import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
+import io.swagger.annotations.ApiOperation;
+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;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhf
+ * @date 2025/6/23 15:25
+ * @description 团长二次推选
+ */
+@At("/platform/executiveCommittee/delegationTwoPush")
+@Ok("json:full")
+@IocBean
+public class ExecutiveCommitteeDelegationTwoPushController {
+
+
+    @Inject
+    private Dao dao;
+
+    @Inject
+    private BaseService baseService;
+
+    @At("/index")
+    @SaCheckPermission("executiveCommittee.delegationOnePush")
+    @Ok("beetl:/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("executiveCommittee.delegationTwoPush")
+    public Result pageData(PageForm pageForm,
+                           String teacherMeetId,
+                           String delegationId,
+                           String unionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  t1.*,
+                  t2.loginName,
+                  t2.userName,
+                  t3.name AS unitName,
+                  t4.name unionName,
+                  t5.sex,
+                  TIMESTAMPDIFF(
+                    YEAR,
+                    t5.birthday,
+                  CURDATE()) AS age,
+                  t6.name AS delegationName
+                FROM
+                  `executive_committee_two_push` t1
+                  LEFT JOIN executive_committee_one_push t2 on t2.userId=t1.userId and t2.teacherMeetId=t1.teacherMeetId
+                  LEFT JOIN sys_unit t3 ON t2.unitId = t3.id
+                  LEFT JOIN `sys_union` t4 ON t4.id = t3.unionid
+                  LEFT JOIN `vw_user` t5 ON t5.id = t1.userId
+                  LEFT JOIN teacher_congress_delegation t6 ON t6.id = t2.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("t1.pushUserId", "=", SecurityUtil.getUserId());
+        cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
+        cnd.andEX("t2.delegationId", "=", delegationId);
+        cnd.andEX("t4.id", "=", unionId);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.orLike("t2.userName", pageForm.getSearchKeyword());
+            group.orLike("t2.loginName", pageForm.getSearchKeyword());
+            cnd.and(group);
+        }
+        cnd.asc("t6.code").asc("t2.firstLetter");
+        sql.setCondition(cnd);
+        return Result.success(baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql));
+    }
+
+    @At
+    @SaCheckPermission("executiveCommittee.delegationTwoPush")
+    @SLog(type = "执委会推选-团长二次推选", tag = "查询可以二次推选的名单", param = true, result = true)
+    public Result getDelegationUser(String teacherMeetId) {
+        Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+                Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                        .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+        if (ObjectUtil.isEmpty(db)) {
+            return Result.error("没有权限,只有代表团团长才能推选");
+        }
+        ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId));
+        if (ObjectUtil.isEmpty(config)) {
+            return Result.error("请先配置基础信息");
+        }
+        if (config.getSecondStartTime().getTime() > System.currentTimeMillis()) {
+            return Result.error("请等待二次预选开始时间");
+        }
+        if (config.getSecondEndTime().getTime() < System.currentTimeMillis()) {
+            return Result.error("二次预选已结束");
+        }
+        List<ExecutiveCommitteeTwoPush> userValue = dao.query(ExecutiveCommitteeTwoPush.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId)
+                        .and("pushUserId", "=", SecurityUtil.getUserId()));
+        List<String> userIds = userValue.stream().map(v -> v.getUserId()).collect(Collectors.toList());
+
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
+        cnd.andEX("t1.userId", "not in", userIds);
+        cnd.andEX("t1.userId", "!=", SecurityUtil.getUserId());
+        Sql sql = Sqls.create("""
+                  SELECT
+                  t1.*,
+                  t2.sex,
+                  t2.professionalTitle,
+                  t2.professionalLevel,
+                  TIMESTAMPDIFF(
+                    YEAR,
+                    t2.birthday,
+                  CURDATE()) age
+                FROM
+                  executive_committee_one_push t1
+                  LEFT JOIN `vw_user` t2 ON t1.userId = t2.id
+                $condition
+                """);
+        sql.setCondition(cnd);
+        List<NutMap> userData = baseService.listMap(sql);
+        return Result.success(Map.of("userData", userData, "userValue", userValue,"committeeQuotaCount",config.getCommitteeQuotaCount()));
+    }
+
+    @At
+    @SaCheckPermission("executiveCommittee.delegationTwoPush")
+    @ApiOperation("推选委员")
+    @SLog(tag = "执委会推选-团长二次推选", msg = "推选委员")
+    public Result addOnePush(@Param("userValue") String[] userValue,
+                             String teacherMeetId) {
+        try {
+            Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+                    Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                            .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+            if (ObjectUtil.isEmpty(db)) {
+                return Result.error("没有权限,只有代表团团长才能推选");
+            }
+
+            ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                    Cnd.where("teacherMeetId", "=", teacherMeetId));
+            if (ObjectUtil.isEmpty(config)) {
+                return Result.error("请先配置基础信息");
+            }
+            if (config.getSecondStartTime().getTime() > System.currentTimeMillis()) {
+                return Result.error("请等待二次预选开始时间");
+            }
+            if (config.getSecondEndTime().getTime() < System.currentTimeMillis()) {
+                return Result.error("二次预选已结束");
+            }
+            int dbCount = dao.count(ExecutiveCommitteeTwoPush.class,
+                    Cnd.where("pushUserId", "=", SecurityUtil.getUserId())
+                            .and("teacherMeetId", "=", teacherMeetId));
+            if (dbCount + userValue.length > config.getCommitteeQuotaCount()) {
+                return Result.error("推选人数限制" + config.getCommitteeQuotaCount() + "人");
+            }
+
+            List<Teacher_congress_delegate> dbList = dao.query(Teacher_congress_delegate.class,
+                    Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                            .andEX(Teacher_congress_delegate::getUserId, "in", userValue));
+            List<ExecutiveCommitteeTwoPush> list = new ArrayList<>();
+            for (String id : userValue) {
+                Teacher_congress_delegate jdhDb = dbList.stream().filter(v -> v.getUserId().equals(id)).findFirst().orElse(null);
+                if (ObjectUtil.isEmpty(jdhDb)) {
+                    return Result.error("请选择正确的代表!");
+                }
+                ExecutiveCommitteeTwoPush twoPush = new ExecutiveCommitteeTwoPush();
+                twoPush.setPushDate(DateUtil.date());
+                twoPush.setUserId(id);
+                twoPush.setPushDelegationId(db.getDelegationId());
+                twoPush.setPushUserId(SecurityUtil.getUserId());
+                twoPush.setPushUserName(SecurityUtil.getUserUsername());
+                twoPush.setPushLoginName(SecurityUtil.getUserLoginname());
+                twoPush.setTeacherMeetId(teacherMeetId);
+                list.add(twoPush);
+            }
+            dao.insert(list);
+            return Result.success("添加成功!");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("添加失败!");
+        }
+    }
+
+    @At
+    @ApiOperation("删除推选人员")
+    @SaCheckPermission("executiveCommittee.delegationTwoPush")
+    @SLog(tag = "执委会推选-团长二次推选", msg = "删除推选人员")
+    public Result doDelete(@Valid String id, @Valid String teacherMeetId) {
+        ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId));
+        if (ObjectUtil.isEmpty(config)) {
+            return Result.error("请先配置基础信息");
+        }
+        if (config.getSecondEndTime().getTime() < System.currentTimeMillis()) {
+            return Result.error("二次预选已结束不能删除！");
+        }
+        int num = dao.clear(ExecutiveCommitteeTwoPush.class, Cnd.where("id", "=", id));
+        return num >= 0 ? Result.success() : Result.error();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeMemberController.java

@@ -0,0 +1,130 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.executiveCommittee.param.ExecutiveCommitteePageForm;
+import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeMemberService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+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.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2025/8/26 08:40
+ * @description 委员会名单
+ */
+@IocBean
+@At("/platform/executiveCommittee/executiveCommitteeMember")
+@Ok("json:full")
+@Slf4j
+@Api(tags = "两委会推选-委员会名单")
+public class ExecutiveCommitteeMemberController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ExecutiveCommitteeMemberService committeeMemberService;
+
+
+    @At("/index")
+    @SaCheckPermission("executiveCommittee.executiveCommitteeMember")
+    @Ok("beetl:/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("executiveCommittee.executiveCommitteeMember")
+    public Result pageData(ExecutiveCommitteePageForm pageForm) {
+        Sql sql = committeeMemberService.getSql(pageForm);
+        Pagination pagination = committeeMemberService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("查询每个人的推选人")
+    @SaCheckPermission("executiveCommittee.executiveCommitteeMember")
+    public Result onView(String teacherMeetId,
+                         String userId) {
+        Sql sql = Sqls.create("""
+				select
+					tp.*,
+					u.unitName,
+					u.unionName,
+					u.sex,
+					u.mobile,
+					dbt.name as delegationName
+				from
+					executive_committee_two_push tp
+					left join vw_user u on u.id = tp.pushUserId
+					left join teacher_congress_delegation dbt on dbt.id = tp.pushDelegationId
+				$condition
+				""");
+        Cnd cnd = Cnd.NEW();
+        cnd.and("tp.teacherMeetId", "=", teacherMeetId);
+        cnd.and("tp.userId", "=", userId);
+        cnd.desc("tp.pushDate");
+        sql.setCondition(cnd);
+        List<NutMap> listMap = committeeMemberService.listMap(sql);
+        return Result.success(listMap);
+    }
+
+    @At
+    @Ok("void")
+    @SaCheckPermission("executiveCommittee.executiveCommitteeMember")
+    public void doExportExcel(@Param("data") ExecutiveCommitteePageForm pageForm, HttpServletResponse response) {
+
+        Sql sql = committeeMemberService.getSql(pageForm);
+
+        List<NutMap> map = committeeMemberService.listMap(sql);
+
+        try {
+            List<ExcelExportEntity> entityList = new ArrayList<>();
+            ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10);
+            no.setFormat("isAddIndex");
+            entityList.add(no);
+
+            entityList.add(new ExcelExportEntity("姓名", "userName", 10));
+            entityList.add(new ExcelExportEntity("工号", "loginName", 10));
+            entityList.add(new ExcelExportEntity("性别", "sex", 10));
+            entityList.add(new ExcelExportEntity("联系方式", "mobile", 20));
+            entityList.add(new ExcelExportEntity("所属单位", "unitName", 20));
+            entityList.add(new ExcelExportEntity("所属代表团", "delegationName", 20));
+            entityList.add(new ExcelExportEntity("票数", "pushCount", 20));
+
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("委员会预选名单.xlsx", "UTF-8"));
+            ExportParams exportParams = new ExportParams();
+            exportParams.setType(ExcelType.XSSF);
+            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, map);
+            workbook.write(response.getOutputStream());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java

@@ -0,0 +1,232 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.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;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhf
+ * @date 2025/8/25 16:49
+ * @description
+ */
+@IocBean
+@At("/platform/executiveCommittee/preparatoryGroupPush")
+@Ok("json:full")
+@Slf4j
+@Api(tags = "执委会推选-筹备组推选")
+public class ExecutiveCommitteePushController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private BaseService baseService;
+
+    @At("/index")
+    @SaCheckPermission("executiveCommittee.preparatoryGroupPush")
+    @Ok("beetl:/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("executiveCommittee.preparatoryGroupPush")
+    public Result pageData(PageForm pageForm,
+                           String teacherMeetId,
+                           String delegationId,
+                           String unionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  t1.*,
+                  t2.name AS unitName,
+                  t3.name unionName,
+                  t4.sex,
+                  TIMESTAMPDIFF(
+                    YEAR,
+                    t4.birthday,
+                  CURDATE()) AS age,
+                  t5.name AS delegationName
+                FROM
+                  `executive_committee_one_push` t1
+                  LEFT JOIN sys_unit t2 ON t1.unitId = t2.id
+                  LEFT JOIN `sys_union` t3 ON t3.id = t2.unionid
+                  LEFT JOIN `vw_user` t4 ON t4.id = t1.userId
+                  LEFT JOIN teacher_congress_delegation t5 ON t5.id = t1.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
+        cnd.andEX("t1.delegationId", "=", delegationId);
+        cnd.andEX("t3.id", "=", unionId);
+        cnd.andEX("t1.addType", "=", 2);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.orLike("t1.userName", pageForm.getSearchKeyword());
+            group.orLike("t1.loginName", pageForm.getSearchKeyword());
+            cnd.and(group);
+        }
+        cnd.asc("t5.code").asc("t1.firstLetter");
+        sql.setCondition(cnd);
+        return Result.success(baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql));
+    }
+
+
+    @At
+    @SaCheckPermission("executiveCommittee.preparatoryGroupPush")
+    @ApiOperation("查询可以推选委员和已经推选的人员")
+    public Result getDelegationUser(String teacherMeetId) {
+        List<ExecutiveCommitteeOnePush> userValue = dao.query(ExecutiveCommitteeOnePush.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId)
+                        .and("addType", "=", 2));
+        List<ExecutiveCommitteeOnePush> onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW());
+        List<String> userIds = onePushList.stream().map(ExecutiveCommitteeOnePush::getUserId).collect(Collectors.toList());
+        ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId));
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("db.sessionId", "=", teacherMeetId);
+        cnd.andEX("db.userId", "not in", userIds);
+        cnd.andEX("db.userId", "!=", SecurityUtil.getUserId());
+        Sql sql = Sqls.create("""
+                 SELECT
+                  db.*,
+                  u.professionalTitle,
+                  u.professionalLevel,
+                  TIMESTAMPDIFF(YEAR, u.birthday, CURDATE()) AS age
+                FROM
+                  teacher_congress_delegate db
+                  LEFT JOIN `vw_user` u ON db.userId = u.id
+                $condition
+                """);
+        sql.setCondition(cnd);
+        List<NutMap> userData = baseService.listMap(sql);
+        return Result.success(Map.of("userData", userData, "userValue", userValue,"prepareGroupQuotaCount",config.getPrepareGroupQuotaCount()));
+    }
+
+    @At
+    @SaCheckPermission("executiveCommittee.preparatoryGroupPush")
+    @SLog(tag = "执委会推选-筹备组推选", msg = "推选委员")
+    public Result addOnePush(@Param("userValue") String[] userValue,
+                             String teacherMeetId) {
+        try {
+
+            ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                    Cnd.where("teacherMeetId", "=", teacherMeetId));
+            if (ObjectUtil.isEmpty(config)) {
+                return Result.error("请先配置基础信息");
+            }
+            if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) {
+                return Result.error("请等待一次预选开始时间");
+            }
+            if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
+                return Result.error("一次预选已结束");
+            }
+
+            int dbCount = dao.count(ExecutiveCommitteeOnePush.class,
+                    Cnd.where("teacherMeetId", "=", teacherMeetId)
+                            .and("addType", "=", 2));
+            if (dbCount + userValue.length > config.getPrepareGroupQuotaCount()) {
+                return Result.error("推选人数限制" + config.getPrepareGroupQuotaCount() + "人");
+            }
+
+            Sql sql = Sqls.create("""
+                     SELECT
+                       t1.*
+                     FROM
+                       teacher_congress_delegate t1
+                    $condition
+                    """);
+            Cnd cnd = Cnd.NEW();
+            cnd.and("t1.sessionId", "=", teacherMeetId);
+            cnd.andEX("t1.userId", "in", userValue);
+            sql.setCondition(cnd);
+            List<NutMap> dbList = baseService.listMap(sql);
+
+            List<ExecutiveCommitteeOnePush> list = new ArrayList<>();
+            for (String id : userValue) {
+                NutMap jdhDb = dbList.stream().filter(v -> v.getString("userId").equals(id)).findFirst().orElse(null);
+                if (ObjectUtil.isEmpty(jdhDb)) {
+                    return Result.error("请选择正确的代表!");
+                }
+                ExecutiveCommitteeOnePush onePush = new ExecutiveCommitteeOnePush();
+                onePush.setPushDate(DateUtil.date());
+                onePush.setUserId(jdhDb.getString("userId"));
+                onePush.setUserName(jdhDb.getString("userName"));
+                onePush.setLoginName(jdhDb.getString("loginName"));
+                onePush.setDelegationId(jdhDb.getString("delegationId"));
+                onePush.setUnitId(jdhDb.getString("unitId"));
+                onePush.setTeacherMeetId(teacherMeetId);
+                String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName")));
+                onePush.setFirstLetter(firstLetter);
+                onePush.setAddType(2);
+                list.add(onePush);
+            }
+            dao.insert(list);
+            return Result.success("添加成功!");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("添加失败!");
+        }
+    }
+
+    @At
+    @SaCheckPermission("executiveCommittee.preparatoryGroupPush")
+    @SLog(tag = "执委会推选-筹备组推选", msg = "删除推选的人")
+    public Result doDelete(@Valid String id, @Valid String teacherMeetId) {
+        ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
+                Cnd.where("teacherMeetId", "=", teacherMeetId));
+        if (ObjectUtil.isEmpty(config)) {
+            return Result.error("请先配置基础信息");
+        }
+        if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
+            return Result.error("预选已结束不能删除！");
+        }
+        int num = dao.clear(ExecutiveCommitteeOnePush.class, Cnd.where("id", "=", id));
+        return num >= 0 ? Result.success() : Result.error();
+    }
+
+
+    public static char getFirstLetter(String str) {
+        if (str == null || str.isEmpty()) {
+            throw new IllegalArgumentException("字符串不能为空");
+        }
+        char firstChar = str.charAt(0);
+        if (Validator.isChinese(String.valueOf(firstChar))) {
+            return Character.toUpperCase(PinyinUtil.getPinyin(firstChar).charAt(0));
+        } else if (Character.isLetter(firstChar)) {
+            return Character.toUpperCase(firstChar);
+        } else {
+            return firstChar;
+        }
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeConfig.java

@@ -0,0 +1,79 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.models;
+
+import cn.hutool.core.date.DateTime;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+import org.nutz.lang.util.NutMap;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @ClassName ExecutiveCommitteeConfig
+ * @Author JyuHsin
+ * @Date 2025/6/20 15:30
+ * @Version 1.0
+ * @Description TODO
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("executive_committee_config")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("执委会成员推选配置表")
+public class ExecutiveCommitteeConfig extends BaseModel implements Serializable {
+
+	@Name
+	@Comment("ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	@PrevInsert(uu32 = true)
+	private String id;
+
+	@Column
+	@Comment("所属教代会ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String teacherMeetId;
+
+	@Column
+	@Comment("筹备组推荐名额数")
+	@ColDefine(type = ColType.INT)
+	private Integer prepareGroupQuotaCount;
+
+	@Column
+	@Comment("委员会预选人数")
+	@ColDefine(type = ColType.INT)
+	private Integer committeeQuotaCount;
+
+	@Column
+	@Comment("代表团推荐名额总数")
+	@ColDefine(type = ColType.INT)
+	private Integer delegationQuotaCount;
+
+	@Column
+	@Comment("一次预选开始时间")
+	@ColDefine(type = ColType.DATETIME)
+	private DateTime firstStartTime;
+
+	@Column
+	@Comment("一次预选结束时间")
+	@ColDefine(type = ColType.DATETIME)
+	private DateTime firstEndTime;
+
+	@Column
+	@Comment("二次预选开始时间")
+	@ColDefine(type = ColType.DATETIME)
+	private DateTime secondStartTime;
+
+	@Column
+	@Comment("二次预选结束时间")
+	@ColDefine(type = ColType.DATETIME)
+	private DateTime secondEndTime;
+
+	@Column
+	@Comment("各代表团名额数")
+	@ColDefine(type = ColType.MYSQL_JSON)
+	private List<NutMap> delegationQuotaList;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeOnePush.java

@@ -0,0 +1,85 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.models;
+
+import cn.hutool.core.date.DateTime;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+
+/**
+ * @author zhf
+ * @date 2025/6/20 16:16
+ * @description 执委会成员推选表
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("executive_committee_one_push")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("执委会成员推选表")
+public class ExecutiveCommitteeOnePush extends BaseModel implements Serializable {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("代表用户ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("所属教代会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String teacherMeetId;
+
+    @Column
+    @Comment("所属代表团")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String delegationId;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String userName;
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String loginName;
+
+    @Column
+    @Comment("职称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String jobTitle;
+
+    @Column
+    @Comment("职称级别")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String jobTitleLevel;
+
+    @Column
+    @Comment("单位ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitId;
+
+    @Column
+    @Comment("推选时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime pushDate;
+
+    @Column
+    @Comment("姓氏排序")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String firstLetter;
+
+    @Column
+    @Comment("设置类型（1.团长2.筹备组加的）")
+    @ColDefine(type = ColType.INT)
+    private Integer addType;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java

@@ -0,0 +1,64 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.models;
+
+import cn.hutool.core.date.DateTime;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+
+/**
+ * @author zhf
+ * @date 2025/6/20 17:10
+ * @description 二次推选
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("executive_committee_two_push")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("执委会成员推选表")
+public class ExecutiveCommitteeTwoPush extends BaseModel implements Serializable {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("代表用户ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("所属教代会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String teacherMeetId;
+
+    @Column
+    @Comment("推选的代表团")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String pushDelegationId;
+
+    @Column
+    @Comment("推选人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String pushUserId;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String pushUserName;
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String pushLoginName;
+
+    @Column
+    @Comment("推选时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime pushDate;
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/param/ExecutiveCommitteePageForm.java

@@ -0,0 +1,18 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.param;
+
+import com.budwk.app.base.param.PageForm;
+import lombok.Data;
+
+/**
+ * @author zhf
+ * @date 2025/8/26 09:27
+ * @description
+ */
+@Data
+public class ExecutiveCommitteePageForm extends PageForm {
+
+    private String teacherMeetId;
+    private String delegationId;
+    private String unionId;
+    private String unitId;
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/ExecutiveCommitteeConfigService.java

@@ -0,0 +1,15 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.service;
+
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig;
+
+/**
+ * @ClassName ExecutiveCommitteeConfigService
+ * @Author JyuHsin
+ * @Date 2025/6/20 15:31
+ * @Version 1.0
+ * @Description TODO
+ */
+public interface ExecutiveCommitteeConfigService extends BaseService<ExecutiveCommitteeConfig> {
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/ExecutiveCommitteeMemberService.java

@@ -0,0 +1,12 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.executiveCommittee.param.ExecutiveCommitteePageForm;
+import org.nutz.dao.sql.Sql;
+
+public interface ExecutiveCommitteeMemberService extends BaseService {
+
+
+
+    Sql getSql(ExecutiveCommitteePageForm pageForm);
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeConfigServiceImpl.java

@@ -0,0 +1,22 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.service.impl;
+
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig;
+import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeConfigService;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @ClassName ExecutiveCommitteeConfigServiceImpl
+ * @Author JyuHsin
+ * @Date 2025/6/20 15:31
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean(args = {"refer:dao"})
+public class ExecutiveCommitteeConfigServiceImpl extends BaseServiceImpl<ExecutiveCommitteeConfig> implements ExecutiveCommitteeConfigService {
+
+	public ExecutiveCommitteeConfigServiceImpl(Dao dao) {
+		super(dao);
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java

@@ -0,0 +1,66 @@
+package com.budwk.app.zhgh.democratic.executiveCommittee.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.democratic.executiveCommittee.param.ExecutiveCommitteePageForm;
+import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeMemberService;
+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.IocBean;
+import org.nutz.lang.Strings;
+
+/**
+ * @author zhf
+ * @date 2025/8/26 09:22
+ * @description
+ */
+@IocBean(args = {"refer:dao"})
+public class ExecutiveCommitteeMemberServiceImpl extends BaseServiceImpl implements ExecutiveCommitteeMemberService {
+    public ExecutiveCommitteeMemberServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+    @Override
+    public Sql getSql(ExecutiveCommitteePageForm pageForm) {
+
+        Sql sql = Sqls.create("""
+                SELECT
+					op.*,
+					u.sex,
+					it.name unitName,
+					un.name unionName,
+					u.mobile,
+					dbt.name as delegationName,
+					 TIMESTAMPDIFF(
+                    YEAR,
+                    u.birthday,
+                  CURDATE()) AS age,
+					( SELECT count( 1 ) FROM executive_committee_two_push tp WHERE tp.userId = op.userId ) as pushCount
+				FROM
+					executive_committee_one_push op
+					LEFT JOIN sys_unit it ON op.unitId = it.id
+                 	LEFT JOIN `sys_union` un ON it.unionid = un.id
+					left join vw_user u on op.userId = u.id
+					left join teacher_congress_delegation dbt on dbt.id = op.delegationId
+				$condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("op.teacherMeetId", "=", pageForm.getTeacherMeetId());
+        cnd.andEX("op.unitId", "=", pageForm.getUnitId());
+        cnd.andEX("it.unionid", "=", pageForm.getUnionId());
+        cnd.andEX("op.delegationId", "=", pageForm.getDelegationId());
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.orLike("op.userName", pageForm.getSearchKeyword());
+            group.orLike("op.loginName", pageForm.getSearchKeyword());
+            cnd.and(group);
+        }
+        cnd.desc("pushCount");
+        cnd.asc("op.firstLetter");
+        sql.setCondition(cnd);
+        return sql;
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialApprovalController.java

@@ -0,0 +1,103 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.material;
+
+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.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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 java.util.List;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/material/approval")
+@Api(tags = "基层双代会-会议资料-校工会审核")
+public class GrassrootsCongressMaterialApprovalController {
+
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/material/approval/index.html")
+    @SaCheckPermission("grassrootsCongress.material.approval")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("会议列表")
+    @SaCheckPermission("grassrootsCongress.material.approval")
+    public Result pageData(PageForm pageForm, Integer year, String unionId, boolean approval) {
+        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 grassroots_congress_materials_info 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", "=", "zlsh");
+
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        cnd.andEX("YEAR(info.createdTime)", "=", year);
+        cnd.andEX("info.unionId", "=", unionId);
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = grassrootsCongressService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialCommonController.java

@@ -0,0 +1,34 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.material;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/material/common")
+@Api(tags = "基层双代会-会议资料-公共")
+public class GrassrootsCongressMaterialCommonController {
+
+    @Inject
+    private Dao dao;
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("获取申请信息")
+    public Result info(@Param("id") String id) {
+        GrassrootsCongressMaterialsInfo info = dao.fetch(GrassrootsCongressMaterialsInfo.class, id);
+        return Result.success(info);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialMineController.java

@@ -0,0 +1,124 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.material;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.param.GrassrootsCongressPageForm;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/material/mine")
+@Api(tags = "基层双代会-会议资料-我的申请")
+public class GrassrootsCongressMaterialMineController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/material/mine/index.html")
+    @SaCheckPermission("grassrootsCongress.material.mine")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("我的请示列表")
+    @SaCheckPermission("grassrootsCongress.material.mine")
+    public Result pageData(@Valid GrassrootsCongressPageForm pageForm) {
+        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' AND taskState in (10,20)) AS startTaskId
+                FROM
+                  grassroots_congress_materials_info 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();
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+        }
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.meetingName", pageForm.getSearchKeyword()));
+        }
+        cnd.andEX("YEAR(info.createdTime)", "=", pageForm.getYear());
+        cnd.desc("info.createdTime");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = grassrootsCongressService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("删除会议请示")
+    @SaCheckPermission("grassrootsCongress.material.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "基层双代会-会议资料-我的申请", msg = "删除")
+    public Result delete(@Valid String id) {
+        dao.clear(GrassrootsCongressMaterialsInfo.class, Cnd.where("id", "=", id));
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+
+    @At
+    @ApiOperation("基层双代会届次")
+    @SaCheckPermission("grassrootsCongress.material.mine")
+    public Result getAllJc(Integer year) {
+        List<GrassrootsCongressMeetingInfo> query = dao.query(GrassrootsCongressMeetingInfo.class,
+                Cnd.where("YEAR(createTime)", "=", year).and("fullName", "is not", null).groupBy("fullName"));
+        if (Lang.isNotEmpty(query)) {
+            List<String> list = query.stream().map(GrassrootsCongressMeetingInfo::getFullName).toList();
+            return Result.success(list);
+        }
+        return Result.success();
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialStatisticsController.java

@@ -0,0 +1,154 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.material;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.sys.models.Sys_file;
+import com.budwk.app.sys.utils.SysFileMinIoUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.param.GrassrootsCongressPageForm;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressMeetingService;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/material/statistics")
+@Api(tags = "基层双代会-会议资料-统计")
+public class GrassrootsCongressMaterialStatisticsController {
+
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+	@Inject
+	private GrassrootsCongressMeetingService grassrootsCongressMeetingService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/material/statistics/index.html")
+    @SaCheckPermission("grassrootsCongress.material.statistics")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("汇总统计列表")
+    @SaCheckPermission("grassrootsCongress.material.statistics")
+    public Result pageData(GrassrootsCongressPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId
+                FROM
+                  grassroots_congress_materials_info info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("ins.state","=", ProcessInstanceStateEnum.FINISHED.getCode());
+        cnd.andEX("info.unionId","=", pageForm.getUnionId());
+        cnd.andEX("YEAR(info.createdTime)", "=", pageForm.getYear());
+        cnd.desc("info.createdTime");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = grassrootsCongressService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+	@At
+	@Ok("void")
+	@SaCheckPermission("grassrootsCongress.material.statistics")
+	public void downloadFiles(GrassrootsCongressPageForm pageForm,
+							  HttpServletResponse response) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  grassroots_congress_materials_info info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and("ins.state","=", ProcessInstanceStateEnum.FINISHED.getCode());
+		cnd.andEX("YEAR(info.createdTime)", "=", pageForm.getYear());
+		cnd.andEX("info.unionId","=", pageForm.getUnionId());
+		cnd.desc("info.createdTime");
+		sql.setCondition(cnd);
+		List<GrassrootsCongressMaterialsInfo> list = grassrootsCongressMeetingService.listEntity(sql);
+
+		try {
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			ZipOutputStream zipOutputStream = new ZipOutputStream(bos);
+
+			List<String> fileNames = new ArrayList<>();
+
+			List<JSONObject> fileJsonList = list.stream().map(GrassrootsCongressMaterialsInfo::getFiles).flatMap(v -> v.stream().map(item -> item)).toList();
+
+
+			for (int i = 0; i < fileJsonList.size(); i++) {
+				JSONObject file = fileJsonList.get(i);
+				if (Lang.isEmpty(file)) {
+					continue;
+				}
+
+				// 人才，非常人才，优秀人才 666
+				Sys_file sysFile = grassrootsCongressMeetingService.dao().fetch(Sys_file.class, Cnd.where(Sys_file::getDownloadPath, "=", file.get("url")));
+
+				if (Lang.isEmpty(sysFile)) {
+					continue;
+				}
+
+				byte[] bytes = SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+
+				String fileName = sysFile.getName();
+
+				if (fileNames.contains(fileName)) {
+					String finalFileName = fileName;
+					long count = fileNames.stream().filter(name -> name.equals(finalFileName)).count();
+					fileName = i + fileName;
+				}
+
+				ZipEntry zipEntry = new ZipEntry(fileName);
+				zipOutputStream.putNextEntry(zipEntry);
+
+				zipOutputStream.write(bytes);
+				zipOutputStream.closeEntry();
+
+				fileNames.add(fileName);
+			}
+
+			zipOutputStream.close();
+			CommonDownloadUtil.download("资料汇总压缩包.zip", bos.toByteArray(), response);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialWriteController.java

@@ -0,0 +1,141 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.material;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+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.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/material/write")
+@Api(tags = "基层双代会-资料上传")
+public class GrassrootsCongressMaterialWriteController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/material/write/index.html")
+    @SaCheckPermission("grassrootsCongress.material.write")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("保存")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "基层双代会-资料资料", msg = "保存资料")
+    @SaCheckPermission("grassrootsCongress.material.write")
+    public Result save(@Param("data") GrassrootsCongressMaterialsInfo info) {
+        info.setCreatedTime(new Date());
+        dao.insertOrUpdate(info);
+        return Result.success();
+    }
+
+    @At
+    @ApiOperation("提交")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "基层双代会-资料请示", msg = "提交资料")
+    @SaCheckPermission("grassrootsCongress.material.write")
+    public Result submit(@Param("data") GrassrootsCongressMaterialsInfo info) {
+        info.setCreatedTime(new Date());
+        dao.insertOrUpdate(info);
+
+        // 开启流程实例
+        Dict args = Dict.create();
+        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JCSDHHYZL", info.getId(), SecurityUtil.getUserId(), args);
+
+        // 自动完成第一个申请任务
+        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+        for (ProcessTask task : doingTaskList) {
+            flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+        }
+        return Result.success();
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("重新提交申请")
+    @SLog(tag = "基层双代会-资料请示", msg = "重新提交申请")
+    @SaCheckPermission("grassrootsCongress.material.write")
+    public Result submitAgain(@Param("data") GrassrootsCongressMaterialsInfo info, @Param("taskId") Long taskId) {
+        dao.insertOrUpdate(info);
+
+        Dict dict = Dict.create();
+        dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+        dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+        flowCommonService.executeTask(dict);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("grassrootsCongress")
+    @ApiOperation("查询单个资料信息")
+    public Result info(@Valid String id) {
+        GrassrootsCongressMaterialsInfo info = dao.fetch(GrassrootsCongressMaterialsInfo.class, id);
+        return Result.success(info);
+    }
+
+
+    @At
+    @ApiOperation("查询分工会申请成功的届次信息")
+    @SaCheckPermission("grassrootsCongress.material.write")
+    public Result listSession(String unionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.id,
+                  info.fullName
+                FROM
+                  `grassroots_congress_meeting_info` info
+                  LEFT JOIN wf_process_instance inst ON inst.businessNo = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("inst.state","=", ProcessInstanceStateEnum.FINISHED.getCode());
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.andEX("info.unionId","=", unionId);
+        }
+        sql.setCondition(cnd);
+        sql.setCallback(Sqls.callback.maps());
+        dao.execute(sql);
+        List<NutMap> list = sql.getList(NutMap.class);
+        return Result.success(list);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/meeting/GrassrootsCongressMeetingApprovalController.java

@@ -0,0 +1,106 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.meeting;
+
+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.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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 java.util.List;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/meeting/approval")
+@Api(tags = "基层双代会批复")
+public class GrassrootsCongressMeetingApprovalController {
+
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/meeting/approval/index.html")
+    @SaCheckPermission("grassrootsCongress.meeting.approval")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("会议列表")
+    @SaCheckPermission("grassrootsCongress.meeting.approval")
+    public Result pageData(PageForm pageForm, Integer year, String unionId, boolean approval) {
+        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 grassroots_congress_meeting_info 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", "=", "8384aafd-3cdb-49ab-a11f-c5d145b1672c");
+
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        cnd.andEX("YEAR(info.createTime)", "=", year);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.meetingName", pageForm.getSearchKeyword()));
+        }
+        cnd.andEX("info.unionId", "=", unionId);
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = grassrootsCongressService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/meeting/GrassrootsCongressMeetingCommonController.java

@@ -0,0 +1,34 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.meeting;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/meeting/common")
+@Api(tags = "基层双代会")
+public class GrassrootsCongressMeetingCommonController {
+
+    @Inject
+    private Dao dao;
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("获取申请信息")
+    public Result info(@Param("id") String id) {
+        GrassrootsCongressMeetingInfo info = dao.fetch(GrassrootsCongressMeetingInfo.class, id);
+        return Result.success(info);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/meeting/GrassrootsCongressMeetingMineController.java

@@ -0,0 +1,126 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.meeting;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.param.GrassrootsCongressPageForm;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+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.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.Lang;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/meeting/mine")
+@Api(tags = "基层双代会我的请示")
+public class GrassrootsCongressMeetingMineController {
+
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/meeting/mine/index.html")
+    @SaCheckPermission("grassrootsCongress.meeting.mine")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("我的请示列表")
+    @SaCheckPermission("grassrootsCongress.meeting.mine")
+    public Result pageData(@Valid GrassrootsCongressPageForm pageForm) {
+        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' AND taskState in (10,20)) AS startTaskId
+                FROM
+                  grassroots_congress_meeting_info 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.and("info.createdBy", "=", SecurityUtil.getUserId());
+
+        cnd.andEX("YEAR(info.createTime)", "=", pageForm.getYear());
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.meetingName", pageForm.getSearchKeyword()));
+        }
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("info.createUserId", "=", SecurityUtil.getUserId());
+        }
+        cnd.desc("info.createTime");
+
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = grassrootsCongressService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("删除会议请示")
+    @SaCheckPermission("grassrootsCongress.meeting.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "基层双代会-我的请示", msg = "删除会议请示")
+    public Result delete(@Valid String id) {
+        grassrootsCongressService.delete(id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+
+    @At
+    @ApiOperation("基层双代会届次")
+    @SaCheckPermission("grassrootsCongress.meeting.mine")
+    public Result getAllJc(Integer year) {
+        List<GrassrootsCongressMeetingInfo> query = baseService.dao().query(GrassrootsCongressMeetingInfo.class,
+                Cnd.where("YEAR(createTime)", "=", year).and("fullName", "is not", null).groupBy("fullName"));
+        if (Lang.isNotEmpty(query)) {
+            List<String> list = query.stream().map(GrassrootsCongressMeetingInfo::getFullName).toList();
+            return Result.success(list);
+        }
+        return Result.success();
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/meeting/GrassrootsCongressMeetingStatisticsController.java

@@ -0,0 +1,68 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.meeting;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.zhgh.democratic.grassrootscongress.param.GrassrootsCongressPageForm;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/meeting/statistics")
+@Api(tags = "基层双代会汇总统计")
+public class GrassrootsCongressMeetingStatisticsController {
+
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/meeting/statistics/index.html")
+    @SaCheckPermission("grassrootsCongress.meeting.statistics")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("汇总统计列表")
+    @SaCheckPermission("grassrootsCongress.meeting.statistics")
+    public Result pageData(GrassrootsCongressPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId
+                FROM
+                  grassroots_congress_meeting_info info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode());
+        cnd.andEX("YEAR(info.createTime)", "=", pageForm.getYear());
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.meetingName", pageForm.getSearchKeyword()));
+        }
+        cnd.andEX("info.unionId", "=", pageForm.getUnionId());
+        cnd.desc("info.createTime");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = grassrootsCongressService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/meeting/GrassrootsCongressMeetingWriteController.java

@@ -0,0 +1,177 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.controller.meeting;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/grassrootsCongress/meeting/write")
+@Api(tags = "基层双代会-会议请示")
+public class GrassrootsCongressMeetingWriteController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private FlowCommonService flowCommonService;
+    @Inject
+    private GrassrootsCongressService grassrootsCongressService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/grassrootscongress/meeting/write/index.html")
+    @SaCheckPermission("grassrootsCongress.meeting.write")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("保存")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "基层双代会-会议请示", msg = "保存会议")
+    @SaCheckPermission("grassrootsCongress.meeting.write")
+    public Result save(@Param("data") GrassrootsCongressMeetingInfo data) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  count(1)
+                FROM
+                  `grassroots_congress_meeting_info` info
+                  LEFT JOIN wf_process_instance inst ON inst.businessNo = info.id
+                 WHERE inst.state=20 AND info.unionId = @unionId
+                 AND info.j = @j AND info.c = @c
+                """);
+        sql.setParam("unionId", data.getUnionId());
+        sql.setParam("j", data.getJ());
+        sql.setParam("c", data.getC());
+        int count = grassrootsCongressService.count(sql);
+
+        if (count > 0) {
+            return Result.error("该届次已存在！");
+        }
+
+
+        data.setFullName(data.getJ() + data.getC());
+        data.setCreateTime(DateUtil.now());
+        data.setCreateUserId(SecurityUtil.getUserId());
+        data.setCreateUserName(SecurityUtil.getUserUsername());
+        dao.insertOrUpdate(data);
+        return Result.success();
+    }
+
+    @At
+    @ApiOperation("提交")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "基层双代会-会议请示", msg = "提交会议")
+    @SaCheckPermission("grassrootsCongress.meeting.write")
+    public Result submit(@Param("data") GrassrootsCongressMeetingInfo data) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  count(1)
+                FROM
+                  `grassroots_congress_meeting_info` info
+                  LEFT JOIN wf_process_instance inst ON inst.businessNo = info.id
+                 WHERE inst.state=20 AND info.unionId = @unionId
+                 AND info.j = @j AND info.c = @c
+                """);
+        sql.setParam("unionId", data.getUnionId());
+        sql.setParam("j", data.getJ());
+        sql.setParam("c", data.getC());
+        int count = grassrootsCongressService.count(sql);
+
+        if (count > 0) {
+            return Result.error("该届次已存在！");
+        }
+
+        data.setFullName(data.getJ() + data.getC());
+        data.setCreateTime(DateUtil.now());
+        data.setCreateUserId(SecurityUtil.getUserId());
+        data.setCreateUserName(SecurityUtil.getUserUsername());
+        dao.insertOrUpdate(data);
+
+        // 开启流程实例
+        Dict args = Dict.create();
+        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JCSDH", data.getId(), SecurityUtil.getUserId(), args);
+
+        // 自动完成第一个申请任务
+        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+        for (ProcessTask task : doingTaskList) {
+            flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+        }
+
+        return Result.success();
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("重新提交申请")
+    @SLog(tag = "基层双代会-会议请示", msg = "重新提交申请")
+    @SaCheckPermission("grassrootsCongress.meeting.write")
+    public Result submitAgain(@Param("data") GrassrootsCongressMeetingInfo data, @Param("taskId") Long taskId) {
+        data.setFullName(data.getJ() + data.getC());
+        dao.insertOrUpdate(data);
+
+        Dict dict = Dict.create();
+        dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+        dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+        flowCommonService.executeTask(dict);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("grassrootsCongress")
+    @ApiOperation("查询单个会议信息")
+    public Result info(@Valid String id) {
+        GrassrootsCongressMeetingInfo info = dao.fetch(GrassrootsCongressMeetingInfo.class, id);
+        return Result.success(info);
+    }
+
+
+    @At
+    @ApiOperation("根据unionId查询所有基层双代会")
+    public Result querySessionList(String unionId) {
+        Cnd cnd = Cnd.NEW();
+        if (!AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SYSADMIN.name())) {
+            cnd.and("unionId", "=", SecurityUtil.getUnionId());
+        }
+        cnd.andEX("unionId", "=", unionId);
+        cnd.groupBy("fullName");
+        cnd.desc("createdAt");
+        List<GrassrootsCongressMeetingInfo> infoList = dao.query(GrassrootsCongressMeetingInfo.class, cnd);
+
+        return Result.success(infoList);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/models/GrassrootsCongressMaterialsInfo.java

@@ -0,0 +1,82 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.models;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Comment("基层双代会资料")
+@EqualsAndHashCode(callSuper = true)
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Table("grassroots_congress_materials_info")
+public class GrassrootsCongressMaterialsInfo extends BaseModel {
+
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("创建人id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("创建人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String userName;
+
+    @Column
+    @Comment("创建人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 120)
+    private String loginName;
+
+    @Column
+    @Comment("创建人工会")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unionName;
+
+    @Column
+    @Comment("创建人工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("教代会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String sessionId;
+
+    @Column
+    @Comment("教代会全称")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String fullName;
+
+    @Column
+    @Comment("资料类型")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String materialsType;
+
+    @Column
+    @Comment("资料名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String materialsName;
+
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<JSONObject> files;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date createdTime;
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/models/GrassrootsCongressMeetingInfo.java

@@ -0,0 +1,119 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.models;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：GrassrootsCongressInfo
+ * @Date 2024/8/16 16:49
+ * @注释 基层双代会信息
+ */
+@Data
+@Comment("基层双代会信息")
+@EqualsAndHashCode(callSuper = true)
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Table("grassroots_congress_meeting_info")
+public class GrassrootsCongressMeetingInfo extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @Comment("会议名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String meetingName;
+
+    @Column
+    @Comment("会议类型")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String meetingType;
+
+    @Column
+    @Comment("届数")
+    @ColDefine(type = ColType.VARCHAR, width = 8)
+    private String j;
+
+    @Column
+    @Comment("次数")
+    @ColDefine(type = ColType.VARCHAR, width = 8)
+    private String c;
+
+    @Column
+    @Comment("所属单位")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitId;
+
+    @Column
+    @Comment("所属单位")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitName;
+
+    @Column
+    @Comment("所属工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("所属工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionName;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String createTime;
+
+    @Column
+    @Comment("创建人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String createUserId;
+
+    @Column
+    @Comment("创建人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String createUserName;
+
+    @Column
+    @Comment("届次")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String sessionId;
+
+    @Column
+    @Comment("会议时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String meetingTime;
+
+    @Column
+    @Comment("会议议程")
+    @ColDefine(type = ColType.TEXT)
+    private String meetingTopic;
+
+
+    @Column
+    @Comment("会议备注")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String meetingRemark;
+
+    @Column
+    @Comment("文件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<JSONObject> files;
+
+    @Column
+    @Comment("教代会全称")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String fullName;
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/param/GrassrootsCongressPageForm.java

@@ -0,0 +1,23 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.param;
+
+import com.budwk.app.base.param.PageForm;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：GrassrootsCongressPageForm
+ * @Date 2024/11/14 19:29
+ * @注释
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GrassrootsCongressPageForm extends PageForm {
+
+    private Integer year;
+
+    private String unionId;
+
+    private String fullName;
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/service/GrassrootsCongressMeetingService.java

@@ -0,0 +1,12 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.service;
+
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+
+public interface GrassrootsCongressMeetingService extends BaseService<GrassrootsCongressMaterialsInfo> {
+
+    Pagination pageData(PageForm pageForm,Integer year);
+    Pagination pageData(PageForm pageForm,Integer year,String unionId);
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/service/GrassrootsCongressService.java

@@ -0,0 +1,15 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.service;
+
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.param.GrassrootsCongressPageForm;
+
+public interface GrassrootsCongressService extends BaseService<GrassrootsCongressMeetingInfo> {
+
+    Pagination pageData(GrassrootsCongressPageForm pageForm, Integer year);
+
+    Pagination approvalPageData(PageForm pageForm, Integer year,String unionId);
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/service/impl/GrassrootsCongressMeetingServiceImpl.java

@@ -0,0 +1,112 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.service.impl;
+
+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.service.impl.BaseServiceImpl;
+import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressMeetingService;
+import com.budwk.app.zhgh.democratic.grassrootscongress.vo.GrassrootsCongressMaterialPageVo;
+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.Static;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @ClassName GrassrootsCongressMeetingServiceImpl
+ * @Description TODO
+ * @Author zhf
+ * @Date 2024/9/6 9:55
+ */
+@IocBean(args = {"refer:dao"})
+public class GrassrootsCongressMeetingServiceImpl extends BaseServiceImpl<GrassrootsCongressMaterialsInfo> implements GrassrootsCongressMeetingService {
+    public GrassrootsCongressMeetingServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+    @Override
+    public Pagination pageData(PageForm pageForm, Integer year) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                    inst.processInstanceNodeId,
+                    inst.processInstanceNodeCode,
+                    inst.processInstanceNodeName,
+                    inst.processInstanceTaskIds,
+                    inst.processInstanceStatus,
+                    nd.nodeType AS processInstanceTaskNodeType,
+                    (
+                       SELECT
+                         count( 1 ) > 0
+                       FROM
+                         bpm_process_task
+                       WHERE
+                         prevTaskId = ( SELECT id FROM bpm_process_task WHERE processInstanceId = inst.id AND processTaskNodeCode IN ( 10, 40, 70 ) ORDER BY createdAt DESC LIMIT 1 )
+                         AND taskStatus = 'COMPELTE'
+                     ) AS nextTaskIsComplete
+                FROM
+                    grassroots_congress_materials_info info
+                    LEFT JOIN bpm_process_instance inst ON inst.processInstanceBusinessId = info.id
+                    LEFT JOIN bpm_process_node_define nd ON nd.id = inst.processInstanceNodeId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("YEAR(info.createdDate)", "=", year);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.materialsName", pageForm.getSearchKeyword()));
+        }
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("info.userId", "=", SecurityUtil.getUserId());
+        }
+        cnd.desc("info.createdAt");
+        sql.setCondition(cnd);
+        return listPageVO(pageForm, sql, GrassrootsCongressMaterialPageVo.class);
+    }
+
+    @Override
+    public Pagination pageData(PageForm pageForm, Integer year, String unionId) {
+        Cnd cnd = Cnd.NEW();
+        cnd.and("nd.nodeCode", "=", 20);
+        cnd.andEX("YEAR(info.createdDate)", "=", year);
+        cnd.andEX("info.unionId", "=", unionId);
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	inst.id processInstanceId,
+                	inst.processInstanceNodeId,
+                	inst.processInstanceNodeName,
+                	inst.processInstanceTaskIds,
+                	inst.processInstanceStatus,
+                	task.id processInstanceTaskId,
+                	task.taskStatus processInstanceTaskStatus,
+                	COUNT( nt.id ) OVER ( PARTITION BY task.id ) > 0 AS nextTaskIsComplete
+                FROM
+                	bpm_process_task task
+                	INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
+                	INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
+                	INNER JOIN grassroots_congress_materials_info info ON info.id = inst.processInstanceBusinessId
+                	LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE'
+                $condition
+                """);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.materialsName", pageForm.getSearchKeyword()));
+        }
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
+        }
+        if (pageForm.getAudit()) {
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
+        } else {
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
+        }
+        cnd.desc("info.createdBy");
+        sql.setCondition(cnd);
+        return listPageVO(pageForm, sql, GrassrootsCongressMaterialPageVo.class);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/service/impl/GrassrootsCongressServiceImpl.java

@@ -0,0 +1,116 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.service.impl;
+
+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.service.impl.BaseServiceImpl;
+import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.param.GrassrootsCongressPageForm;
+import com.budwk.app.zhgh.democratic.grassrootscongress.service.GrassrootsCongressService;
+import com.budwk.app.zhgh.democratic.grassrootscongress.vo.GrassrootsCongressPageVo;
+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.Static;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @ClassName GrassrootsCongressServiceImpl
+ * @Description TODO
+ * @Author zhf
+ * @Date 2024/9/5 18:06
+ */
+@IocBean(args = {"refer:dao"})
+public class GrassrootsCongressServiceImpl extends BaseServiceImpl<GrassrootsCongressMeetingInfo> implements GrassrootsCongressService {
+    public GrassrootsCongressServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+    @Override
+    public Pagination pageData(GrassrootsCongressPageForm pageForm, Integer year) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                    inst.processInstanceNodeId,
+                    inst.processInstanceNodeCode,
+                    inst.processInstanceNodeName,
+                    inst.processInstanceTaskIds,
+                    inst.processInstanceStatus,
+                    nd.nodeType AS processInstanceTaskNodeType,
+                    (
+                       SELECT
+                         count( 1 ) > 0
+                       FROM
+                         bpm_process_task
+                       WHERE
+                         prevTaskId = ( SELECT id FROM bpm_process_task WHERE processInstanceId = inst.id AND processTaskNodeCode IN ( 10, 40 ) ORDER BY createdAt DESC LIMIT 1 )
+                         AND taskStatus = 'COMPELTE'
+                     ) AS nextTaskIsComplete
+                FROM
+                    grassroots_congress_meeting_info info
+                    LEFT JOIN bpm_process_instance inst ON inst.processInstanceBusinessId = info.id
+                    LEFT JOIN bpm_process_node_define nd ON nd.id = inst.processInstanceNodeId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("YEAR(info.createTime)", "=", year);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX("info.meetingName", pageForm.getSearchKeyword()));
+        }
+        if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_VICE_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_WC_AUDIT_ADMIN.name())){
+            cnd.and("info.createUserId", "=", SecurityUtil.getUserId());
+        }
+        cnd.desc("info.createTime");
+        sql.setCondition(cnd);
+        return listPageVO(pageForm, sql, GrassrootsCongressPageVo.class);
+    }
+
+    @Override
+    public Pagination approvalPageData(PageForm pageForm, Integer year, String unionId) {
+        Cnd cnd = Cnd.NEW();
+        cnd.and("nd.nodeCode", "=", 20);
+        cnd.andEX("YEAR(info.createTime)", "=", year);
+        cnd.andEX("info.unionId", "=", unionId);
+        Sql sql = generateSql(pageForm, cnd);
+        sql.setCondition(cnd);
+        return listPageVO(pageForm, sql, GrassrootsCongressPageVo.class);
+    }
+
+
+    private Sql generateSql(PageForm pageForm, Cnd cnd) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	inst.id processInstanceId,
+                    inst.processInstanceNodeId,
+                    inst.processInstanceNodeName,
+                    inst.processInstanceTaskIds,
+                    inst.processInstanceStatus,
+                    task.id processInstanceTaskId,
+                    task.taskStatus processInstanceTaskStatus,
+                    COUNT(nt.id) OVER (PARTITION BY task.id) > 0 AS nextTaskIsComplete
+                FROM
+                	bpm_process_task task
+                	INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
+                	INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
+                	INNER JOIN grassroots_congress_meeting_info info ON info.id = inst.processInstanceBusinessId
+                	LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE'
+                $condition
+                """);
+        if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_VICE_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_WC_AUDIT_ADMIN.name())){
+            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
+        }
+        if (pageForm.getAudit()) {
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
+        } else {
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
+        }
+        cnd.desc("info.createTime");
+        return sql;
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/vo/GrassrootsCongressMaterialPageVo.java

@@ -0,0 +1,31 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.vo;
+
+import com.budwk.app.bpm.vo.BpmTaskApprovalVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：GrassrootsCongressMaterialPageVo
+ * @Date 2024/10/23 13:59
+ * @注释 基层双代会资料
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GrassrootsCongressMaterialPageVo extends BpmTaskApprovalVo {
+
+    private String id;
+    private String userId;
+    private String userName;
+    private String loginName;
+    private String unionName;
+    private String sessionId;
+    private String fullName;
+    private String materialsType;
+    private String materialsName;
+    private String files;
+    private Date createdDate;
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/vo/GrassrootsCongressMaterialVo.java

@@ -0,0 +1,24 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.vo;
+
+import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMaterialsInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：GrassrootsCongressMaterialVo
+ * @Date 2024/10/23 15:28
+ * @注释
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GrassrootsCongressMaterialVo extends GrassrootsCongressMaterialsInfo {
+
+    @ApiModelProperty("节点审批记录")
+    private List<BpmTaskApprovalRecordVo> nodeTasks;
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/vo/GrassrootsCongressPageVo.java

@@ -0,0 +1,44 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.vo;
+
+import com.budwk.app.bpm.vo.BpmTaskApprovalVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：GrassrootsCongressVo
+ * @Date 2024/10/22 18:21
+ * @注释
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GrassrootsCongressPageVo extends BpmTaskApprovalVo {
+
+    private String id;
+    private String meetingName;
+    private String unitId;
+    private String unionId;
+    private Date createTime;
+    private String sessionId;
+    private Date meetingTime;
+    private String meetingTopic;
+    private String meetingRemark;
+    private String files;
+    private String createdBy;
+    private long createdAt;
+    private String updatedBy;
+    private long updatedAt;
+    private boolean delFlag;
+    private String meetingType;
+    private String j;
+    private String c;
+    private String unitName;
+    private String unionName;
+    private String fullName;
+    private String createUserId;
+    private String createUserName;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/vo/GrassrootsCongressVo.java

@@ -0,0 +1,25 @@
+package com.budwk.app.zhgh.democratic.grassrootscongress.vo;
+
+import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo;
+import com.budwk.app.zhgh.democratic.grassrootscongress.models.GrassrootsCongressMeetingInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：GrassrootsCongressVo
+ * @Date 2024/10/23 15:26
+ * @注释
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GrassrootsCongressVo extends GrassrootsCongressMeetingInfo {
+
+    @ApiModelProperty("节点审批记录")
+    private List<BpmTaskApprovalRecordVo> nodeTasks;
+}
+

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java

@@ -0,0 +1,108 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.common;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalType;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation;
+import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/common")
+@Ok("json:full")
+public class ProposalCommonController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At
+    @SaCheckPermission("proposal")
+    @ApiOperation("提案详情")
+    public Result proposalInfo(@Valid String id) {
+        return Result.success(proposalCommonService.info(id));
+    }
+
+    @At
+    @ApiOperation("查询全部的提案类型")
+    @SaCheckLogin
+    public Result listProposalType(){
+        List<ProposalType> list = dao.query(ProposalType.class, Cnd.NEW().asc(ProposalType::getCode));
+        return Result.success(list);
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("查询全部的教代会")
+    public Result listSession(String orderBy) {
+        if (StrUtil.isBlank(orderBy)) {
+            orderBy = "desc";
+        }
+        List<Teacher_congress_session> list = dao.query(Teacher_congress_session.class, Cnd.NEW().orderBy("startDate", orderBy));
+        return Result.success(list);
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("查询开启的教代会")
+    public Result listOpenSession() {
+        List<Teacher_congress_session> list = dao.query(Teacher_congress_session.class, Cnd.where("enable", "=", 1).desc("startDate"));
+        return Result.success(list);
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("查询当前用户所属的教代会")
+    public Result listOpenSessionByUser() {
+        List<Teacher_congress_session> list = dao.query(Teacher_congress_session.class, Cnd.where("enable", "=", 1).desc("startDate"));
+        return Result.success(list);
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("查询当前教代会的代表团")
+    public Result listDelegation(@Valid String sessionId) {
+        List<Teacher_congress_delegation> list = dao.query(Teacher_congress_delegation.class, Cnd.where("sessionId", "=", sessionId).asc("code"));
+        return Result.success(list);
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("承办单位列表")
+    public Result listUnderTake() {
+        List<ProposalUndertake> list = dao.query(ProposalUndertake.class, Cnd.NEW());
+        return Result.success(list);
+    }
+
+    @At
+    @SaCheckPermission("proposal")
+    @ApiOperation("提案配置")
+    public Result config() {
+        ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.NEW());
+        return Result.success(config);
+    }
+
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal")
+    public void exportProposalAsDocx(String id, HttpServletResponse response) {
+        proposalCommonService.exportProposalAsDocx(id, response);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigAllController.java

@@ -0,0 +1,49 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.config;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@IocBean
+@At("/platform/proposal/config/all")
+@Slf4j
+@Ok("json:full")
+@Api("提案全局配置")
+public class ProposalConfigAllController {
+
+    @Inject
+    private Dao dao;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/config/all/index.html")
+    @SaCheckPermission("proposal.config.all")
+    public void index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.config.all")
+    @ApiOperation("查询提案配置")
+    public Object findOne() {
+        ProposalConfig config = dao.fetch(ProposalConfig.class);
+        return Result.success(config);
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.all")
+    @ApiOperation("修改提案配置")
+    public Object update(@Param("config") ProposalConfig proposalConfig) {
+        dao.updateIgnoreNull(proposalConfig);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigTypeController.java

@@ -0,0 +1,94 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.config;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.annotation.SLog;
+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.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+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.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/proposal/config/type")
+@Slf4j
+@Ok("json:full")
+@Api("提案类型配置")
+public class ProposalConfigTypeController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private BaseService baseService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/config/type/index.html")
+    @SaCheckPermission("proposal.config.type")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.type")
+    @ApiModelProperty("分页查询提案类型")
+    public Result pageData(@Valid PageForm pageForm,String name){
+        Sql sql = Sqls.create("select * from proposal_type $condition");
+        Cnd cnd = Cnd.NEW();
+        cnd.and(Cnd.likeEX("name", name));
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalType.class);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.type")
+    @ApiModelProperty("新增提案类型")
+    @SLog(type = "提案类型配置", tag = "新增提案类型", msg = "${type.name}")
+    public Result insert(ProposalType type){
+        int count = dao.count(ProposalType.class, Cnd.where("code", "=", type.getCode()));
+        if(count>0){
+            return Result.error("编码重复！");
+        }
+        dao.insert(type);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.type")
+    @ApiModelProperty("修改提案类型")
+    @SLog(type = "提案类型配置", tag = "修改提案类型", msg = "${type.name}")
+    public Result update(ProposalType type){
+        int count = dao.count(ProposalType.class, Cnd.where("code", "=", type.getCode()).and("id", "!=", type.getId()));
+        if (count > 0) {
+            return Result.error("编码重复！");
+        }
+        dao.updateIgnoreNull(type);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.type")
+    @ApiModelProperty("删除提案类型")
+    @SLog(type = "提案类型配置", tag = "删除提案类型", msg = "id:${id}")
+    public Result delete(@Valid Integer id){
+        int count = dao.count(ProposalInfo.class, Cnd.where(ProposalInfo::getTypeId, "=", id));
+        if(count > 0){
+            return Result.error("该类型有关联的提案，无法删除！");
+        }
+        dao.delete(ProposalType.class, id);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java

@@ -0,0 +1,258 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.config;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+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.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 提案承办单位配置
+ */
+@IocBean
+@At("/platform/proposal/config/unit")
+@Slf4j
+@Ok("json:full")
+public class ProposalConfigUnitController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private SysRoleService sysRoleService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/config/unit/index.html")
+    @SaCheckPermission("proposal.config.unit")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    public Result tree() {
+        List<ProposalUndertake> list = dao.query(ProposalUndertake.class, Cnd.NEW().asc(ProposalUndertake::getCode));
+        List<TreeNode<String>> treeNodes = new ArrayList<>(list.stream().map(undertake -> new TreeNode<>(undertake.getId(), "0", undertake.getName(), 0)).toList());
+        treeNodes.add(new TreeNode<>("0", "", "提案承办单位", 1000));
+        List<Tree<String>> build = TreeUtil.build(treeNodes, "");
+        return Result.success(build);
+    }
+
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    public Result pageData(@Valid PageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	t1.*,
+                	u1.username AS branchSchoolLeader,
+                	u2.username AS unitLeader
+                FROM
+                	proposal_undertake t1
+                	LEFT JOIN sys_user_role sur1 ON sur1.underTakeId = t1.id
+                	AND sur1.roleId = ( SELECT r.id FROM sys_role r WHERE r.CODE = @PROPOSAL_BRANCH_SCHOOL_LEADER )
+                	LEFT JOIN sys_user u1 ON u1.id = sur1.userId
+                	LEFT JOIN sys_user_role sur2 ON sur2.underTakeId = t1.id
+                	AND sur2.roleId = ( SELECT r.id FROM sys_role r WHERE r.CODE = @PROPOSAL_UNIT_LEADER)
+                	LEFT JOIN sys_user u2 ON u2.id = sur2.userId
+                $condition
+                """);
+        sql.setParam("PROPOSAL_BRANCH_SCHOOL_LEADER", RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name());
+        sql.setParam("PROPOSAL_UNIT_LEADER", RoleConstant.PROPOSAL_UNIT_LEADER.name());
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.where().orLike("u1.username", pageForm.getSearchKeyword());
+            cnd.where().orLike("u1.loginname", pageForm.getSearchKeyword());
+            cnd.where().orLike("u2.username", pageForm.getSearchKeyword());
+            cnd.where().orLike("u2.loginname", pageForm.getSearchKeyword());
+            cnd.where().orLike("t1.name", pageForm.getSearchKeyword());
+        }
+        cnd.asc("t1.code");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    /**
+     * 同步系统单位数
+     *
+     * @return
+     */
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    @SLog(tag = "提案", msg = "承办单位同步系统单位")
+    public Result syncSysUnit() {
+        Sql sql = Sqls.create("select code from proposal_undertake");
+        List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql).and(Sys_unit::getUnitTypeCode, "=", 1));
+        List<ProposalUndertake> proposalUndertakes = sysUnits.stream().map(unit -> {
+            ProposalUndertake proposalUndertake = new ProposalUndertake();
+            proposalUndertake.setId(unit.getId());
+            proposalUndertake.setCode(unit.getUnitcode());
+            proposalUndertake.setEnable(true);
+            proposalUndertake.setName(unit.getName());
+            return proposalUndertake;
+        }).toList();
+        dao.fastInsert(proposalUndertakes);
+        return Result.success();
+    }
+
+    /**
+     * 设置分管校领导
+     *
+     * @param id
+     * @param userIds
+     * @return
+     */
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案", msg = "设置分管校领导")
+    public Result updateBranchSchoolLeader(@Valid String id, @Param("userIds") String[] userIds) {
+        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER);
+        //删除原来的用户
+        dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId())
+                .and(Sys_user_role::getUnderTakeId, "=", id));
+        List<Sys_user_role> sysUserRoles = Arrays.stream(userIds).map(userId -> {
+            Sys_user_role sysUserRole = new Sys_user_role();
+            sysUserRole.setRoleId(sysRole.getId());
+            sysUserRole.setUserId(userId);
+            sysUserRole.setUnderTakeId(id);
+            return sysUserRole;
+        }).toList();
+        dao.insert(sysUserRoles);
+        return Result.success();
+    }
+
+    /**
+     * 设置单位负责人
+     *
+     * @param id
+     * @param userIds
+     * @return
+     */
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    @SLog(tag = "提案", msg = "设置承办单位领导")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result updateUnitLeader(@Valid String id, @Param("userIds") String[] userIds) {
+        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER);
+        //删除原来的用户
+        dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId())
+                .and(Sys_user_role::getUnderTakeId, "=", id));
+        List<Sys_user_role> sysUserRoles = Arrays.stream(userIds).map(userId -> {
+            Sys_user_role sysUserRole = new Sys_user_role();
+            sysUserRole.setRoleId(sysRole.getId());
+            sysUserRole.setUserId(userId);
+            sysUserRole.setUnderTakeId(id);
+            return sysUserRole;
+        }).toList();
+        dao.insert(sysUserRoles);
+        return Result.success();
+    }
+
+    /**
+     * 分管领导数据
+     *
+     * @param id
+     * @return
+     */
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    public Result branchSchoolLeaderTransferData(@Valid String id) {
+        //已设置的领导
+        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER);
+        List<Sys_user_role> sysUserRoles = dao.query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnderTakeId, "=", id));
+        List<String> selectUserIds = sysUserRoles.stream().map(Sys_user_role::getUserId).toList();
+
+        //查询全部的校领导
+        Sql sql = Sqls.create("select id,username,loginname,unitname,concat(username,'(',loginname,')') label from vw_user where unitId in (@unitId)");
+        ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
+        if(ObjectUtil.isNull(proposalConfig)){
+            return Result.error("提案全局配置未配置，请在提案管理-基础配置-提案配置页面进行配置。");
+        }
+        if(ObjectUtil.isEmpty(proposalConfig.getSchoolLeaderUnitIds())){
+            return Result.error("校领导单位未配置，请在提案管理-基础配置-提案配置页面进行配置。");
+        }
+
+        sql.setParam("unitId", proposalConfig.getSchoolLeaderUnitIds());
+        List<NutMap> allUsers = baseService.listMap(sql);
+
+        return Result.success(Map.of("allUsers", allUsers, "selectUserIds", selectUserIds));
+    }
+
+    /**
+     * 单位成员数据
+     *
+     * @param id
+     * @return
+     */
+    @At
+    @SaCheckPermission("proposal.config.unit")
+    public Result unitUsersTransferData(@Valid String id) {
+        //已设置的单位领导
+        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER);
+        List<Sys_user_role> sysUserRoles = dao.query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnderTakeId, "=", id));
+        List<String> selectUserIds = sysUserRoles.stream().map(Sys_user_role::getUserId).toList();
+
+        //查询该单位下全部的用户
+        ProposalUndertake proposalUndertake = dao.fetch(ProposalUndertake.class, id);
+
+        Sql sql = Sqls.create("select id,username,loginname,unitname,concat(username,'(',loginname,')') label from vw_user $condition");
+        Cnd cnd = Cnd.NEW();
+        cnd.and("unitCode","=",proposalUndertake.getCode());
+        cnd.orEX("id","in",selectUserIds);
+        sql.setCondition(cnd);
+//        sql.setParam("unitCode", proposalUndertake.getCode());
+//        sql.setParam("selectUserIds", selectUserIds);
+        List<NutMap> allUsers = baseService.listMap(sql);
+
+        return Result.success(Map.of("allUsers", allUsers, "selectUserIds", selectUserIds));
+    }
+
+	@At
+	@SaCheckPermission("proposal.config.unit")
+	@Aop(TransAop.READ_COMMITTED)
+	@SLog(tag = "提案管理-承办单位管理", msg = "删除承办单位")
+	public Result delete(@Valid String id) {
+
+		// 删除承办单位表
+		dao.delete(ProposalUndertake.class, id);
+		// 删除角色表中有关
+		dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUnderTakeId, "=", id));
+
+		log.info("工号：{}, 姓名：{}, 删除了承办单位，Id等于：{}", SecurityUtil.getUserLoginname(), SecurityUtil.getUserUsername(), id);
+		return Result.success();
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/dashboard/ProposalDashboardController.java

@@ -0,0 +1,187 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.dashboard;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+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.flow.engine.model.ProcessModel;
+import com.budwk.app.flow.engine.model.TaskModel;
+import com.budwk.app.flow.entity.ProcessDefine;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.ProcessDefineService;
+import com.budwk.app.sys.models.Sys_dict;
+import com.budwk.app.sys.services.SysDictService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+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.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.ArrayList;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/dashboard")
+@Api("提案数据看板")
+@Ok("json:full")
+public class ProposalDashboardController {
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProcessDefineService processDefineService;
+    @Inject
+    private SysDictService sysDictService;
+    @Inject
+    private Dao dao;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/dashboard/index.html")
+    @SaCheckPermission("proposal.dashboard")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.dashboard")
+    public Result listNode(@Param("sessionId") String sessionId) {
+        List<NutMap> nodes = new ArrayList<>();
+
+        // 提案总数
+        nodes.add(NutMap.NEW().addv("name", "提案总数").addv("id", "total").addv("type", "total").addv("count", 0));
+
+        // 节点
+        ProcessDefine define = processDefineService.getLastByName("JDHTA");
+        ProcessModel processModel = processDefineService.processDefineToModel(define);
+        List<TaskModel> taskModels = processModel.getTasks();
+
+        List<String> excludeNodes = new ArrayList<>(3);
+        excludeNodes.add("撰写提案");
+        excludeNodes.add("邀请附议人");
+        excludeNodes.add("提案附议");
+
+        List<NutMap> taskNodes = taskModels.stream().filter(taskModel -> !excludeNodes.contains(taskModel.getDisplayName()))
+                .map(taskModel -> NutMap.NEW()
+                        .addv("name", taskModel.getDisplayName())
+                        .addv("id", taskModel.getName())
+                        .addv("type", "task")
+                        .addv("count", 0)
+                        .addv("todoCount", 0)
+                        .addv("doneCount", 0)
+                ).toList();
+        nodes.addAll(taskNodes);
+
+        // 立案结果
+        List<Sys_dict> caseFilingResult = sysDictService.getSubListByCode("PROPOSAL_CASE_FILING_RESULT");
+        for (Sys_dict dict : caseFilingResult) {
+            nodes.add(NutMap.NEW()
+                    .addv("name", dict.getName())
+                    .addv("id", dict.getCode())
+                    .addv("type", "caseFilingResult")
+                    .addv("count", 0));
+        }
+
+        // 查询待办任务
+        Sql todoSql = Sqls.create("""
+                SELECT
+                  t.taskName,
+                  t.taskState
+                FROM
+                  wf_process_task t
+                  INNER JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  INNER JOIN proposal_info info ON info.id = ins.businessNo
+                WHERE
+                  info.sessionId = @sessionId
+                """);
+        todoSql.setParam("sessionId", sessionId);
+        List<NutMap> todoTasks = processDefineService.listMap(todoSql);
+
+        for (NutMap node : nodes) {
+            if (node.getString("type").equals("task")) {
+                long todoCount = todoTasks.stream().filter(task -> task.getInt("taskState") == ProcessTaskStateEnum.DOING.getCode() && task.getString("taskName").equals(node.getString("id"))).count();
+                node.put("todoCount", todoCount);
+                long doneCount = todoTasks.stream().filter(task -> task.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode() && task.getString("taskName").equals(node.getString("id"))).count();
+                node.put("doneCount", doneCount);
+            } else if (node.getString("type").equals("total")) {
+                int count = dao.count(ProposalInfo.class, Cnd.where(ProposalInfo::getSessionId, "=", sessionId));
+                node.put("count", count);
+            } else if (node.getString("type").equals("caseFilingResult")) {
+                int count = dao.count(ProposalInfo.class, Cnd.where(ProposalInfo::getSessionId, "=", sessionId).and(ProposalInfo::getCaseFilingResult, "=", node.getString("id")));
+                node.put("count", count);
+            }
+        }
+
+        return Result.success(nodes);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.dashboard")
+    public Result pageData(PageForm pageForm, String sessionId, String selectNodeId, String selectNodeType, String selectNodeMode) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+                	LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id
+                	LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = @taskState
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("info.sessionId", "=", sessionId);
+        cnd.groupBy("info.id");
+
+        // 默认显示进行中的任务
+        sql.setParam("taskState", ProcessTaskStateEnum.DOING.getCode());
+
+        if (StrUtil.isNotBlank(selectNodeType) && StrUtil.isNotBlank(selectNodeId)) {
+            switch (selectNodeType) {
+                case "task":
+                    cnd.and("t.taskName", "=", selectNodeId);
+
+                    if (selectNodeMode.equals("todo")) {
+                        sql.setParam("taskState", ProcessTaskStateEnum.DOING.getCode());
+                    } else {
+                        sql.setParam("taskState", ProcessTaskStateEnum.FINISHED.getCode());
+                    }
+
+                    break;
+                case "total":
+                    break;
+                case "caseFilingResult":
+                    cnd.and("info.caseFilingResult", "=", selectNodeId);
+                    break;
+            }
+        }
+
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/dashboard/TeacherCongressDashBoardController.java

@@ -0,0 +1,64 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.dashboard;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.proposal.service.TeacherCongressDashBoardService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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 javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/teacherCongress/dashboard")
+@Slf4j
+@Ok("json:full")
+@Api("教代会数据看板")
+public class TeacherCongressDashBoardController {
+
+    @Inject
+    private TeacherCongressDashBoardService teacherCongressDashBoardService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/teachercongress/dashboard/index.html")
+    @SaCheckPermission("tc.dashboard")
+    public void index() {
+    }
+
+    //查询各代表团人数根据届次
+    @At
+    @SaCheckPermission("tc.dashboard")
+    public Result listDelegationCount(@Valid String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	tcd.id,
+                	tcd.name,
+                	COALESCE(tcdd.delegate_count, 0) AS delegateCount
+                FROM
+                	teacher_congress_delegation tcd
+                LEFT JOIN (
+                    SELECT
+                    	delegationId,
+                    	COUNT(*) AS delegate_count
+                    FROM
+                    	teacher_congress_delegate
+                    WHERE sessionId = @sessionId
+                    GROUP BY
+                    	delegationId
+                ) tcdd ON tcd.id = tcdd.delegationId
+                WHERE
+                	tcd.sessionId = @sessionId
+                ORDER BY tcd.code
+                """);
+        sql.setParam("sessionId", sessionId);
+        List<NutMap> list = teacherCongressDashBoardService.listMap(sql);
+        return Result.success(list);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/export/ProposalExportComprehensiveController.java

@@ -0,0 +1,131 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.export;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalExportService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/proposal/export/comprehensive")
+public class ProposalExportComprehensiveController {
+
+    @Inject
+    private ProposalExportService proposalExportService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/export/comprehensive/index.html")
+    @SaCheckPermission("proposal.export.comprehensive")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.query.comprehensive")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	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 proposal_reply_unit pru ON pru.proposalId = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if(StrUtil.isNotBlank(pageForm.getUnderTakeUnitId())){
+            cnd.andEX("pru.unitId", "=", pageForm.getUnderTakeUnitId());
+        }
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalExportService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @Ok("void")
+    @ApiOperation("导出汇总表excel")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void exportSummaryAsExcel(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm, HttpServletResponse response) {
+        proposalExportService.exportSummaryAsExcel(pageForm, response);
+    }
+
+
+    @At
+    @Ok("void")
+    @ApiOperation("导出提案立案汇总表excel")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void exportProposalRegisterSummaryAsExcel(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm, HttpServletResponse response) {
+        proposalExportService.exportProposalRegisterSummaryAsExcel(pageForm, response);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation("导出全部提案ZIP")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void exportAllProposalAsZip(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm, HttpServletResponse response) {
+        proposalExportService.exportProposalStatisticsAsZip(pageForm, response);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation("导出全部提案反馈表ZIP")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void exportAllProposalFeedBackAsZip(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm, HttpServletResponse response) {
+        proposalExportService.exportFeedBackAsZip(pageForm, response);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation("导出征集表ZIP")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void exportCollectZip(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm, HttpServletResponse response) {
+        proposalExportService.exportCollectZip(pageForm, response);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation("导出自定义表excel")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void exportCustomAsExcel(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm, @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalExportService.exportCustomAsExcel(pageForm, tableColumns, response);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/param/ProposalUnderTakeReplyTransferParam.java

@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel("提案承办单位答复转办参数")
+public class ProposalUnderTakeReplyTransferParam {
+
+    @ApiModelProperty("提案id")
+    @NotBlank(message = "提案id不能为空")
+    private String proposalId;
+
+    @ApiModelProperty("承办单位id")
+    @NotBlank(message = "承办单位id不能为空")
+    private String underTakeId;
+
+    @ApiModelProperty("流程实例id")
+    @NotBlank(message = "流程实例id不能为空")
+    private String processInstanceId;
+
+    @ApiModelProperty("流程实例任务id")
+    @NotBlank(message = "流程实例任务id不能为空")
+    private String processInstanceTaskId;
+
+    @ApiModelProperty("转办用户工号")
+    @NotBlank(message = "转办用户工号不能为空")
+    private String transferUserLoginName;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalPlagiarismCheckController.java

@@ -0,0 +1,124 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.TextSimilarityUtil;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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.ArrayList;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/query/plagiarismCheck")
+@Api(tags = "提案查重")
+@Ok("json:full")
+public class ProposalPlagiarismCheckController {
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/plagiarismCheck/index.html")
+    @SaCheckPermission("proposal.query.plagiarismCheck")
+    public void index() {
+    }
+
+    /**
+     * 查询
+     *
+     * @param keywords            关键字
+     * @param sessionId           会话id
+     * @param similarityThreshold 相似度阈值
+     * @param typeId              类型id
+     * @return
+     */
+    @At
+    @SaCheckPermission("proposal.query.plagiarismCheck")
+    @ApiOperation(value = "查询")
+    public Result query(String keywords, String sessionId, Integer similarityThreshold, @Param("matchScope") String[] matchScope, String typeId) {
+        // 1. 获取所有提案数据
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  COUNT(p.consolidationIds) > 0 AS isConsolidation,
+                  type.NAME AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.displayName curTaskName,
+                  JSON_UNQUOTE(JSON_EXTRACT(caseTasks.variable, '$.tf_hostUnitName')) AS masterUnitName,
+                  caseTasks.variable ->> '$.tf_helpUnitNameStr' AS slaveUnitNames
+                FROM
+                  proposal_info info
+                  LEFT JOIN proposal_consolidation p ON JSON_CONTAINS(p.consolidationIds, JSON_QUOTE(info.id))
+                  LEFT JOIN proposal_type type ON type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                  LEFT JOIN teacher_congress_delegate tcde ON tcde.loginName = info.createUserLoginName
+                  LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+                  LEFT JOIN (SELECT processInstanceId, MAX(finishTime) AS finishTime FROM wf_process_task WHERE taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND taskState = 20 GROUP BY processInstanceId) latestTasks ON latestTasks.processInstanceId = ins.id
+                  LEFT JOIN wf_process_task caseTasks ON caseTasks.processInstanceId = ins.id
+                  AND caseTasks.taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b'
+                  AND caseTasks.taskState = 20
+                  AND caseTasks.finishTime = latestTasks.finishTime
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id
+                  AND t.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.andEX("info.typeId", "=", typeId);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        List<NutMap> list = proposalCommonService.listMap(sql);
+
+        // 2. 进行查重分析
+        List<NutMap> plagiarismResults = new ArrayList<>();
+
+        for (NutMap proposal : list) {
+            // 计算相似度
+            double similarity = TextSimilarityUtil.calculateProposalSimilarity(proposal, keywords, matchScope);
+            System.out.println(similarity);
+
+            // 只返回相似度大于阈值的结果
+            if (similarity >= similarityThreshold) {
+                // 构建查重结果
+                NutMap result = new NutMap();
+                result.put("id", proposal.getString("id"));
+                result.put("title", proposal.getString("name")); // 提案标题
+                result.put("sessionName", proposal.getString("sessionName"));
+                result.put("typeName", proposal.getString("typeName"));
+                result.put("createUserName", proposal.getString("createUserName"));
+                result.put("createTime", proposal.getString("createTime"));
+                result.put("similarity", Math.round(similarity)); // 相似度百分比
+                result.put("similarContent", TextSimilarityUtil.extractSimilarContent(proposal, keywords));
+                result.put("delegationName", proposal.getString("delegationName"));
+                result.put("unitName", proposal.getString("unitName"));
+
+                plagiarismResults.add(result);
+            }
+        }
+
+        // 3. 按相似度降序排序
+        plagiarismResults.sort((a, b) -> Integer.compare(b.getInt("similarity"), a.getInt("similarity")));
+
+        return Result.success(plagiarismResults);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryChartController.java

@@ -0,0 +1,197 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.sys.models.Sys_dict;
+import com.budwk.app.sys.services.SysDictService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
+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.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/query/chart")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案类型统计")
+public class ProposalQueryChartController {
+
+    @Inject
+    private SysDictService sysDictService;
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/chart/index.html")
+    @SaCheckPermission("proposal.query.chart")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("提案类型统计")
+    @SaCheckPermission("proposal.query.chart")
+    public Result typeData(String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	concat(type.`name`,'(',type.code,')') AS typeName,
+                	count( info.id ) AS count
+                FROM
+                	proposal_type type
+                	LEFT JOIN proposal_info info ON info.typeId = type.id AND info.sessionId = @sessionId
+                GROUP BY
+                	type.id
+                ORDER BY
+                    type.code
+                """);
+        sql.setParam("sessionId", sessionId);
+        List<NutMap> list = sysDictService.listMap(sql);
+        return Result.success(list);
+    }
+
+
+    @At
+    @ApiOperation("提案立案统计")
+    @SaCheckPermission("proposal.query.chart")
+    public Result resultData(String sessionId) {
+        Sys_dict typeDict = sysDictService.fetch(Cnd.where(Sys_dict::getCode, "=", "PROPOSAL_CASE_FILING_RESULT"));
+        Sql sql = Sqls.create("""
+                SELECT
+                	d.`name`,
+                	count( info.id ) AS count
+                FROM
+                	sys_dict d
+                	LEFT JOIN proposal_info info ON info.caseFilingResult = d.`code`
+                	AND info.sessionId = @sessionId
+                WHERE
+                	d.parentId = @parentId
+                	and d.disabled = 0
+                GROUP BY
+                	d.id
+                ORDER BY
+                	d.location
+                """);
+        sql.setParam("sessionId", sessionId);
+        sql.setParam("parentId", typeDict.getId());
+        List<NutMap> list = sysDictService.listMap(sql);
+        return Result.success(list);
+    }
+
+    @At
+    @ApiOperation("提案满意度统计")
+    @SaCheckPermission("proposal.query.chart")
+    public Result feedBackScoreData(String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  t.taskName,
+                  t.variable
+                FROM
+                  proposal_info 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 = 20 and t.taskName='feedback'
+                  where ins.state=20 and info.sessionId=@sessionId
+                  GROUP BY info.id
+                """).setParam("sessionId", sessionId);
+        List<NutMap> list = proposalCommonService.listMap(sql);
+        List<Sys_dict> dicts = sysDictService.getSubListByCode("PROPOSAL_FEEDBACK");
+
+        List<NutMap> result = dicts.stream().map(v -> {
+            long count = list.stream().filter(v1 -> {
+                String variableStr = v1.getString("variable", "");
+
+                NutMap variable = Strings.isBlank(variableStr)
+                        ? new NutMap()
+                        : Json.fromJson(NutMap.class, variableStr);
+
+                String feedBackScore = variable.getString("tf_feedback", "");
+                return feedBackScore.equals(v.getCode());
+            }).count();
+
+            return NutMap.NEW().addv("name", v.getName()).addv("count", count);
+        }).toList();
+
+        return Result.success(result);
+    }
+
+    @At
+    @ApiOperation("提案状态统计")
+    @SaCheckPermission("proposal.query.chart")
+    public Result stateData(String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  content
+                FROM
+                  wf_process_design
+                WHERE
+                  NAME = 'JDHTA'
+                """);
+        sql.setCallback(Sqls.callback.map());
+        dao.execute(sql);
+        NutMap result = (NutMap) sql.getResult();
+        NutMap contentMap = Strings.isBlank(result.getString("content"))
+                ? new NutMap()
+                : Json.fromJson(NutMap.class, result.getString("content"));
+
+        List<NutMap> nodes = contentMap.getAsList("nodes", NutMap.class);
+
+
+        Sql sqlProposal = Sqls.create("""
+                SELECT
+                  t.taskName,
+                  ins.state instanceState,
+                  t.displayName curTaskName
+                FROM
+                  proposal_info 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
+                WHERE
+                  info.sessionId = @sessionId   and ins.state!=45
+                GROUP BY
+                  info.id
+                """).setParam("sessionId", sessionId);
+        List<NutMap> proposalList = proposalCommonService.listMap(sqlProposal);
+
+        nodes.forEach(n -> {
+            if (ObjectUtil.isNotEmpty(n.getString("text"))) {
+                NutMap nutMap = Json.fromJson(NutMap.class, n.getString("text"));
+                n.put("name", nutMap.getString("value"));
+                if (n.getString("id").equals("9940d441-dc44-4ad8-a548-858a8c71e48d")) {
+                    long count = proposalList.stream().filter(p -> StrUtil.isBlank(p.getString("taskName"))).count();
+                    n.put("count", count);
+                } else if (n.getString("id").equals("master_reply")) {
+                    long count = proposalList.stream().filter(p -> StrUtil.isNotBlank(p.getString("taskName")) && List.of("opinion_master_reply", "master_reply").contains(p.getString("taskName"))).count();
+                    n.put("count", count);
+                } else {
+                    long count = proposalList.stream().filter(p -> n.getString("id").equals(p.getString("taskName"))).count();
+                    n.put("count", count);
+                }
+
+            }
+        });
+        nodes.removeIf(v -> "开始".equals(v.getString("name")));
+        nodes.removeIf(v -> "opinion_master_reply".equals(v.getString("id")));
+
+
+        return Result.success(nodes);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryCollectProgressController.java

@@ -0,0 +1,130 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ArrayUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.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;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@IocBean
+@At("/platform/proposal/query/collectProgress")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "征集进度查询")
+public class ProposalQueryCollectProgressController {
+
+    static List<NutMap> states = new ArrayList<>() {{
+        add(NutMap.NEW().addv("code", 10).addv("id", 10).addv("name", "撰写提案"));
+        add(NutMap.NEW().addv("code", 20).addv("id", 20).addv("name", "附议提案"));
+        add(NutMap.NEW().addv("code", 30).addv("id", 30).addv("name", "待团长审核"));
+        add(NutMap.NEW().addv("code", 40).addv("id", 40).addv("name", "团长已审核"));
+    }};
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private Dao dao;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/collectProgress/index.html")
+    @SaCheckPermission("proposal.query.collectProgress")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.query.collectProgress")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.id,
+                	info.name,
+                	info.code,
+                	info.createUserName,
+                	type.NAME AS typeName,
+                	tcs.fullName AS sessionName,
+                	tcd.`name` AS delegationName,
+                	(SELECT count(1) FROM proposal_second WHERE proposalId = info.id) AS inviteCount,
+                    (SELECT count(1) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'second' AND taskState = 20) finishCount,
+                	ins.id AS instanceId,
+                    ins.state instanceState,
+                	t.displayName curTaskName
+                FROM
+                	proposal_info info
+                	LEFT JOIN proposal_type type ON type.id = info.typeId
+                	LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                	LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	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
+                """);
+        sql.setParam("sessionId", pageForm.getSessionId());
+        Cnd cnd = Cnd.NEW();
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        if (ArrayUtil.contains(pageForm.getCollectIds(), 10)) {
+            seg.or("t.taskName", "=", "startTask");
+        }
+        if (ArrayUtil.contains(pageForm.getCollectIds(), 20)) {
+            seg.or("t.taskName", "=", "second");
+        }
+        if (ArrayUtil.contains(pageForm.getCollectIds(), 30)) {
+            seg.or("t.taskName", "=", "delegation");
+        }
+        if (ArrayUtil.contains(pageForm.getCollectIds(), 40)) {
+            seg.or("t.taskName", "not in", List.of("startTask", "second", "delegation"));
+            seg.and("t.taskName", "is not", null);
+            seg.or("ins.state","=", ProcessInstanceStateEnum.FINISHED.getCode());
+        }
+        if (!seg.isEmpty()) {
+            cnd.and(seg);
+        }
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        List<NutMap> list = (List<NutMap>) pagination.getList();
+//        for (NutMap row : list) {
+//            int count = dao.count(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", row.getString("instanceId"))
+//                    .and(ProcessTask::getTaskName, "=", "second")
+//                    .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode())
+//            );
+//
+//
+//        }
+        return Result.success(pagination);
+    }
+
+    @At
+    @ApiOperation(value = "获取征集状态")
+    @SaCheckPermission("proposal.query.collectProgress")
+    public Result collectState() {
+        return Result.success(states);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryComprehensiveController.java

@@ -0,0 +1,133 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+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.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.Arrays;
+
+@IocBean
+@At("/platform/proposal/query/comprehensive")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案综合查询")
+public class ProposalQueryComprehensiveController {
+
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/comprehensive/index.html")
+    @SaCheckPermission("proposal.query.comprehensive")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.query.comprehensive")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	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 proposal_reply_unit pru ON pru.proposalId = info.id
+                	LEFT JOIN wf_process_task replyTask on replyTask.processInstanceId = ins.id AND replyTask.taskState = 20 AND replyTask.taskName in ('master_reply','slave_reply','opinion_master_reply')
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (ArrayUtil.isNotEmpty(pageForm.getOrigins()) && StrUtil.isNotBlank(pageForm.getCommonKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+
+            // 案名
+            if (ArrayUtil.contains(pageForm.getOrigins(), "name")) {
+                for (String keyword : pageForm.getCommonKeyword().split(" ")) {
+                    seg.orLike("info.name", keyword);
+                }
+            }
+
+            // 案由
+            if (ArrayUtil.contains(pageForm.getOrigins(), "brief")) {
+                for (String keyword : pageForm.getCommonKeyword().split(" ")) {
+                    seg.orLike("info.brief", keyword);
+                }
+            }
+
+            // 提案人
+            if (ArrayUtil.contains(pageForm.getOrigins(), "createUserName")) {
+                for (String keyword : pageForm.getCommonKeyword().split(" ")) {
+                    seg.orLike("info.createUserName", keyword);
+                    seg.orLike("info.createUserLoginName", keyword);
+                }
+            }
+
+            // 答复内容
+            if (ArrayUtil.contains(pageForm.getOrigins(), "answer")) {
+                for (String keyword : pageForm.getCommonKeyword().split(" ")) {
+                    seg.orLike("JSON_EXTRACT(replyTask.variable,'$.tf_opinion')", keyword);
+                }
+            }
+
+            if (!seg.isEmpty()) {
+                cnd.and(seg);
+            }
+        }
+
+        if (StrUtil.isNotBlank(pageForm.getUnderTakeUnitId())) {
+            cnd.andEX("pru.unitId", "=", pageForm.getUnderTakeUnitId());
+        }
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation(value = "导出单个提案word")
+    public void exportDocx(String id, HttpServletResponse response) {
+        proposalCommonService.exportProposalAsDocx(id, response);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryDelegationController.java

@@ -0,0 +1,110 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.sys.models.Sys_dict;
+import com.budwk.app.sys.services.SysDictService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@IocBean
+@At("/platform/proposal/query/delegation")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "代表团提案统计")
+public class ProposalQueryDelegationController {
+
+    @Inject
+    private BaseService baseService;
+
+    @Inject
+    private SysDictService sysDictService;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/delegation/index.html")
+    @SaCheckPermission("proposal.query.delegation")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("代表团提案统计")
+    @SaCheckPermission("proposal.query.delegation")
+    public Result pageData(String sessionId) {
+        List<Sys_dict> dictList = sysDictService.getSubListByCode("PROPOSAL_CASE_FILING_RESULT");
+        Sql sql = Sqls.create("""
+                SELECT
+                	dbt.id,
+                	dbt.`name` AS dbtName,
+                	(select count(1) from proposal_info info where info.delegationId = dbt.id and info.sessionId = dbt.sessionId ) as TOTAL,
+                	(select count(1) from proposal_info info where info.delegationId = dbt.id and info.sessionId = dbt.sessionId and info.isSubmit = 1 ) as SUBMIT_COUNT,
+                	$resultSql
+                FROM
+                	teacher_congress_delegation dbt
+                $condition
+                """);
+        String resultStr = dictList.stream().map(v -> {
+            return "( select count(1) from proposal_info info where info.delegationId = dbt.id and info.sessionId = dbt.sessionId and info.caseFilingResult= '%s' ) as `%s`".formatted(v.getCode(), v.getCode());
+        }).collect(Collectors.joining(","));
+        sql.setVar("resultSql", resultStr);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("dbt.sessionId", "=", sessionId);
+        if (!AuthUtil.hasRoleOr("SYSADMIN", "SCHOOL_UNION_ADMIN")) {
+        }
+        cnd.asc("dbt.`code`");
+        sql.setCondition(cnd);
+        return Result.success(baseService.listMap(sql));
+    }
+
+
+    @At
+    @ApiOperation("代表团提案列表")
+    @SaCheckPermission("proposal.query.delegation")
+    public Result getProposalsByDelegation(ProposalSearchParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	COUNT(p.consolidationIds) > 0 AS isConsolidation,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName
+                FROM
+                    proposal_info info
+                	LEFT JOIN proposal_consolidation p ON JSON_CONTAINS(p.consolidationIds, JSON_QUOTE(info.id))
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                    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();
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryHistoryController.java

@@ -0,0 +1,77 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/proposal/query/history")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案管理系统-查询统计-历史提案查询")
+public class ProposalQueryHistoryController {
+
+    @Inject
+    private BaseService baseService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/history/index.html")
+    @SaCheckPermission("proposal.query.history")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.query.history")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	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 proposal_reply_unit pru ON pru.proposalId = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryUnitReplyController.java

@@ -0,0 +1,134 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.util.FlowUtil;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalReplyUnit;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import lombok.extern.slf4j.Slf4j;
+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.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 java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 承办单位办理统计
+ */
+@IocBean
+@At("/platform/proposal/query/unitReply")
+@Slf4j
+@Ok("json:full")
+public class ProposalQueryUnitReplyController {
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/underTakeReply/index.html")
+    @SaCheckPermission("proposal.query.unitReply")
+    public void index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.query.unitReply")
+    public Result data(String sessionId, String undertakeUnitId) {
+        // 提案配置 协办是否需要答复
+        ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
+        boolean slaveNeedReply = proposalConfig.getSlaveUnitNeedReply();
+
+        // 当前届次所有的提案ID
+        Sql sql = Sqls.create("select id from proposal_info where sessionId = @sessionId").setParam("sessionId", sessionId);
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        List<String> proposalIds = sql.getList(String.class);
+
+        if(proposalIds.isEmpty()){
+            return Result.success().addData(Map.of("tableData", Collections.EMPTY_LIST, "slaveNeedReply", slaveNeedReply));
+        }
+
+
+        // 关联所有的实例ID
+        Sql instSql = Sqls.create("select id from wf_process_instance where businessNo in (@proposalIds)");
+        instSql.setParam("proposalIds", proposalIds);
+        instSql.setCallback(Sqls.callback.strList());
+        dao.execute(instSql);
+        List<String> instIds = instSql.getList(String.class);
+
+        // 提案委员会立案分配的承办单位
+        Cnd cnd = Cnd.where(ProposalReplyUnit::getProposalId, "in", proposalIds);
+        cnd.andEX(ProposalReplyUnit::getUnitId, "=", undertakeUnitId);
+        List<ProposalReplyUnit> replyUnits = dao.query(ProposalReplyUnit.class, cnd);
+
+        // 承办单位答复记录
+        List<ProcessTask> replyTasks = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "in", instIds).and(ProcessTask::getTaskName, "in", List.of("master_reply", "slave_reply", "opinion_master_reply")).and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.DOING.getCode())));
+
+        // 承办单位
+        List<NutMap> tableData = new ArrayList<>();
+
+        replyUnits.stream().collect(Collectors.groupingBy(ProposalReplyUnit::getUnitCode)).forEach((k, v) -> {
+            NutMap tableRow = NutMap.NEW();
+            tableRow.put("id", k);
+            v.stream().findAny().ifPresent(item -> {
+                tableRow.put("unitName", item.getUnitName());
+                tableRow.put("unitCode", item.getUnitCode());
+            });
+
+            // 提案总数
+            tableRow.put("sum", v.size());
+            // 主办提案数
+            tableRow.put("masterSum", v.stream().filter(unit -> Objects.equals(unit.getUnitCode(), k) && unit.getIsMaster()).count());
+            // 协办提案数
+            tableRow.put("slaveSum", v.stream().filter(unit -> Objects.equals(unit.getUnitCode(), k) && !unit.getIsMaster()).count());
+
+            // 主办提案已答复数
+            long masterReplySum = replyTasks.stream().filter(x ->
+                    FlowUtil.variableToNutMap(x.getVariable()).getString("underTakeId", "").equals(k)
+                            && FlowUtil.variableToNutMap(x.getVariable()).getBoolean("underTakeIsMaster")
+                            && x.getTaskState().equals(ProcessTaskStateEnum.FINISHED.getCode())
+            ).map(ProcessTask::getProcessInstanceId).distinct().count();
+
+            // 主办提案未答复数
+            long masterNoReplySum = replyTasks.stream().filter(x ->
+                    FlowUtil.variableToNutMap(x.getVariable()).getString("underTakeId", "").equals(k)
+                            && FlowUtil.variableToNutMap(x.getVariable()).getBoolean("underTakeIsMaster")
+                            && x.getTaskState().equals(ProcessTaskStateEnum.DOING.getCode())
+            ).map(ProcessTask::getProcessInstanceId).distinct().count();
+
+            // 协办提案已答复数
+            long slaveReplySum = replyTasks.stream().filter(x ->
+                    FlowUtil.variableToNutMap(x.getVariable()).getString("underTakeId", "").equals(k)
+                            && !FlowUtil.variableToNutMap(x.getVariable()).getBoolean("underTakeIsMaster")
+                            && x.getTaskState().equals(ProcessTaskStateEnum.FINISHED.getCode())
+            ).map(ProcessTask::getProcessInstanceId).distinct().count();
+
+            // 协办提案未答复数
+            long slaveNoReplySum = replyTasks.stream().filter(x ->
+                    FlowUtil.variableToNutMap(x.getVariable()).getString("underTakeId", "").equals(k)
+                            && !FlowUtil.variableToNutMap(x.getVariable()).getBoolean("underTakeIsMaster")
+                            && x.getTaskState().equals(ProcessTaskStateEnum.DOING.getCode())
+            ).map(ProcessTask::getProcessInstanceId).distinct().count();
+
+            tableRow.put("masterReplySum", masterReplySum);
+            tableRow.put("masterNoReplySum", masterNoReplySum);
+            tableRow.put("slaveReplySum", slaveReplySum);
+            tableRow.put("slaveNoReplySum", slaveNoReplySum);
+
+            tableData.add(tableRow);
+        });
+
+        return Result.success().addData(Map.of("tableData", tableData, "slaveNeedReply", slaveNeedReply));
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryYearReportController.java

@@ -0,0 +1,86 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/proposal/query/yearReport")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案年度报告")
+public class ProposalQueryYearReportController {
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/yearReport/index.html")
+    @SaCheckPermission("proposal.query.yearReport")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.query.yearReport")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	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 proposal_reply_unit pru ON pru.proposalId = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(),sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation(value = "导出年度报告")
+    public void exportYearReport(@Valid String sessionId, HttpServletResponse response) {
+        proposalCommonService.exportYearReport(sessionId, response);
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalUnderTakeSatisfactionController.java

@@ -0,0 +1,116 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.query;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.util.FlowUtil;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.sys.models.Sys_dict;
+import com.budwk.app.sys.services.SysDictService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalReplyUnit;
+import io.swagger.annotations.Api;
+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.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 java.util.*;
+import java.util.stream.Collectors;
+
+@IocBean
+@At("/platform/proposal/query/underTake/satisfaction")
+@Ok("json:full")
+@Api(tags = "提案承办单位满意度")
+public class ProposalUnderTakeSatisfactionController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private SysDictService sysDictService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/query/underTakeSatisfaction/index.html")
+    @SaCheckPermission("proposal.query.underTake.satisfaction")
+    public void index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.query.underTake.satisfaction")
+    public Result data(String sessionId, String undertakeUnitId) {
+        List<Sys_dict> feedbackCodes = sysDictService.getSubListByCode("PROPOSAL_FEEDBACK");
+
+        // 当前届次所有的提案ID
+        Sql sql = Sqls.create("select id from proposal_info where sessionId = @sessionId").setParam("sessionId", sessionId);
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        List<String> proposalIds = sql.getList(String.class);
+
+        if (proposalIds.isEmpty()) {
+            return Result.success(Collections.EMPTY_LIST);
+        }
+
+        // 关联所有的实例ID
+        Sql instSql = Sqls.create("select id from wf_process_instance where businessNo in (@proposalIds)");
+        instSql.setParam("proposalIds", proposalIds);
+        instSql.setCallback(Sqls.callback.strList());
+        dao.execute(instSql);
+        List<String> instIds = instSql.getList(String.class);
+
+        // 提案委员会立案分配的承办单位
+        Cnd cnd = Cnd.where(ProposalReplyUnit::getProposalId, "in", proposalIds);
+        cnd.andEX(ProposalReplyUnit::getUnitId, "=", undertakeUnitId);
+        List<ProposalReplyUnit> replyUnits = dao.query(ProposalReplyUnit.class, cnd);
+
+        // 反馈评分记录
+//        List<ProcessTask> feedbackTasks = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "in", instIds)
+//                .and(ProcessTask::getTaskName, "=", "feedback")
+//                .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode()));
+
+        // 承办单位
+        List<NutMap> tableData = new ArrayList<>();
+
+        replyUnits.stream().collect(Collectors.groupingBy(ProposalReplyUnit::getUnitCode)).forEach((k, v) -> {
+            NutMap tableRow = NutMap.NEW();
+            tableRow.put("id", k);
+            v.stream().findAny().ifPresent(item -> {
+                tableRow.put("unitName", item.getUnitName());
+                tableRow.put("unitCode", item.getUnitCode());
+            });
+
+            // 提案总数
+            tableRow.put("sum", v.size());
+            // 主办提案数
+            tableRow.put("masterSum", v.stream().filter(unit -> Objects.equals(unit.getUnitCode(), k) && unit.getIsMaster()).count());
+            // 协办提案数
+            tableRow.put("slaveSum", v.stream().filter(unit -> Objects.equals(unit.getUnitCode(), k) && !unit.getIsMaster()).count());
+
+            // 该单位负责的提案
+            List<String> thisUnitProposalIds = v.stream().map(ProposalReplyUnit::getProposalId).toList();
+            List<ProcessInstance> instances = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", thisUnitProposalIds));
+            List<Long> thisUnitInstIds = instances.stream().map(ProcessInstance::getId).toList();
+
+            // 反馈评分记录
+            List<ProcessTask> feedbackTasks = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "in", thisUnitInstIds)
+                    .and(ProcessTask::getTaskName, "=", "feedback")
+                    .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode()));
+
+            for (Sys_dict code : feedbackCodes) {
+                long count = feedbackTasks.stream().filter(task -> FlowUtil.variableToNutMap(task.getVariable()).getString("tf_feedback", "").equals(code.getCode())).map(ProcessTask::getProcessInstanceId).distinct().count();
+                tableRow.put(code.getCode(), count);
+            }
+            tableData.add(tableRow);
+        });
+
+        return Result.success(tableData);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java

@@ -0,0 +1,140 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.senior;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.bpm.models.BpmProcessTask;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.message.service.GlobalMessageSendService;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+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.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @ClassName ProposalExpeditingController
+ * @Author JyuHsin
+ * @Date 2025/9/23 9:38
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean
+@At("/platform/senior/expediting")
+@Ok("json:full")
+@Api(tags = "提案-高级管理-提案催办")
+public class ProposalExpeditingController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private ProposalCommonService proposalCommonService;
+	@Inject
+	private GlobalMessageSendService globalMessageSendService;
+
+	@At("")
+	@Ok("beetl:/platform/zhgh/democratic/proposal/senior/expediting/index.html")
+	@SaCheckPermission("proposal.senior.expediting")
+	public void index() {
+	}
+
+	@At
+	@SaCheckPermission("proposal.senior.expediting")
+	@ApiOperation("分页列表")
+	public Result pageData(@Valid ProposalSearchParam pageForm) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.taskName),'结束') curTaskKey,
+                    CASE WHEN t.taskState = 20 AND ( rt.id IS NULL OR rt.taskState = 10 ) THEN 1 ELSE 0 END AS canRevoke,
+                    t.variable->>'$.underTakeName' AS underTakeName,
+                    IF(JSON_EXTRACT(t.variable, '$.isMaster') = true, 1, 0) AS taskIsMaster,
+                    ta.actorName,
+                    ta.actorAccount
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
+
+		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+			cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+		}
+
+		cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+
+		ProposalSearchParam.buildSearch(cnd, pageForm);
+		cnd.groupBy("t.id");
+		cnd.desc("t.createdAt");
+		sql.setCondition(cnd);
+		Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pagination);
+	}
+
+	@At
+	@ApiOperation("提案催办")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission("proposal.senior.expediting")
+	@SLog(tag = "提案-高级管理", msg = "提案催办")
+	public Result submit(@Param(value = "taskIds") Long[] taskIds,
+						 @Param(value = "content") String content) {
+
+		for (Long taskId : taskIds) {
+
+			ProcessTask task = dao.fetch(ProcessTask.class, taskId);
+
+			List<ProcessTaskActor> taskActors = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+			List<String> list = taskActors.stream().map(ProcessTaskActor::getActorId).toList();
+
+			String message = "您有一条待办任务，" + content;
+			globalMessageSendService.sendMessage(task.getDisplayName(), message, 2, list, null);
+		}
+		return Result.success();
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorBasicController.java

@@ -0,0 +1,103 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.senior;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+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.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/senior/basic")
+@Ok("json:full")
+@Api(tags = "提案-高级管理-提案内容修改")
+public class ProposalSeniorBasicController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/senior/basic/index.html")
+    @SaCheckPermission("proposal.senior.basic")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.senior.basic")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                	LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id
+                	LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+                	LEFT JOIN (SELECT processInstanceId, MAX(finishTime) AS finishTime FROM wf_process_task WHERE taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND taskState = 20 GROUP BY processInstanceId) latestTasks ON latestTasks.processInstanceId = ins.id
+                	LEFT JOIN wf_process_task caseTasks ON caseTasks.processInstanceId = ins.id AND caseTasks.taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND caseTasks.taskState = 20 AND caseTasks.finishTime = latestTasks.finishTime
+                	LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.senior.basic")
+    @ApiOperation(value = "提案内容修改")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result update(@Valid @Param("info") ProposalInfo proposalInfo) {
+        int count = dao.count(ProposalInfo.class, Cnd.where("code", "=", proposalInfo.getCode()).and("id", "<>", proposalInfo.getId()));
+
+        if (count > 0) {
+            return Result.error("提案编号已存在");
+        }
+
+        dao.update(proposalInfo,"^code|name|typeId|brief|measures|excerpt|suggestUnits|files$");
+        return Result.success();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorDeleteController.java

@@ -0,0 +1,98 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.senior;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+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.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/senior/delete")
+@Ok("json:full")
+@Api(tags = "提案-高级管理-删除")
+public class ProposalSeniorDeleteController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private FlowEngine flowEngine;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/senior/delete/index.html")
+    @SaCheckPermission("proposal.senior.delete")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.senior.delete")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName
+                FROM
+                    proposal_info info
+                	LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	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 proposal_reply_unit pru ON pru.proposalId = info.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getUnderTakeUnitId())) {
+            cnd.andEX("pru.unitId", "=", pageForm.getUnderTakeUnitId());
+        }
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.senior.delete")
+    @ApiOperation(value = "删除提案")
+    @SLog(tag = "提案管理系统-高级管理-万能删除提案", msg = "删除提案")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result delete(String id) {
+        dao.clear(ProposalInfo.class, Cnd.where("id", "=", id));
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorFeedBackController.java

@@ -0,0 +1,136 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.senior;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.vo.ProcessTaskVO;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+@IocBean
+@At("/platform/senior/feedback")
+@Ok("json:full")
+@Api(tags = "提案-高级管理-反馈评分修改")
+public class ProposalSeniorFeedBackController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/senior/feedback/index.html")
+    @SaCheckPermission("proposal.senior.feedback")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.senior.feedback")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid @Param("pageForm") ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames,
+                    JSON_UNQUOTE(JSON_EXTRACT(latestFeedBack.variable, '$.tf_feedback')) AS tf_feedback
+                FROM
+                    proposal_info info
+                	LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id
+                	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 (
+                     SELECT
+                       processInstanceId,
+                       variable,
+                       ROW_NUMBER() OVER (PARTITION BY processInstanceId ORDER BY finishTime DESC) as rn
+                     FROM wf_process_task
+                     WHERE taskName = 'feedback'
+                   ) latestFeedBack ON latestFeedBack.processInstanceId = ins.id AND latestFeedBack.rn = 1
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+//        cnd.and("latestFeedBack.id","is not",null);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.senior.feedback")
+    @ApiOperation(value = "反馈信息")
+    public Result info(@Param("instanceId") String instanceId) {
+        List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", instanceId)
+                .and(ProcessTask::getTaskName, "=", "feedback")
+                .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode())
+        );
+
+        List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
+        for (ProcessTask doneTask : taskList) {
+            ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId());
+            doneTaskVos.add(taskVO);
+        }
+        return Result.success(doneTaskVos);
+    }
+
+    @At
+    @SaCheckPermission("proposal.senior.feedback")
+    @ApiOperation(value = "修改反馈信息")
+    @SLog(tag = "提案-高级管理-反馈评分修改", msg = "修改反馈信息")
+    public Result update(@Param("data")String data) {
+        List<NutMap> tasks = Json.fromJsonAsList(NutMap.class, data);
+        for (NutMap task : tasks) {
+            ProcessTask processTask = flowEngine.processTaskService().fetch(task.getInt("id"));
+            NutMap variable = Json.fromJson(NutMap.class, processTask.getVariable());
+            variable.setv(FlowConst.TASK_FORM_DATA_PREFIX+"feedback",task.getString("feedback"));
+            variable.setv(FlowConst.TASK_FORM_DATA_PREFIX+"opinion",task.getString("opinion"));
+            processTask.setVariable(Json.toJson(variable));
+            dao.update(processTask,"variable");
+        }
+        return Result.success();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorTypeController.java

@@ -0,0 +1,100 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.senior;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSeniorUpdateTypeParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+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.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/senior/type")
+@Ok("json:full")
+@Api(tags = "提案-高级管理-修改类型")
+public class ProposalSeniorTypeController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/senior/type/index.html")
+    @SaCheckPermission("proposal.senior.type")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.senior.type")
+    @ApiOperation(value = "分页列表")
+    public Result pageData(@Valid ProposalQueryComprehensiveParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames
+                FROM
+                    proposal_info info
+                	LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id
+                	LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+                	LEFT JOIN (SELECT processInstanceId, MAX(finishTime) AS finishTime FROM wf_process_task WHERE taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND taskState = 20 GROUP BY processInstanceId) latestTasks ON latestTasks.processInstanceId = ins.id
+                	LEFT JOIN wf_process_task caseTasks ON caseTasks.processInstanceId = ins.id AND caseTasks.taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND caseTasks.taskState = 20 AND caseTasks.finishTime = latestTasks.finishTime
+                	LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getUnderTakeUnitId())) {
+            cnd.andEX("pru.unitId", "=", pageForm.getUnderTakeUnitId());
+        }
+        ProposalQueryComprehensiveParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.senior.type")
+    @ApiOperation(value = "修改提案类型")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result update(@Valid ProposalSeniorUpdateTypeParam param) {
+        dao.update(ProposalInfo.class, Chain.make("typeId", param.getTypeId()),Cnd.where("id", "=", param.getId()));
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java

@@ -0,0 +1,114 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalCommissionerOpinion;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+@IocBean
+@At("/platform/proposal/commissioner")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案委员会委员查询")
+public class ProposalCommissionerController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/commissioner/index.html")
+    @SaCheckPermission("proposal.commissioner")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/commissioner/index.html")
+    @SaCheckPermission("proposal.commissioner")
+    public void h5Index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.commissioner")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  type.NAME AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.displayName taskName,
+                  (SELECT count(1) FROM proposal_commissioner_opinion WHERE proposalId = info.id AND caseFilingResult = 'CONFIRM_FILING') CONFIRM_FILING_COUNT,
+                  (SELECT count(1) FROM proposal_commissioner_opinion WHERE proposalId = info.id AND caseFilingResult = 'SUGGESTION') SUGGESTION_COUNT,
+                  (SELECT count(1) FROM proposal_commissioner_opinion WHERE proposalId = info.id AND caseFilingResult = 'NOT') NOT_COUNT,
+                  pco.id pcoId
+                FROM
+                  proposal_info info
+                  LEFT JOIN proposal_type type ON type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                  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 proposal_commissioner_opinion pco on pco.proposalId = info.id and pco.commissioner = @userId
+                $condition
+                """);
+        sql.setParam("userId", SecurityUtil.getUserId());
+
+        Cnd cnd = Cnd.NEW();
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.and("pco.id", approval ? "is not" : "is", null);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.commissioner")
+    @SLog(tag = "提案委员会委员意见", msg = "")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result doApproval(String proposalId, String opinion, String caseFilingResult, String caseFilingType) {
+        dao.clear(ProposalCommissionerOpinion.class, Cnd.where(ProposalCommissionerOpinion::getProposalId, "=", proposalId).and(ProposalCommissionerOpinion::getCommissioner, "=", SecurityUtil.getUserId()));
+
+        ProposalCommissionerOpinion commissionerOpinion = new ProposalCommissionerOpinion();
+        commissionerOpinion.setProposalId(proposalId);
+        commissionerOpinion.setCommissioner(SecurityUtil.getUserId());
+        commissionerOpinion.setOpinionText(opinion);
+        commissionerOpinion.setCaseFilingResult(caseFilingResult);
+        commissionerOpinion.setCaseFilingType(caseFilingType);
+        commissionerOpinion.setOpinionTime(new Date());
+        dao.insert(commissionerOpinion);
+
+        return Result.success();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java

@@ -0,0 +1,145 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.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.proposal.models.ProposalMerge;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.random.R;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/committeeFiling")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案委员会立案审核")
+public class ProposalCommitteeFilingController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommitteeFilingService proposalCommitteeFilingService;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html")
+    @SaCheckPermission("proposal.committeeFiling")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFiling")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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 OR (ins.state = 20 AND info.caseFilingResult = 'NOT'), 1, 0) AS canRevoke
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "committee");
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommitteeFilingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFiling")
+    @ApiOperation("并案审核")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result merge(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+
+        List<Integer> taskIds = (List<Integer>) args.get("processTaskIds");
+        List<String> proposalIds = (List<String>) args.get("proposalIds");
+
+        // 记录提案并案
+        dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "in", proposalIds));
+        String groupId = R.UU32();
+        List<ProposalMerge> merges = proposalIds.stream().map(proposalId -> {
+            ProposalMerge merge = new ProposalMerge();
+            merge.setProposalId(proposalId);
+            merge.setGroupId(groupId);
+            return merge;
+        }).toList();
+        dao.insert(merges);
+
+        for (Integer taskId : taskIds) {
+            Dict taskArgs = args.clone();
+            taskArgs.put(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+            flowCommonService.executeTask(taskArgs);
+        }
+
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingUnitController.java

@@ -0,0 +1,186 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
+import com.budwk.app.bpm.models.BpmProcessTask;
+import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalCommitteeFilingUnitApprovalParam;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService;
+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.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/committeeFilingUnit")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-确认承办单位")
+public class ProposalCommitteeFilingUnitController {
+
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private BpmService bpmService;
+    @Inject
+    private ProposalCommitteeFilingUnitService proposalCommitteeFilingUnitService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html")
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                	tcs.fullName AS sessionName,
+                	tcd.`name` AS delegationName,
+                	inst.id processInstanceId,
+                	inst.processInstanceNodeId,
+                	inst.processInstanceNodeName,
+                	inst.processInstanceTaskIds,
+                	inst.processInstanceStatus,
+                	task.id processInstanceTaskId,
+                	task.taskStatus processInstanceTaskStatus,
+                	COUNT(p.consolidationIds) > 0 AS isConsolidation,
+                	EXISTS (
+                         SELECT 1
+                         FROM bpm_process_task next_task
+                         WHERE next_task.prevTaskId = task.id
+                         AND next_task.taskStatus = 'COMPLETE'
+                   ) AS nextTaskIsComplete
+                FROM
+                	bpm_process_task task
+                	INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
+                	INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
+                	INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
+                	LEFT JOIN proposal_consolidation p ON JSON_CONTAINS(p.consolidationIds, JSON_QUOTE(info.id))
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                	LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                	LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                	LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE'
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
+        }
+        cnd.and("nd.nodeCode", "=", 70);
+        if (approval) {
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
+        } else {
+            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.and(new Static("""
+                NOT EXISTS(
+                    SELECT 1
+                    FROM bpm_process_task t2
+                    WHERE t2.processInstanceId = task.processInstanceId
+                    AND t2.processTaskNodeCode = task.processTaskNodeCode
+                    AND t2.createdOn > task.createdOn
+                )
+                """));
+        cnd.groupBy("info.id");
+        cnd.groupBy("task.id");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "委员会确认承办单位", msg = "委员会确认承办单位")
+    @ApiOperation("委员会确认承办单位")
+    public Result approval(@Valid @Param("approval") ProposalCommitteeFilingUnitApprovalParam approvalParam) {
+        proposalCommitteeFilingUnitService.approval(approvalParam);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "委员会确认承办单位", msg = "委员会确认承办单位撤回")
+    public Result revoke(@Valid String taskId) {
+        proposalCommitteeFilingUnitService.revoke(taskId);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @ApiOperation("查询立案的结果及承办单位")
+    public Result committeeFiling(@Valid String processInstanceId, @Valid String processInstanceTaskId) {
+        JSONObject newJson = new JSONObject();
+
+        BpmProcessTask caseUnitTask = proposalCommitteeFilingUnitService.dao().fetch(BpmProcessTask.class,
+                Cnd.where(BpmProcessTask::getId, "=", processInstanceTaskId)
+                        .and(BpmProcessTask::getProcessInstanceId, "=", processInstanceId)
+                        .and(BpmProcessTask::getProcessTaskNodeCode, "=", 70)
+                        .and(BpmProcessTask::getDelFlag, "=", 0)
+        );
+        if (ObjectUtil.isNotNull(caseUnitTask) && ObjectUtil.isNotEmpty(caseUnitTask.getExtVariable())) {
+            JSONObject jsonObject = caseUnitTask.getExtVariable();
+            newJson.set("caseFilingResult", jsonObject.get("caseFilingResult"));
+            newJson.set("hostUnitId", jsonObject.get("hostUnitId"));
+            newJson.set("helpUnitIds", jsonObject.getBeanList("helpUnitIds", String.class));
+            newJson.set("approvalOpinion", jsonObject.get("approvalOpinion"));
+            newJson.set("consolidationIds", jsonObject.getBeanList("consolidationIds", String.class));
+            return Result.success(newJson);
+        }
+
+        BpmProcessTask caseTask = proposalCommitteeFilingUnitService.dao().fetch(BpmProcessTask.class,
+                Cnd.where(BpmProcessTask::getProcessInstanceId, "=", processInstanceId)
+                        .and(BpmProcessTask::getDelFlag, "=", 0)
+                        .and(BpmProcessTask::getProcessTaskNodeCode, "=", 60)
+                        .desc(BpmProcessTask::getCreatedOn)
+        );
+        JSONObject jsonObject = caseTask.getExtVariable();
+        newJson.set("caseFilingResult", jsonObject.get("caseFilingResult"));
+        newJson.set("hostUnitId", jsonObject.get("hostUnitId"));
+        newJson.set("helpUnitIds", jsonObject.getBeanList("helpUnitIds", String.class));
+        newJson.set("approvalOpinion", jsonObject.get("approvalOpinion"));
+        newJson.set("consolidationIds", jsonObject.getBeanList("consolidationIds", String.class));
+        return Result.success(newJson);
+    }
+
+    @At
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @ApiOperation("查询承办单位")
+    public Result listUnderTake() {
+        List<ProposalUndertake> list = baseService.dao().query(ProposalUndertake.class, Cnd.NEW().asc(ProposalUndertake::getCode));
+        return Result.success(list);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java

@@ -0,0 +1,127 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
+import com.budwk.app.bpm.param.BpmTaskApprovalParam;
+import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalDelegationService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 团长审核
+ */
+@IocBean
+@At("/platform/proposal/delegation")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-团长审核")
+public class ProposalDelegationController {
+
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProposalDelegationService proposalDelegationService;
+    @Inject
+    private BpmService bpmService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/index.html")
+    @SaCheckPermission("proposal.delegation")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html")
+    @SaCheckPermission("proposal.delegation")
+    public void h5Index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.delegation")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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 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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "delegation");
+
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java

@@ -0,0 +1,130 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/feedbackEvaluation")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-反馈评分")
+public class ProposalFeedbackEvaluationController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/feedback/index.html")
+    @SaCheckPermission("proposal.feedbackEvaluation")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html")
+    @SaCheckPermission("proposal.feedbackEvaluation")
+    public void h5Index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.feedbackEvaluation")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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 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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "feedback");
+
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.feedbackEvaluation")
+    @ApiOperation("获取立案信息")
+    public Result caseInfo(@Param("instId") String instId) {
+        ProcessTask task = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", instId)
+                .and(ProcessTask::getTaskName, "=", "committee")
+                .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode())
+                .desc(ProcessTask::getCreatedAt)
+        );
+        JSONObject variable = JSONUtil.parseObj(task.getVariable());
+        return Result.success(variable);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalInviteController.java

@@ -0,0 +1,150 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+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.utils.PageUtil;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.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 javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/invite")
+@Ok("json:full")
+@Api("邀请附议人")
+public class ProposalInviteController {
+
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("/index")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/invite/index.html")
+    @SaCheckLogin
+    public void index() {
+
+    }
+
+    @At("/form")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/invite/form.html")
+    @SaCheckLogin
+    public void form() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.seconded")
+    @SaCheckLogin
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                 SELECT
+                  info.*,
+                  type.name AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariale,
+                  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 proposal_info info ON info.id = ins.businessNo
+                  LEFT JOIN proposal_type type on type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                  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", "=", "85b7b9bd-d706-48cb-99a1-ef1370fb1819");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        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.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.seconded")
+    @SaCheckLogin
+    @ApiOperation("查询附议人")
+    public Result listSeconder(@Valid PageForm pageForm, @Valid String proposalId, @Valid String sessionId,
+                               String delegationId, boolean isInvite){
+        Sql sql = Sqls.create("""
+                    SELECT
+                        t1.userId,
+                    	t1.loginName,
+                    	t1.userName,
+                    	t1.sex,
+                    	t1.unitName,
+                    	t1.unionName,
+                    	t2.NAME AS delegationName
+                    FROM
+                    	teacher_congress_delegate t1
+                    	LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
+                    $condition
+                    """);
+        Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId);
+        cnd.andEX("t1.delegationId", "=", delegationId);
+        cnd.and("t1.roleId","=","72e24b5b4c4f4e90a6641e6af8487e42");
+        cnd.and("t1.loginName", "!=", SecurityUtil.getUserLoginname());
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("t1.loginName", pageForm.getSearchKeyword());
+            seg.orLike("t1.userName", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java

@@ -0,0 +1,376 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.base.annotation.SLog;
+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.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.flow.service.ProcessTaskService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInviteSeconderVO;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalSecond;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.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.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@IocBean
+@At("/platform/proposal/mine")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案管理-我的提案")
+public class ProposalMineController {
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private ProcessTaskService processTaskService;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/mine/index.html")
+    @SaCheckPermission("proposal.mine")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/mine/index.html")
+    @SaCheckPermission("proposal.mine")
+    public void h5Index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result pageData(@Valid ProposalSearchParam pageForm, String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    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' AND taskState in (10,20)) AS startTaskId
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                    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.and("info.createdBy", "=", SecurityUtil.getUserId());
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result selectOne(@Valid String id) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    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' AND taskState in (10,20)) AS startTaskId
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                    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.and("info.id", "=", id);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        NutMap data = proposalCommonService.fetchMap(sql);
+        return Result.success(data);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案管理系统-我的提案", msg = "删除提案")
+    public Result delete(@Valid String id) {
+        dao.delete(ProposalInfo.class, id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    public Result detail(@Valid String id) {
+        ProposalInfo info = dao.fetch(ProposalInfo.class, id);
+        return Result.success(info);
+    }
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    @ApiOperation("查询可邀请的附议人")
+    public Result listSeconder(@Valid PageForm pageForm, @Valid String proposalId, @Valid String sessionId,
+                               String delegationId, boolean isInvite) {
+
+        // 查询已经邀请的附议人
+        List<ProposalSecond> seconds = dao.query(ProposalSecond.class, Cnd.where(ProposalSecond::getProposalId, "=", proposalId));
+
+
+//        // 查询已经邀请的附议人
+//        ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", proposalId));
+//
+//        // 查询最新一次的邀请附议人任务
+//        ProcessTask inviteTask = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+//                .and(ProcessTask::getTaskName, "=", "invite")
+//                .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
+//                .desc(ProcessTask::getCreatedAt));
+//
+//        List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+//                .and(ProcessTask::getTaskName, "=", "second")
+//                .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
+//                .and(ProcessTask::getId, ">", inviteTask.getId())
+//        );
+//
+//
+//        List<ProcessTaskActor> taskActors = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "in", taskList.stream().map(ProcessTask::getId).toList()));
+
+        Sql sql = Sqls.create("""
+                SELECT
+                	t1.loginName,
+                	t1.userName,
+                	t1.sex,
+                	t1.unitName,
+                	t1.unionName,
+                	t1.mobile,
+                	t2.NAME AS delegationName
+                FROM
+                	teacher_congress_delegate t1
+                	LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId);
+        cnd.andEX("t1.delegationId", "=", delegationId);
+        cnd.and("t1.roleId", "=", "72e24b5b4c4f4e90a6641e6af8487e42");
+        cnd.and("t1.loginName", "!=", SecurityUtil.getUserLoginname());
+
+        if (isInvite) {
+            cnd.and("t1.loginName", "in", seconds.stream().map(ProposalSecond::getLoginName).toList());
+        } else {
+            cnd.andEX("t1.loginName", "not in", seconds.stream().map(ProposalSecond::getLoginName).toList());
+        }
+
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("t1.loginName", pageForm.getSearchKeyword());
+            seg.orLike("t1.userName", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+        sql.setCondition(cnd);
+        Pagination<ProposalInviteSeconderVO> pagination = proposalCommonService.listPageVO(pageForm, sql, ProposalInviteSeconderVO.class);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案", msg = "邀请附议人")
+    public Result inviteSeconder(@Param("seconders") String[] seconders, @Valid String proposalId) {
+        // 查询已经邀请的附议人
+        ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", proposalId));
+
+        // 查询最新一次的邀请附议人任务
+        ProcessTask inviteTask = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+                .and(ProcessTask::getTaskName, "=", "invite")
+                .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
+                .desc(ProcessTask::getCreatedAt));
+
+        // 已完成附议的代表
+        /*List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+                .and(ProcessTask::getTaskName, "=", "second")
+                .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
+                .and(ProcessTask::getId, ">", inviteTask.getId())
+        );*/
+
+        List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+                .and(ProcessTask::getTaskName, "=", "second")
+                .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
+        );
+
+        List<ProcessTask> tasks = taskList.stream().filter(o -> {
+            Dict args = JSONUtil.toBean(o.getVariable(), Dict.class);
+            return Objects.equals(args.getInt("submitType"), ProcessSubmitTypeEnum.AGREE.getCode());
+        }).toList();
+
+        ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
+
+        if (tasks.size() + seconders.length < proposalConfig.getSeconderNum()) {
+            return Result.error("至少邀请" + proposalConfig.getSeconderNum() + "个附议人");
+        }
+
+
+        Sql sql = Sqls.create("""
+                SELECT
+                    t1.id,
+                    t1.userId,
+                	t1.loginName,
+                	t1.userName,
+                	t1.sex,
+                	t1.unitName,
+                	t1.unionName,
+                	t1.mobile,
+                	t2.NAME AS delegationName
+                FROM
+                	teacher_congress_delegate t1
+                	LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
+                $condition
+                """);
+        sql.setCondition(Cnd.where("t1.loginName", "in", seconders).groupBy("t1.loginName"));
+        List<NutMap> list = proposalCommonService.listMap(sql);
+        // 附议人ID
+        List<String> userIds = list.stream().map(item -> item.getString("userId")).toList();
+        // 获取正在执行的任务（邀请附议人||提案附议）
+        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(processInstance.getId(), null);
+
+        if (doingTaskList.stream().anyMatch(task -> task.getTaskName().equals("invite"))) {
+            // 完成邀请任务并添加附议人
+            for (ProcessTask task : doingTaskList) {
+                Dict args = Dict.create();
+                args.set(FlowConst.PROCESS_TASK_ID_KEY, task.getId());
+                args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.AGREE.getCode());
+                args.set(FlowConst.NEXT_NODE_OPERATOR, userIds);
+                args.set(FlowConst.TASK_FORM_DATA_PREFIX + "seconder", list);
+                flowCommonService.executeTask(args);
+            }
+        } else {
+            // 加签
+            processTaskService.addCandidateActor(doingTaskList.get(0).getId(), userIds);
+
+            NutMap variable = Json.fromJson(NutMap.class, inviteTask.getVariable());
+            List<NutMap> tfSeconders = variable.getAsList(FlowConst.TASK_FORM_DATA_PREFIX + "seconder", NutMap.class);
+            tfSeconders.addAll(list);
+            variable.put(FlowConst.TASK_FORM_DATA_PREFIX + "seconder", tfSeconders);
+            inviteTask.setVariable(Json.toJson(variable));
+            dao.update(inviteTask, "variable");
+        }
+
+        // 储存到提案附议表
+        List<ProposalSecond> secondeds = list.stream().map(item -> {
+            ProposalSecond seconded = new ProposalSecond();
+            seconded.setProposalId(proposalId);
+            seconded.setSeconderId(item.getString("userId"));
+            seconded.setUserName(item.getString("userName"));
+            seconded.setLoginName(item.getString("loginName"));
+            seconded.setUnitName(item.getString("unitName"));
+            seconded.setUnionName(item.getString("unionName"));
+            seconded.setDelegationName(item.getString("delegationName"));
+            seconded.setMobile(item.getString("mobile"));
+            seconded.setInviteTime(new Date());
+            return seconded;
+        }).toList();
+        dao.insert(secondeds);
+
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案", msg = "检查能否邀请邀请附议人")
+    public Result inviteCheck(@Valid String id) {
+        ProposalInfo info = dao.fetch(ProposalInfo.class, id);
+        String measures = HtmlUtil.cleanHtmlTag(StrUtil.nullToDefault(info.getMeasures(), ""));
+        String brief = HtmlUtil.cleanHtmlTag(StrUtil.nullToDefault(info.getBrief(), ""));
+
+        if (StrUtil.isBlank(info.getSessionId())
+                || StrUtil.isBlank(info.getDelegationId())
+                || StrUtil.isBlank(info.getName())
+                || StrUtil.isBlank(info.getBrief())
+                || StrUtil.isBlank(measures)
+                || StrUtil.isBlank(brief)
+        ) {
+            return Result.error("提案信息填写不完整，请填写完成后再邀请代表附议！");
+        }
+        return Result.success();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java

@@ -0,0 +1,168 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ObjectUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.vo.LabelValueVO;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.flow.service.ProcessTaskService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalSchoolLeaderApprovalService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/schoolLeaderApproval")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案分管领导审批")
+public class ProposalSchoolLeaderApprovalController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalSchoolLeaderApprovalService proposalSchoolLeaderApprovalService;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProcessTaskService processTaskService;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html")
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    public void index() {
+    }
+
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html")
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    public void h5Index() {
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+//        List<LabelValueVO> vos = processTaskService.jumpAbleTaskNameList(280L);
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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,
+                    GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')' ) AS auditUser
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "school_leader");
+
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @ApiOperation("获取主办单位")
+    public Result getHostUnitId(){
+
+        return Result.success();
+    }
+
+
+
+    @At
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @ApiOperation("执行任务")
+    public Result executeTask(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+        String proposalId = args.getStr("proposalId");
+
+        // 单条审核
+        List<String> mergeProposalIds = proposalCommonService.mergeProposal(proposalId);
+        if (ObjectUtil.isEmpty(mergeProposalIds)) {
+            flowCommonService.executeTask(args);
+            return Result.success();
+        }
+
+        // 并案审核
+        ProcessTask thisTask = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
+        List<ProcessTask> mergeTasks = processTaskService.getDoingTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName());
+        for (ProcessTask mergeTask : mergeTasks) {
+            Dict cloneArgs = args.clone();
+            cloneArgs.put(FlowConst.PROCESS_TASK_ID_KEY, mergeTask.getId());
+            flowCommonService.executeTask(cloneArgs);
+        }
+        return Result.success();
+    }
+
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java

@@ -0,0 +1,125 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalSecondedService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+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.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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 附议提案
+ */
+@IocBean
+@At("/platform/proposal/seconded")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案管理系统-提案附议")
+public class ProposalSecondedController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private BpmService bpmService;
+    @Inject
+    private ProposalSecondedService proposalSecondedService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/index.html")
+    @SaCheckPermission("proposal.seconded")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/index.html")
+    @SaCheckPermission("proposal.seconded")
+    public void h5Index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.seconded")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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,
+                    ta.actorName taskActorName,
+                    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 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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "second");
+
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        List<NutMap> list = pagination.getList(NutMap.class);
+        for (NutMap row : list) {
+//            String instanceId = row.getString("instanceId");
+        }
+        return Result.success(pagination);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReadController.java

@@ -0,0 +1,168 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
+import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalUnderTakeReadApprovalParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalUnderTakeReadService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@IocBean
+@At("/platform/proposal/unitRead")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案承办单位初步阅览")
+public class ProposalUnderTakeReadController {
+
+    @Inject
+    private BaseService baseService;
+    @Inject
+    private BpmService bpmService;
+    @Inject
+    private ProposalUnderTakeReadService proposalUnderTakeReadService;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private SysRoleService sysRoleService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/unitRead/index.html")
+    @SaCheckPermission("proposal.unitRead")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.unitRead")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval, boolean transfer) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    inst.id processInstanceId,
+                    inst.processInstanceNodeId,
+                    inst.processInstanceNodeName,
+                    inst.processInstanceTaskIds,
+                    inst.processInstanceStatus,
+                    task.id processInstanceTaskId,
+                    task.taskStatus processInstanceTaskStatus,
+                    task.extVariable,
+                    JSON_EXTRACT(unit_data.data, '$.isMaster') AS isMasterUnderTake,
+                    JSON_UNQUOTE(JSON_EXTRACT(unit_data.data, '$.underTakeName')) AS underTakeName,
+                    JSON_UNQUOTE(JSON_EXTRACT(unit_data.data, '$.underTakeId')) AS underTakeId,
+                    COUNT(p.consolidationIds) > 0 AS isConsolidation,
+                    EXISTS (
+                        SELECT 1
+                        FROM bpm_process_task next_task
+                        WHERE next_task.prevTaskId = task.id
+                        AND next_task.taskStatus = 'COMPLETE'
+                    ) AS nextTaskIsComplete
+                FROM
+                    bpm_process_task task
+                    INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
+                    INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
+                    INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
+                    LEFT JOIN proposal_consolidation p ON JSON_CONTAINS(p.consolidationIds, JSON_QUOTE(info.id))
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId,
+                    JSON_TABLE(
+                        JSON_EXTRACT(task.extVariable, '$.units'),
+                            '$[*]' COLUMNS (
+                                data JSON PATH '$'
+                            )
+                        ) unit_data
+                $condition
+                """);
+
+        boolean isSysAdmin = AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),RoleConstant.SCHOOL_UNION_PROPOSAL_ADMIN.name());
+        Set<String> unitIds = new HashSet<>();
+        String unitIdsStr = "''";
+
+        if (!isSysAdmin) {
+            Sys_role role = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER.name());
+            List<Sys_user_role> userRoles = proposalCommonService.dao().query(Sys_user_role.class,
+                    Cnd.where(Sys_user_role::getUserId, "=", SecurityUtil.getUserId())
+                            .and(Sys_user_role::getRoleId, "=", role.getId())
+            );
+            unitIds = userRoles.stream().map(Sys_user_role::getUnderTakeId).collect(Collectors.toSet());
+            unitIdsStr = unitIds.stream()
+                    .map(id -> "'" + id + "'")
+                    .collect(Collectors.joining(","));
+        }
+
+        Cnd cnd = Cnd.NEW();
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        seg.or(isSysAdmin ? "1" : "0", "=", 1);
+        seg.or(new Static("JSON_UNQUOTE(JSON_EXTRACT(unit_data.data, '$.underTakeId')) IN (%s)".formatted(unitIdsStr)));
+        cnd.and(seg);
+
+        cnd.and("nd.nodeCode", "=", 60);
+        cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
+
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id","task.id","JSON_EXTRACT( unit_data.DATA, '$.underTakeId' )");
+//        cnd.groupBy("task.id");
+//        cnd.groupBy("JSON_EXTRACT( unit_data.DATA, '$.underTakeId' ) ");
+        sql.setCondition(cnd);
+        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.unitRead")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案承办单位初步阅览", msg = "承办单位阅览")
+    @ApiOperation("承办单位阅览")
+    public Result approval(@Param("approval") @Valid ProposalUnderTakeReadApprovalParam param) {
+//        proposalUnderTakeReadService.approval(param);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("proposal.unitRead")
+    @Aop(TransAop.READ_COMMITTED)
+    @SLog(tag = "提案承办单位初步阅览", msg = "承办单位阅览撤回")
+    @ApiOperation("撤回")
+    public Result revoke(@Valid String taskId) {
+//        proposalUnderTakeReadService.revokeTask(taskId);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java

@@ -0,0 +1,238 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ObjectUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.flow.service.ProcessTaskService;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.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.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Stream;
+
+@IocBean
+@At("/platform/proposal/unitReply")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案承办单位答复")
+public class ProposalUnderTakeReplyController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private FlowCommonService flowCommonService;
+    @Inject
+    private ProcessTaskService processTaskService;
+    @Inject
+    private SysRoleService sysRoleService;
+    @Inject
+    private SysUserService sysUserService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/unitReply/index.html")
+    @SaCheckPermission("proposal.unitReply")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html")
+    @SaCheckPermission("proposal.unitReply")
+    public void h5Index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.unitReply")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval, boolean transfer) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                	IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                	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,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.taskName),'结束') curTaskKey,
+                    CASE WHEN t.taskState = 20 AND ( rt.id IS NULL OR rt.taskState = 10 ) THEN 1 ELSE 0 END AS canRevoke,
+                    t.variable->>'$.underTakeName' AS underTakeName,
+                    IF(JSON_EXTRACT(t.variable, '$.underTakeIsMaster') = true, 1, 0) AS underTakeIsMaster,
+                    t.variable->>'$.tf_transferUserId' AS tf_transferUserId,
+                    transferUser.username AS transferUserName,
+                    GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')' ) AS auditUser
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    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
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                    LEFT JOIN sys_user transferUser on transferUser.id = t.variable->>'$.tf_transferUserId'
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
+
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.TRANSFER.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+
+        List<NutMap> list = pagination.getList();
+        for (NutMap row : list) {
+            if (row.getInt("taskIsMaster") == 1) {
+                boolean b = Stream.of("master_reply", "slave_reply", "school_leader")
+                        .anyMatch(a -> row.getString("curTaskKey").contains(a));
+                row.setv("canRevoke", b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
+            } else {
+                boolean b = Stream.of("master_reply", "slave_reply").anyMatch(a -> row.getString("curTaskKey").contains(a));
+                row.setv("canRevoke", b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
+            }
+        }
+        pagination.setList(list);
+
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("proposal.unitReply")
+    @ApiOperation("执行任务")
+    public Result executeTask(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+        String proposalId = args.getStr("proposalId");
+
+        // 查询是否提案
+
+        // 单条审核
+        List<String> mergeProposalIds = proposalCommonService.mergeProposal(proposalId);
+        if (ObjectUtil.isEmpty(mergeProposalIds)) {
+            flowCommonService.executeTask(args);
+            return Result.success();
+        }
+
+        // 并案审核
+        ProcessTask thisTask = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
+        List<ProcessTask> mergeTasks = processTaskService.getDoingTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName());
+        for (ProcessTask mergeTask : mergeTasks) {
+            Dict cloneArgs = args.clone();
+            cloneArgs.put(FlowConst.PROCESS_TASK_ID_KEY, mergeTask.getId());
+            flowCommonService.executeTask(cloneArgs);
+        }
+        return Result.success();
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.unitReply")
+    @ApiOperation("查询本单位可转办用户")
+    public Result selectViceUser(@Param("keyword") @Valid String keyword) {
+        Sql sql = Sqls.create("select id,loginname,username from vw_user $condition");
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("unitId", "=", SecurityUtil.getUnitId());
+        cnd.andEX("id", "!=", SecurityUtil.getUserId());
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        seg.orLike("username", keyword);
+        seg.orLike("loginname", keyword);
+        cnd.and(seg);
+        sql.setCondition(cnd);
+
+        sql.setParam("unitId", SecurityUtil.getUnitId());
+        sql.setParam("userId", SecurityUtil.getUserId());
+        Pagination pagination = proposalCommonService.listPageMap(1, 10, sql);
+        return Result.success(pagination.getList());
+    }
+
+    @At
+    @SaCheckPermission("proposal.unitReply")
+    @ApiOperation("转办")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result transfer(@Param("taskId") @Valid Long taskId, @Param("proposalId") String proposalId, @Param("userId") @Valid String userId) {
+        // 此处设置转办用户的角色即可
+        Sys_role proxyRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_PROXY);
+        int count = sysRoleService.dao().count(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", userId).and(Sys_user_role::getRoleId, "=", proxyRole.getId()));
+        if (count == 0) {
+            // 添加转办用户的角色
+            Sys_user_role userRole = new Sys_user_role();
+            userRole.setUserId(userId);
+            userRole.setRoleId(proxyRole.getId());
+            sysRoleService.insert(userRole);
+            sysUserService.clearCache();
+            sysRoleService.clearCache();
+        }
+
+        // 查询是否并案
+        List<String> mergeProposalIds = proposalCommonService.mergeProposal(proposalId);
+        if (ObjectUtil.isEmpty(mergeProposalIds)) {
+            processTaskService.transfer(taskId, userId);
+            return Result.success();
+        }
+
+        ProcessTask thisTask = dao.fetch(ProcessTask.class, taskId);
+        List<ProcessTask> mergeTasks = processTaskService.getDoingTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName());
+        for (ProcessTask mergeTask : mergeTasks) {
+            processTaskService.transfer(mergeTask.getId(), userId);
+        }
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUndertakeSuggestionController.java

@@ -0,0 +1,150 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertakeSuggestion;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @ClassName ProposalUndertakeSuggestionController
+ * @Author JyuHsin
+ * @Date 2025/10/16 16:34
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean
+@At("/platform/proposal/suggestion")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-承办单位提出意见")
+public class ProposalUndertakeSuggestionController {
+
+	@Inject
+	private ProposalCommonService proposalCommonService;
+
+	@At("")
+	@Ok("beetl:/platform/zhgh/democratic/proposal/transact/suggestion/index.html")
+	@SaCheckPermission("proposal.suggestion")
+	public void index() {
+	}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/suggestion/index.html")
+	@SaCheckPermission("h5.proposal.suggestion")
+	public void h5Index() {
+	}
+
+	@At
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	@ApiOperation("分页列表")
+	public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.state instanceState,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName), '结束') curTaskName,
+                    (select count(1) from proposal_undertake_suggestion where proposalId = info.id $unitId) as count
+                FROM
+                	wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and("t.taskState", "=", 10);
+		cnd.and("t.taskName", "=", "committee");
+
+		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+			// 查询当前登录用户负责的承办单位
+			ProposalUndertake undertake = proposalCommonService.getSelfManageUndertake();
+			cnd.and(new Static("JSON_CONTAINS(suggestUnits, JSON_QUOTE('" + undertake.getName() + "'))"));
+			sql.setVar("unitId", " and unitId = '%s'".formatted(undertake.getId()));
+		}
+
+		ProposalSearchParam.buildSearch(cnd, pageForm);
+		cnd.groupBy("t.id");
+
+		cnd.having(Cnd.where("count", approval ? ">" : "=", 0));
+		cnd.desc("t.createdAt");
+		sql.setCondition(cnd);
+		Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pagination);
+	}
+
+	@At
+	@ApiOperation("承办单位提出意见")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	@SLog(tag = "提案系统-承办单位意见", msg = "提出意见")
+	public Result suggest(ProposalUndertakeSuggestion suggestion) {
+		suggestion.setUserId(SecurityUtil.getUserId());
+		suggestion.setUserName(SecurityUtil.getUserUsername());
+		suggestion.setTime(DateUtil.now());
+
+		ProposalUndertake undertake = proposalCommonService.getSelfManageUndertake();
+
+		suggestion.setUnitId(Objects.requireNonNullElse(undertake.getId(), ""));
+		suggestion.setUnitName(Objects.requireNonNullElse(undertake.getName(), ""));
+		proposalCommonService.dao().insert(suggestion);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("承办单位提出意见")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	@SLog(tag = "提案系统-承办单位意见", msg = "删除意见")
+	public Result delete(String id) {
+		proposalCommonService.dao().delete(ProposalUndertakeSuggestion.class, id);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("查询意见")
+	@SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR)
+	public Result selectSuggestion(String proposalId) {
+		Cnd cnd = Cnd.NEW();
+		cnd.and(ProposalUndertakeSuggestion::getProposalId, "=", proposalId);
+		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+			cnd.and(ProposalUndertakeSuggestion::getUnitId, "=", proposalCommonService.getSelfManageUndertake().getId());
+		}
+		cnd.desc(ProposalUndertakeSuggestion::getTime);
+		List<ProposalUndertakeSuggestion> list = proposalCommonService.dao().query(ProposalUndertakeSuggestion.class, cnd);
+		return Result.success(list);
+	}
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalViceDelegationController.java

@@ -0,0 +1,90 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+
+@IocBean
+@At("/platform/proposal/vice/delegation")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案-办理-副团长查阅")
+public class ProposalViceDelegationController {
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/viceDelegation/index.html")
+    @SaCheckPermission("proposal.vice.delegation")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/viceDelegation/index.html")
+    @SaCheckPermission("proposal.vice.delegation")
+    public void h5Index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.vice.delegation")
+    @ApiOperation("分页列表")
+    public Result pageData(@Valid ProposalSearchParam pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  type.NAME AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  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
+                FROM
+                  proposal_info info
+                  LEFT JOIN proposal_type type ON type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id\s
+                  AND t.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+            cnd.and("info.delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java

@@ -0,0 +1,163 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.models.Sys_dict;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
+import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
+import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session;
+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.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 提案撰写
+ */
+@IocBean
+@At("/platform/proposal/write")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案管理-提案撰写")
+public class ProposalWriteController {
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProposalWriteService proposalWriteService;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/write/index.html")
+    @SaCheckPermission("proposal.write")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/write/index.html")
+    @SaCheckPermission("proposal.write")
+    public void h5Index(){
+
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("保存提案")
+    @SLog(tag = "提案管理系统-我的提案", msg = "保存提案")
+    public Result save(@Param("info") ProposalInfo proposalInfo) {
+        if (StrUtil.isBlank(proposalInfo.getCode())) {
+            proposalInfo.setCode(proposalWriteService.generateProposalCode(proposalInfo.getSessionId(), proposalInfo.getDelegationId()));
+        }
+        dao.insertOrUpdate(proposalInfo);
+        return Result.success(proposalInfo);
+    }
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("提交提案")
+    @SLog(tag = "提案管理系统-我的提案", msg = "提交提案")
+    public Result submit(@Param("info") ProposalInfo proposalInfo) {
+        if (StrUtil.isBlank(proposalInfo.getCode())) {
+            proposalInfo.setCode(proposalWriteService.generateProposalCode(proposalInfo.getSessionId(), proposalInfo.getDelegationId()));
+        }
+        dao.insertOrUpdate(proposalInfo);
+
+        // 开启流程实例
+        Dict args = Dict.create();
+        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+        args.set(FlowConst.FORM_DATA, proposalInfo);
+        args.set(FlowConst.TASK_FORM_DATA_PREFIX + "source", proposalInfo.getSource());
+
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JDHTA_NC", proposalInfo.getId(), SecurityUtil.getUserId(), args);
+
+        // 自动完成第一个申请任务
+        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+        for (ProcessTask task : doingTaskList) {
+            flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+        }
+
+        return Result.success(proposalInfo);
+    }
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("重新提交提案")
+    @SLog(tag = "提案管理系统-我的提案", msg = "重新提交提案")
+    public Result submitAgain(@Param("info") ProposalInfo proposalInfo, @Param("taskId") Long taskId) {
+        dao.insertOrUpdate(proposalInfo);
+
+        Dict dict = Dict.create();
+        dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+        dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+        dict.set(FlowConst.TASK_FORM_DATA_PREFIX + "source", proposalInfo.getSource());
+
+        flowCommonService.executeTask(dict);
+        return Result.success();
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @ApiOperation("提案详情")
+    public Result detail(@Valid String id) {
+        ProposalInfo info = dao.fetch(ProposalInfo.class, id);
+        return Result.success(info);
+    }
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @ApiOperation("查询自己所属代表团")
+    public Result searchMineDelegation(@Valid String sessionId) {
+        Teacher_congress_delegate delegate = dao.fetch(Teacher_congress_delegate.class,
+                Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId)
+                        .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId())
+        );
+        return Result.success().addData(delegate != null ? delegate.getDelegationId() : null);
+    }
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @ApiOperation("查询自己可撰写的提案方式（个人、代表团、委员会）")
+    public Result listSource(@Valid String sessionId) {
+        List<Sys_dict> sysDicts = proposalWriteService.listSource(sessionId);
+        return Result.success().addData(sysDicts);
+    }
+
+    @At
+    @SaCheckPermission("proposal.write")
+    @ApiOperation("检查提案撰写时间")
+    public Result checkWriteTime(@Valid String sessionId) {
+        Teacher_congress_session session = dao.fetch(Teacher_congress_session.class, sessionId);
+        boolean flag = session.getCollectStartTime().getTime() < System.currentTimeMillis() && System.currentTimeMillis() < session.getCollectEndTime().getTime();
+        return Result.success().addData(flag);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/view/ProposalViewController.java

@@ -0,0 +1,37 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.view;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import io.swagger.annotations.Api;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+@IocBean
+@At("/platform/proposal/view")
+@Ok("json:full")
+@Api("提案查看")
+public class ProposalViewController {
+
+    @Inject
+    private Dao dao;
+
+    @At("/index")
+    @SaCheckLogin
+    @Ok("beetl:/platform/zhgh/democratic/proposal/view/index.html")
+    public void index(){
+
+    }
+
+    @At("/info")
+    @SaCheckLogin
+    public Result info(String id) {
+        ProposalInfo info = dao.fetch(ProposalInfo.class, id);
+        return Result.success(info);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/vo/ProposalInfoPageVO.java

@@ -0,0 +1,124 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.vo;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.bpm.vo.BpmTaskApprovalVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProposalInfoPageVO extends BpmTaskApprovalVo {
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("提案编号")
+    private String code;
+
+    @ApiModelProperty("提案名称")
+    private String name;
+
+    @ApiModelProperty("提案类型")
+    private int typeId;
+
+    @ApiModelProperty("提案来源")
+    private String source;
+
+    @ApiModelProperty("立案结果（字典表）")
+    private String caseFilingResult;
+
+    @ApiModelProperty("届次")
+    private String sessionId;
+
+    @ApiModelProperty("创建人")
+    private String createUserId;
+
+    @ApiModelProperty("创建人姓名")
+    private String createUserName;
+
+    @ApiModelProperty("创建人工号")
+    private String createUserLoginName;
+
+    @ApiModelProperty("所属代表团ID")
+    private String delegationId;
+
+    @ApiModelProperty("所属委员会ID")
+    private String committeeId;
+
+    @ApiModelProperty("是否提交")
+    private boolean isSubmit;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("案由")
+    private String brief;
+
+    @ApiModelProperty("建议措施")
+    private String measures;
+
+    @ApiModelProperty("摘要")
+    private String excerpt;
+
+    @ApiModelProperty("建议落实部门")
+    private String implementUnitName;
+
+    @ApiModelProperty("提案状态")
+    private String stateCode;
+
+    @ApiModelProperty("附件")
+    private List<JSONObject> files;
+
+    @ApiModelProperty("是否公示提案")
+    private boolean publicity;
+
+    @ApiModelProperty("是否优秀提案")
+    private boolean excellent;
+
+    @ApiModelProperty("签字")
+    private String signature;
+
+    @ApiModelProperty("附议人姓名")
+    private String seconderName;
+
+    @ApiModelProperty("提案类型名称")
+    private String typeName;
+
+    @ApiModelProperty("届次")
+    private String sessionName;
+
+    @ApiModelProperty("代表团")
+    private String delegationName;
+
+    @ApiModelProperty("办理数据")
+    private JSONObject extVariable;
+
+    @ApiModelProperty("是否是主办承办单位")
+    private boolean isMasterUnderTake;
+
+    @ApiModelProperty("承办单位ID")
+    private String underTakeId;
+
+    @ApiModelProperty("承办单位")
+    private String underTakeName;
+
+    @ApiModelProperty("是否并案")
+    private boolean isConsolidation;
+
+    @ApiModelProperty("主办承办单位")
+    private String masterUnitName;
+
+    @ApiModelProperty("协办承办单位")
+    private String[] slaveUnitNames;
+
+    @ApiModelProperty("承办单位答复是否转办")
+    private boolean underTakeReplyIsTransfer;
+
+    @ApiModelProperty("承办单位答复转办答复人")
+    private String[] underTakeTransferUserName;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/vo/ProposalInfoVO.java

@@ -0,0 +1,73 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.vo;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProposalInfoVO extends ProposalInfo {
+
+    @ApiModelProperty("流程实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty("流程实例当前节点ID")
+    private String processInstanceNodeId;
+
+    @ApiModelProperty("流程实例当前节点名称")
+    private String processInstanceNodeName;
+
+    @ApiModelProperty("流程实例任务IDS")
+    private List<String> processInstanceTaskIds;
+
+    @ApiModelProperty("流程实例任务ID")
+    private String processInstanceTaskId;
+
+    @ApiModelProperty("流程实例任务状态")
+    private String processInstanceTaskStatus;
+
+    @ApiModelProperty("流程状态")
+    private String processInstanceStatus;
+
+    @ApiModelProperty("当前节点任务类型")
+    private String processInstanceTaskNodeType;
+
+    @ApiModelProperty("下一节点任务是否完成")
+    private Boolean nextTaskIsComplete;
+
+    @ApiModelProperty("审批参数")
+    private JSONObject approvalParam;
+
+    public JSONObject getApprovalParam() {
+        JSONObject object = new JSONObject();
+        object.set("processInstanceBusinessId",this.getId());
+        object.set("processInstanceId",this.getProcessInstanceId());
+        object.set("processInstanceNodeId",this.getProcessInstanceNodeId());
+        object.set("processInstanceNodeName",this.getProcessInstanceNodeName());
+        object.set("processInstanceTaskIds",this.getProcessInstanceTaskIds());
+        object.set("processInstanceTaskId",this.getProcessInstanceTaskId());
+        object.set("processInstanceTaskNodeType",this.getProcessInstanceTaskNodeType());
+        return object;
+    }
+
+    @ApiModelProperty("提案类型名称")
+    private String typeName;
+
+    @ApiModelProperty("届次")
+    private String sessionName;
+
+    @ApiModelProperty("代表团")
+    private String delegationName;
+
+    @ApiModelProperty("是否是主办承办单位")
+    private boolean isMasterUnderTake;
+
+    @ApiModelProperty("承办单位")
+    private String underTakeName;
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/vo/ProposalInviteSeconderVO.java

@@ -0,0 +1,34 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("提案邀请附议人")
+public class ProposalInviteSeconderVO {
+
+    @ApiModelProperty("工号")
+    private String loginName;
+
+    @ApiModelProperty("姓名")
+    private String userName;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("性别")
+    private String sex;
+
+    @ApiModelProperty("单位")
+    private String unitName;
+
+    @ApiModelProperty("分工会")
+    private String unionName;
+
+    @ApiModelProperty("代表团ID")
+    private String delegationId;
+
+    @ApiModelProperty("代表团")
+    private String delegationName;
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalCommonController.java

@@ -0,0 +1,21 @@
+package com.budwk.app.zhgh.democratic.proposal.h5controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+@IocBean
+@At("/platform/h5/proposal/common")
+@Ok("json:full")
+@Api(tags = "h5提案公共")
+public class H5ProposalCommonController {
+
+    @At("")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/common/info/index.html")
+    @SaCheckPermission("h5.proposal")
+    public void index() {
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalQueryComprehensiveController.java

@@ -0,0 +1,22 @@
+package com.budwk.app.zhgh.democratic.proposal.h5controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+@IocBean
+@At("/platform/h5/proposal/query/comprehensive")
+@Slf4j
+@Ok("json:full")
+@Api(tags = "提案综合查询")
+public class H5ProposalQueryComprehensiveController {
+    @At("")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/query/comprehensive/index.html")
+    @SaCheckPermission("h5.proposal.query.comprehensive")
+    public void index() {
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalDelegationAssignmentHandler.java

@@ -0,0 +1,57 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.AssignmentHandler;
+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_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+/**
+ * 提案代表团团长
+ */
+public class ProposalDelegationAssignmentHandler implements AssignmentHandler {
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        NutMap variable = Json.fromJson(NutMap.class, execution.getProcessInstance().getVariable());
+        ProposalInfo info = variable.getAs(FlowConst.FORM_DATA, ProposalInfo.class);
+
+        String sessionId = info.getSessionId();
+        String delegationId = info.getDelegationId();
+
+
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+        Sys_role role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD);
+
+        Sys_user_role user_role = ServiceContext.find(Dao.class).fetch(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+                .and(Sys_user_role::getTcDelegationId, "=", delegationId)
+                .and(Sys_user_role::getTcSessionId, "=", sessionId));
+
+        if(user_role==null){
+            throw new RuntimeException("您所在的代表团没有设置团长，无法流转到下一步，请联系校工会进行设置。");
+        }
+        return List.of(user_role.getUserId());
+    }
+
+    @Override
+    public String getMessage() {
+        return "当前代表代表团团长";
+    }
+
+    @Override
+    public int getOrder() {
+        return 210;
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalLianDecisionHandler.java

@@ -0,0 +1,21 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.DecisionHandler;
+import com.budwk.app.flow.engine.core.Execution;
+
+/**
+ * 提案立案
+ */
+public class ProposalLianDecisionHandler implements DecisionHandler {
+    @Override
+    public String decide(Execution execution) {
+
+        // 立案结果
+        String caseFilingResult = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "case_filing_result");
+
+
+
+        return caseFilingResult;
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalMasterUnitAssignmentHandler.java

@@ -0,0 +1,98 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.engine.AssignmentHandler;
+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_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalReplyUnit;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.aop.Aop;
+
+import java.util.List;
+
+/**
+ * 提案主办单位处理人
+ */
+public class ProposalMasterUnitAssignmentHandler implements AssignmentHandler {
+
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+
+        // 提案ID
+        String proposalId = execution.getProcessInstance().getBusinessNo();
+
+        // 主办单位
+//        ProposalReplyUnit masterUnit = dao.fetch(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId).and(ProposalReplyUnit::getIsMaster, "=", 1));
+//        if (masterUnit == null) {
+//            throw new BaseException("提案没有主办单位");
+//        }
+//        ProposalUndertake undertake = dao.fetch(ProposalUndertake.class, masterUnit.getUnitId());
+
+        // 假设委员会立案那么从流程变量取值
+        String masterUnitId = execution.getArgs().getStr("tf_masterUnitId");
+
+        // 如果没有 认为是需要重新答复 从记录表里取值
+        if(StrUtil.isBlank(masterUnitId)){
+            ProposalReplyUnit masterUnit = dao.fetch(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId)
+                    .and(ProposalReplyUnit::getIsMaster, "=", 1));
+            if (masterUnit == null) {
+                throw new BaseException("系统异常");
+            }
+            masterUnitId = masterUnit.getUnitId();
+        }
+
+        if(StrUtil.isBlank(masterUnitId)){
+            throw new BaseException("提案没有主办单位");
+        }
+
+        ProposalUndertake undertake = dao.fetch(ProposalUndertake.class, masterUnitId);
+
+        if (undertake == null) {
+            throw new BaseException("主办单位不存在");
+        }
+
+        // 获取负责人
+        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER);
+
+        List<Sys_user_role> sysUserRoles = dao.query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnderTakeId, "=", undertake.getId()));
+        List<String> selectUserIds = sysUserRoles.stream().map(Sys_user_role::getUserId).toList();
+
+        if (selectUserIds.isEmpty()) {
+            throw new BaseException("主办单位没有负责人");
+        }
+
+
+        // 参数
+        Dict args = execution.getArgs();
+        args.set("underTakeName", undertake.getName());
+        args.set("underTakeId", undertake.getId());
+        args.set("underTakeIsMaster",true);
+
+        return selectUserIds;
+    }
+
+
+    @Override
+    public String getMessage() {
+        return "提案主办单位处理人";
+    }
+
+    @Override
+    public int getOrder() {
+        return 200;
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalSchoolLeaderCandidateHandler.java

@@ -0,0 +1,47 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import cn.hutool.core.lang.Dict;
+import com.budwk.app.flow.engine.CandidateHandler;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import com.budwk.app.flow.entity.Candidate;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.lang.util.NutMap;
+import java.util.List;
+
+public class ProposalSchoolLeaderCandidateHandler implements CandidateHandler {
+
+    @Override
+    public List<Candidate> handle(TaskModel model) {
+        Dao dao = ServiceContext.find(Dao.class);
+        ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
+        List<String> unitIds = proposalConfig.getSchoolLeaderUnitIds();
+        Sql sql = Sqls.create("select id,username,loginname from vw_user where unitId in (@unitIds)");
+        sql.setParam("unitIds", unitIds);
+        sql.setCallback(Sqls.callback.maps());
+        dao.execute(sql);
+        List<NutMap> list = sql.getList(NutMap.class);
+
+        List<Candidate> candidates = list.stream().map(item -> Candidate.builder()
+                .userId(item.getString("id"))
+                .userName(item.getString("username"))
+                .ext(Dict.of("loginName", item.getString("loginname")))
+                .build()
+        ).toList();
+        return candidates;
+    }
+
+    @Override
+    public String getMessage() {
+        return "提案分管校领导";
+    }
+
+    @Override
+    public int getOrder() {
+        return 20;
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalSlaveUnitAssignmentHandler.java

@@ -0,0 +1,69 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.engine.AssignmentHandler;
+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_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 提案协办单位处理人
+ */
+public class ProposalSlaveUnitAssignmentHandler implements AssignmentHandler {
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+
+        List<String> assignee = new ArrayList<>();
+
+        // 提案配置
+        ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
+
+        // 不需要答复
+        if (!proposalConfig.getSlaveUnitNeedReply()) {
+            return assignee;
+        }
+
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+
+        // 协办单位id
+        List<String> helpUnitIds = (List<String>) execution.getArgs().get("tf_slaveUnitIds");
+        if (helpUnitIds != null && !helpUnitIds.isEmpty()) {
+
+            Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER);
+
+            for (String helpUnitId : helpUnitIds) {
+                ProposalUndertake undertake = dao.fetch(ProposalUndertake.class, helpUnitId);
+                List<Sys_user_role> sysUserRoles = dao.query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnderTakeId, "=", undertake.getId()));
+                if (sysUserRoles.isEmpty()) {
+                    throw new BaseException(undertake.getName() + "单位没有设置负责人！");
+                }
+                assignee.addAll(sysUserRoles.stream().map(Sys_user_role::getUserId).toList());
+            }
+            return assignee;
+        }
+        return assignee;
+    }
+
+    @Override
+    public String getMessage() {
+        return "提案协办单位处理人";
+    }
+
+    @Override
+    public int getOrder() {
+        return 210;
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalWyhAssignmentHandler.java

@@ -0,0 +1,52 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.AssignmentHandler;
+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_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+/**
+ * 提案委员会主任
+ */
+public class ProposalWyhAssignmentHandler implements AssignmentHandler {
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        NutMap variable = Json.fromJson(NutMap.class, execution.getProcessInstance().getVariable());
+        ProposalInfo info = variable.getAs(FlowConst.FORM_DATA, ProposalInfo.class);
+
+        String sessionId = info.getSessionId();
+
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+        Sys_role role = sysRoleService.getByCode(RoleConstant.PROPOSAL_COMMITTEE_DIRECTOR);
+
+        Sys_user_role user_role = ServiceContext.find(Dao.class).fetch(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", role.getId()).and(Sys_user_role::getTcSessionId, "=", sessionId));
+
+        if (user_role == null) {
+            throw new RuntimeException("没有设置提案委员会主任，无法流转到下一步，请联系校工会进行设置。");
+        }
+        return List.of(user_role.getUserId());
+    }
+
+    @Override
+    public String getMessage() {
+        return "教代会提案委员会主任";
+    }
+
+    @Override
+    public int getOrder() {
+        return 220;
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalCaseFilingInterceptor.java

@@ -0,0 +1,104 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.util.FlowUtil;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalReplyUnit;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+/**
+ * 提案委员会立案后置拦截器
+ * 把承办单位单独储存 便于统计
+ */
+public class ProposalCaseFilingInterceptor implements FlowInterceptor {
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void intercept(Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        // 提案ID
+        String proposalId = execution.getProcessInstance().getBusinessNo();
+
+        // 立案结果
+        String caseFilingResult = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult");
+
+        // 储存承办单位
+        if (StrUtil.isNotBlank(caseFilingResult) && List.of("CONFIRM_FILING", "SUGGESTION").contains(caseFilingResult)) {
+            // 删除原来的记录
+            dao.clear(ProposalReplyUnit.class,Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId));
+
+            // 主办单位
+            String masterUnitId = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "masterUnitId");
+            ProposalUndertake masterUnit = dao.fetch(ProposalUndertake.class, masterUnitId);
+            ProposalReplyUnit masterReplyUnit = new ProposalReplyUnit();
+            masterReplyUnit.setProposalId(proposalId);
+            masterReplyUnit.setUnitId(masterUnit.getId());
+            masterReplyUnit.setUnitCode(masterUnit.getCode());
+            masterReplyUnit.setUnitName(masterUnit.getName());
+            masterReplyUnit.setIsMaster(true);
+            dao.insert(masterReplyUnit);
+
+            // 协办单位
+            List<String> helpUnitIds = (List<String>) execution.getArgs().getObj(FlowConst.TASK_FORM_DATA_PREFIX + "slaveUnitIds");
+            if(ObjectUtil.isNotEmpty(helpUnitIds)){
+                for (String helpUnitId : helpUnitIds) {
+                    ProposalUndertake helpUnit = dao.fetch(ProposalUndertake.class, helpUnitId);
+                    ProposalReplyUnit helpReplyUnit = new ProposalReplyUnit();
+                    helpReplyUnit.setProposalId(proposalId);
+                    helpReplyUnit.setUnitId(helpUnit.getId());
+                    helpReplyUnit.setUnitCode(helpUnit.getCode());
+                    helpReplyUnit.setUnitName(helpUnit.getName());
+                    helpReplyUnit.setIsMaster(false);
+                    dao.insert(helpReplyUnit);
+                }
+            }
+        }
+
+        // 更新立案结果、立案类型
+        ProcessInstance processInstance = execution.getProcessInstance();
+        String businessNo = processInstance.getBusinessNo();
+
+        Chain chain = Chain.make("caseFilingResult", execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult"));
+        chain.add("caseFilingType", execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingType"));
+        dao.update(ProposalInfo.class, chain, Cnd.where(ProposalInfo::getId, "=", businessNo));
+
+
+        // 当前任务
+        List<ProcessTask> processTaskList = execution.getProcessTaskList();
+
+        for (ProcessTask task : processTaskList) {
+            // 办理人
+            ProcessTaskActor taskActor = dao.fetch(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+            String actorUnitId = taskActor.getActorUnitId();
+            ProposalReplyUnit replyUnit = dao.fetch(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId).and(ProposalReplyUnit::getUnitId, "=", actorUnitId));
+
+            Dict variable = FlowUtil.variableToDict(task.getVariable());
+            variable.set("underTakeName", replyUnit.getUnitName());
+            variable.set("underTakeId", replyUnit.getUnitId());
+            variable.set("underTakeIsMaster", replyUnit.getIsMaster());
+            task.setVariable(Json.toJson(variable));
+        }
+        dao.update(processTaskList,"variable");
+
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalFeedBackInterceptor.java

@@ -0,0 +1,53 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+/**
+ * 提案反馈评价拦截器
+ */
+public class ProposalFeedBackInterceptor implements FlowInterceptor {
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void intercept(Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+
+        String feedback = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "feedback");
+        if (feedback.equals("DISSATISFIED")) {
+            // 不满意
+            List<ProcessTask> processTaskList = execution.getProcessTaskList();
+            for (ProcessTask task : processTaskList) {
+                NutMap variable = Json.fromJson(NutMap.class, task.getVariable());
+                ProcessTaskActor taskActor = dao.fetch(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+
+                // 单位名称
+
+                variable.setv("underTakeName", taskActor.getActorUnitName());
+                variable.setv("underTakeId", taskActor.getActorUnitId());
+
+                // 是否主办
+                variable.setv("isMaster", task.getTaskName().equals("master_reply") || task.getTaskName().equals("opinion_master_reply"));
+                variable.setv("underTakeIsMaster", List.of("master_reply", "opinion_master_reply").contains(task.getTaskName()));
+
+                task.setVariable(Json.toJson(variable));
+            }
+            dao.update(processTaskList, "variable");
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalFeedBackPreInterceptor.java

@@ -0,0 +1,34 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.util.FlowUtil;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+/**
+ * 提案反馈前拦截器
+ * 不满意的时候需要设置主办单位变量
+ */
+public class ProposalFeedBackPreInterceptor implements FlowInterceptor {
+    @Override
+    public void intercept(Execution execution) {
+        String approval = execution.getArgs().get(FlowConst.TASK_FORM_DATA_PREFIX + "feedback", "");
+        if (StrUtil.isNotBlank(approval) && approval.equals("DISSATISFIED")) {
+            // 找到主办单位
+            Dao dao = ServiceContext.find(Dao.class);
+            ProcessTask task = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", execution.getProcessInstanceId())
+                    .and(ProcessTask::getTaskName, "=", "committee")
+                    .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode())
+                    .desc(ProcessTask::getCreatedAt)
+            );
+            String masterUnitId = FlowUtil.variableToDict(task.getVariable()).getStr(FlowConst.TASK_FORM_DATA_PREFIX + "masterUnitId");
+            execution.getArgs().set(FlowConst.TASK_FORM_DATA_PREFIX + "masterUnitId", masterUnitId);
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalFgxldPostInterceptor.java

@@ -0,0 +1,48 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+/**
+ * 提案分管领导审批拦截器
+ * 用于设置主办单位任务变量 name、id、isMaster、underTakeIsMaster等等
+ */
+public class ProposalFgxldPostInterceptor implements FlowInterceptor {
+    @Override
+    public void intercept(Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+
+        String approval = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "approval");
+        if (approval.equals("back")) {
+            // 退回
+            List<ProcessTask> processTaskList = execution.getProcessTaskList();
+            for (ProcessTask task : processTaskList) {
+                NutMap variable = Json.fromJson(NutMap.class, task.getVariable());
+                ProcessTaskActor taskActor = dao.fetch(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+
+                // 单位名称
+
+                variable.setv("underTakeName", taskActor.getActorUnitName());
+                variable.setv("underTakeId", taskActor.getActorUnitId());
+
+                // 是否主办
+                variable.setv("isMaster", task.getTaskName().equals("master_reply") || task.getTaskName().equals("opinion_master_reply"));
+                variable.setv("underTakeIsMaster", List.of("master_reply", "opinion_master_reply").contains(task.getTaskName()));
+
+                task.setVariable(Json.toJson(variable));
+            }
+            dao.update(processTaskList, "variable");
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalFgxldPrefixInterceptor.java

@@ -0,0 +1,34 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.util.FlowUtil;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+/**
+ * 提案分管领导审批前缀拦截器
+ * 用于设置主办单位变量 tf_masterUnitId
+ */
+public class ProposalFgxldPrefixInterceptor implements FlowInterceptor {
+    @Override
+    public void intercept(Execution execution) {
+        String approval = execution.getArgs().get(FlowConst.TASK_FORM_DATA_PREFIX + "approval", "");
+        if (StrUtil.isNotBlank(approval) && approval.equals("back")) {
+            // 找到主办单位
+            Dao dao = ServiceContext.find(Dao.class);
+            ProcessTask task = dao.fetch(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", execution.getProcessInstanceId())
+                    .and(ProcessTask::getTaskName, "=", "committee")
+                    .and(ProcessTask::getTaskState, "=", ProcessTaskStateEnum.FINISHED.getCode())
+                    .desc(ProcessTask::getCreatedAt)
+            );
+            String masterUnitId = FlowUtil.variableToDict(task.getVariable()).getStr(FlowConst.TASK_FORM_DATA_PREFIX + "masterUnitId");
+            execution.getArgs().set(FlowConst.TASK_FORM_DATA_PREFIX + "masterUnitId", masterUnitId);
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalUnderTakeInfoInterceptor.java

@@ -0,0 +1,45 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import cn.hutool.core.lang.Dict;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.util.FlowUtil;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalReplyUnit;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.json.Json;
+
+import java.util.List;
+
+/**
+ * 提案承办单位答复任务设置信息拦截器
+ * 承办单位名称、ID、是否主办等信息
+ */
+public class ProposalUnderTakeInfoInterceptor implements FlowInterceptor {
+    @Override
+    public void intercept(Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+
+        // 提案ID
+        String proposalId = execution.getProcessInstance().getBusinessNo();
+        // 当前任务
+        List<ProcessTask> processTaskList = execution.getProcessTaskList();
+
+        for (ProcessTask task : processTaskList) {
+            // 办理人
+            ProcessTaskActor taskActor = dao.fetch(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+            String actorUnitId = taskActor.getActorUnitId();
+            ProposalReplyUnit replyUnit = dao.fetch(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId).and(ProposalReplyUnit::getUnitId, "=", actorUnitId));
+
+            Dict variable = FlowUtil.variableToDict(task.getVariable());
+            variable.set("underTakeName", replyUnit.getUnitName());
+            variable.set("underTakeId", replyUnit.getUnitId());
+            variable.set("underTakeIsMaster", replyUnit.getIsMaster());
+            task.setVariable(Json.toJson(variable));
+        }
+        dao.update(processTaskList,"variable");
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCaseTaskRevokeEventListener.java

@@ -0,0 +1,38 @@
+package com.budwk.app.zhgh.democratic.proposal.listenter;
+
+
+import com.budwk.app.flow.engine.event.ProcessEvent;
+import com.budwk.app.flow.engine.event.ProcessEventListener;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessEventTypeEnum;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalReplyUnit;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * 委员会立案撤回监听器
+ */
+@IocBean
+public class ProposalCaseTaskRevokeEventListener implements ProcessEventListener {
+
+    @Inject
+    private Dao dao;
+
+    @Override
+    public void onEvent(ProcessEvent event) {
+        if (event.getEventType() == ProcessEventTypeEnum.PROCESS_TASK_REVOKE) {
+            Long taskId = event.getSourceId();
+            ProcessTask task = dao.fetch(ProcessTask.class, taskId);
+
+            ProcessTask parentProcessTask = dao.fetch(ProcessTask.class, task.getTaskParentId());
+            if ("committee".equals(parentProcessTask.getTaskName())) {
+                ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+                String businessNo = instance.getBusinessNo();
+                dao.clear(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", businessNo));
+            }
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java

@@ -0,0 +1,51 @@
+package com.budwk.app.zhgh.democratic.proposal.listenter;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.flow.engine.event.ProcessEvent;
+import com.budwk.app.flow.engine.event.ProcessEventListener;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessEventTypeEnum;
+import com.budwk.app.flow.service.ProcessInstanceService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：ProposalCommitteeFilingRevokeEventListener
+ * @Date 2025/12/22 17:43
+ * @注释  提案立案审核撤回监听器
+ */
+@IocBean
+public class ProposalCommitteeFilingRevokeEventListener implements ProcessEventListener {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProcessInstanceService processInstanceService;
+
+    @Override
+    public void onEvent(ProcessEvent event) {
+        if (event.getEventType() == ProcessEventTypeEnum.PROCESS_TASK_REVOKE) {
+            Long taskId = event.getSourceId();
+            ProcessTask task = dao.fetch(ProcessTask.class, taskId);
+            ProcessInstance processInstance = processInstanceService.getById(task.getProcessInstanceId());
+
+            // 处理并案信息撤回
+            if ("committee".equals(task.getTaskName())) {
+                // 如果有并案，删掉并案数据（傻逼提的需求,nmsl）
+                ProposalMerge proposalMerge = dao.fetch(ProposalMerge.class, Cnd.where("proposalId", "=", processInstance.getBusinessNo()));
+
+                if (Lang.isNotEmpty(proposalMerge)) {
+                    dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "=", proposalMerge.getProposalId()));
+                }
+            }
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalJumpToWriteEventListener.java

@@ -0,0 +1,39 @@
+package com.budwk.app.zhgh.democratic.proposal.listenter;
+
+import com.budwk.app.base.event.flow.jumptofirsttask.FlowJumpToFirstTaskNodeListener;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.service.ProcessInstanceService;
+import com.budwk.app.flow.service.ProcessTaskService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalSecond;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：ProposalJumpToWriteEventListener
+ * @Date 2025/12/20 14:50
+ * @注释 提案退回发起人监听器
+ */
+@IocBean
+public class ProposalJumpToWriteEventListener implements FlowJumpToFirstTaskNodeListener {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ProcessTaskService processTaskService;
+    @Inject
+    private ProcessInstanceService processInstanceService;
+
+    @Override
+    public void receive(Long processTaskId) {
+        ProcessTask processTask = processTaskService.getById(processTaskId);
+        ProcessInstance processInstance = processInstanceService.getById(processTask.getProcessInstanceId());
+
+        // 清空提案的附议人
+        dao.clear(ProposalSecond.class, Cnd.where(ProposalSecond::getProposalId, "=", processInstance.getBusinessNo()));
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalCommissionerOpinion.java

@@ -0,0 +1,57 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("proposal_commissioner_opinion")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案委员意见")
+@TableIndexes(value = {
+        @Index(name = "INDEX_PROPOSAL_COMMISSIONER_OPINION_PROPOSAL_ID", fields = {"proposalId"}, unique = false)
+})
+public class ProposalCommissionerOpinion extends BaseModel {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("提案ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String proposalId;
+
+    @Column
+    @Comment("立案结果（字典表）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String caseFilingResult;
+
+    @Column
+    @Comment("立案类型（重点、普通提案）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String caseFilingType;
+
+    @Column
+    @Comment("委员意见")
+    @ColDefine(type = ColType.TEXT)
+    private String opinionText;
+
+    @Column
+    @Comment("委员意见时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date opinionTime;
+
+    @Column
+    @Comment("委员ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String commissioner;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalConfig.java

@@ -0,0 +1,63 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("proposal_config")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案配置")
+public class ProposalConfig extends BaseModel {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("附议人数量")
+    @ColDefine(type = ColType.INT, width = 1)
+    @Default("1")
+    private Integer seconderNum;
+
+    @Column
+    @Comment("案由最少字数")
+    @ColDefine(type = ColType.INT, width = 1)
+    @Default("1")
+    private Integer briefMinLength;
+
+    @Column
+    @Comment("协办单位是否需要答复")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean slaveUnitNeedReply;
+
+    @Column
+    @Comment("协办单位是否首先答复")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean slaveUnitFirstReply;
+
+    @Column
+    @Comment("协办单位领导单位是否需要审批")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean slaveUnitLeaderNeedApprove;
+
+    @Column
+    @Comment("撰写须知")
+    @ColDefine(type = ColType.TEXT)
+    private String writeRemind;
+
+    @Column
+    @Comment("校领导单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> schoolLeaderUnitIds;
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalConsolidation.java

@@ -0,0 +1,36 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("proposal_consolidation")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案并案")
+public class ProposalConsolidation extends BaseModel {
+
+    @Id
+    @Comment("id")
+    private Long id;
+
+    @Column
+    @Comment("分组id")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private Integer groupId;
+
+    @Column
+    @Comment("提案id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String proposalId;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("并案id")
+    private List<String> consolidationIds;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalInfo.java

@@ -0,0 +1,172 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+import org.nutz.json.JsonField;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("proposal_info")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案信息")
+@TableIndexes({
+        @Index(name = "INDEX_PROPOSAL_INFO_SESSION_CODE", fields = {"sessionId", "code"})
+})
+public class ProposalInfo extends BaseModel {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("提案编号")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String code;
+
+    @Column
+    @Comment("提案名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @NotBlank(message = "提案名称不能为空")
+    @Size(max = 100)
+    private String name;
+
+    @Column
+    @Comment("提案类型")
+    @ColDefine(type = ColType.INT)
+    private Integer typeId;
+
+    @Column
+    @Comment("提案来源")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String source;
+
+    @Column
+    @Comment("立案结果（字典表）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String caseFilingResult;
+
+    @Column
+    @Comment("立案类型（重点、普通提案）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String caseFilingType;
+
+    @Column
+    @Comment("教代会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String sessionId;
+
+    @Column
+    @Comment("提案人ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String createUserId;
+
+    @Column
+    @Comment("提案人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String createUserName;
+
+    @Column
+    @Comment("提案人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 120)
+    private String createUserLoginName;
+
+    @Column
+    @Comment("联系电话")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String mobile;
+
+    @Column
+    @Comment("所属代表团ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String delegationId;
+
+    @Column
+    @Comment("所属委员会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String committeeId;
+
+    @Column
+    @Comment("单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unitName;
+
+    @Column
+    @Comment("是否提交")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default(value = "0")
+    private Boolean isSubmit;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @JsonField(dataFormat = "yyyy-MM-dd")
+    private String createTime;
+
+    @Column
+    @Comment("摘要")
+    @ColDefine(type = ColType.TEXT)
+    private String excerpt;
+
+    @Column
+    @Comment("调研情况")
+    @ColDefine(type = ColType.TEXT)
+    private String researchFindings;
+
+    @Column
+    @Comment("案由")
+    @ColDefine(type = ColType.TEXT)
+    private String brief;
+
+    @Column
+    @Comment("建议措施")
+    @ColDefine(type = ColType.TEXT)
+    private String measures;
+
+    @Column
+    @Comment("建议落实部门")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> suggestUnits;
+
+    @Column
+    @Comment("提案状态")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer stateCode;
+
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<JSONObject> files;
+
+    @Column
+    @Comment("提案人签字ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String signId;
+
+    @Column
+    @Comment("是否公示提案")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default(value = "0")
+    private Boolean publicity;
+
+    @Column
+    @Comment("是否优秀提案")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default(value = "0")
+    private Boolean excellent;
+
+    @Comment("签字")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    @Column(hump = true)
+    private String signature;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalMerge.java

@@ -0,0 +1,31 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("proposal_merge")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案并案")
+@TableIndexes(value = {
+        @Index(name = "INDEX_PROPOSAL_MERGE_PROPOSAL_ID", fields = "proposalId", unique = true)
+})
+public class ProposalMerge extends BaseModel {
+
+    @Id
+    @Comment("id")
+    private Long id;
+
+    @Column
+    @Comment("分组id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String groupId;
+
+    @Column
+    @Comment("提案id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String proposalId;
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalReplyUnit.java

@@ -0,0 +1,55 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Table("proposal_reply_unit")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案信息")
+public class ProposalReplyUnit extends BaseModel {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("提案ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String proposalId;
+
+    @Column
+    @Comment("承办单位ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitId;
+
+    @Column
+    @Comment("承办单位code")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unitCode;
+
+    @Column
+    @Comment("承办单位名称")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String unitName;
+
+    @Column
+    @Comment("是否主办单位")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean isMaster;
+
+    @Column
+    @Comment("是否答复")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean isReply;
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalSecond.java

@@ -0,0 +1,80 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("proposal_second")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案附议信息")
+public class ProposalSecond extends BaseModel {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("提案ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String proposalId;
+
+    @Column
+    @Comment("附议人ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String seconderId;
+
+    @Column
+    @Comment("附议人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String userName;
+
+    @Column
+    @Comment("附议人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String loginName;
+
+    @Column
+    @Comment("附议人单位")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String unitName;
+
+    @Column
+    @Comment("附议人分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String unionName;
+
+    @Column
+    @Comment("附议人代表团")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String delegationName;
+
+    @Column
+    @Comment("附议人手机号")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String mobile;
+
+    @Column
+    @Comment("附议时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date secondedTime;
+
+    @Column
+    @Comment("邀请时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date inviteTime;
+
+    @Column
+    @Comment("附议结果")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isAgree;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalType.java

@@ -0,0 +1,36 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Table("proposal_type")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案类型")
+public class ProposalType extends BaseModel {
+
+    @Id
+    @Comment("id")
+    private Integer id;
+
+    @Column
+    @Comment("编码")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String code;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String name;
+
+    @Column
+    @Comment("排序")
+    @ColDefine(type = ColType.INT)
+    private Integer sort;
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/models/ProposalUndertake.java

@@ -0,0 +1,36 @@
+package com.budwk.app.zhgh.democratic.proposal.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+@Table("proposal_undertake")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("提案承办单位")
+public class ProposalUndertake extends BaseModel {
+
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+    @Column
+    @Comment("承办单位编码")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String code;
+
+    @Column
+    @Comment("承办单位名称")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String name;
+
+    @Column
+    @Comment("是否启用")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default(value = "1")
+    private Boolean enable;
+}