两委委员推选-代表团推选改成分工会推选

src/main/java/com/budwk/app/zhgh/activity/fellowship/controller/manage/FellowshipApplyController.java

@@ -8,6 +8,7 @@ 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.utils.ConditionGroupUtil;
 import com.budwk.app.sys.models.Sys_dict;
 import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.sys.services.SysDictService;
@@ -234,6 +235,15 @@ public class FellowshipApplyController {
 			if (DateUtil.compare(new Date(), activity.getActivitySignUpEndTime(), "yyyy-MM-dd HH:mm:ss") > 0) {
 				return Result.error("报名已结束");
 			}
+			//新增：基于条件组的用户资格验证
+			if (course.getMatchCnd() != null) {
+				Cnd userCnd = Cnd.where("id", "=", SecurityUtil.getUserId());
+				ConditionGroupUtil.applyConditionGroup(userCnd, course.getMatchCnd());
+				int userCount = dao.count(Sys_user.class, userCnd);
+				if (userCount == 0) {
+					return Result.error("您不符合该活动的报名条件");
+				}
+			}
 
 			//判断活动组别
 			int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getActivityGroupId()).and("userId", "=", SecurityUtil.getUserId()));
@@ -269,6 +279,7 @@ public class FellowshipApplyController {
 				return Result.error("您所在的分工会名额不足");
 			}
 
+
 			return Result.success();
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/java/com/budwk/app/zhgh/activity/fellowship/models/FellowshipCourse.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.activity.fellowship.models;
 
 import com.budwk.app.base.model.BaseModel;
+import com.budwk.app.base.param.ConditionGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -160,4 +161,9 @@ public class FellowshipCourse extends BaseModel implements Serializable {
 
     private String courseTimeName;
 
+    @Column
+    @Comment("条件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private ConditionGroup matchCnd;
+
 }

src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtApplyMineController.java

@@ -105,7 +105,6 @@ public class LeadThoughtApplyMineController {
 
     @At
     @ApiOperation("获取填报信息")
-    @SaCheckPermission("leadThought.mine")
     public Result findOne(String id) {
         return Result.success(leadThoughtInfoService.findOne(id));
     }

src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtQueryController.java

@@ -106,6 +106,8 @@ public class LeadThoughtQueryController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
+        // 只查询流程实例状态为20的数据（已完成状态）
+        cnd.and("ins.state", "=", 20);
         pageForm.buildSearch(cnd, "info.");
         sql.setCondition(cnd);
         Pagination pagination = leadThoughtInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);

src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardMineController.java

@@ -4,8 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.EasyExcel;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
@@ -23,25 +21,18 @@ 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.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.Lang;
-import org.nutz.lang.util.NutMap;
-import org.nutz.mvc.annotation.AdaptBy;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
-import org.nutz.mvc.upload.TempFile;
+
-import org.nutz.mvc.upload.UploadAdaptor;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.Map;
 
 /**
@@ -104,7 +95,7 @@ public class ExerciseCardMineController {
     public void doExportApply(@Valid String id, HttpServletResponse response) {
         ExerciseCard info = dao.fetch(ExerciseCard.class, id);
         Map<String, Object> docData = BeanUtil.beanToMap(info);
-        docData.put("time", DateUtil.format(new java.util.Date(), "yyyy年MM月dd日"));
+        docData.put("time", DateUtil.format(new java.util.Date(), "yyyy-MM-dd"));
         String fileName = Globals.AppName + "【" + info.getUserName() + "】健身卡充值证明.docx";
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {

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

@@ -54,21 +54,19 @@ public class ExecutiveCommitteeConfigController {
 		ExecutiveCommitteeConfig config = committeeConfigService.fetch(Cnd.where("teacherMeetId", "=", sessionId));
 		if(config == null) {
 			config = new ExecutiveCommitteeConfig();
-			Sql sql = Sqls.create("""
+            Sql sql = Sqls.create("""
-					SELECT
+                    SELECT
-						dbt.id as delegationId,
+                          sun.id as unionId,
-						dbt.name as delegationName,
+                          sun.name as unionName,
-						dbt.code as delegationCode,
+                          sun.unionCode ,
-						(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 vw_user  where sun.id = unionId)   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
-						0 as quotaCount
+                          FROM
-					FROM
+                          sys_union sun
-						teacher_congress_delegation dbt
+                          ORDER BY unionCode ASC
-					WHERE dbt.sessionId = @sessionId
+                    """);
-					ORDER BY CODE ASC
+            List<NutMap> listMap = committeeConfigService.listMap(sql);
-					""").setParam("sessionId", sessionId);
+			config.setUnionQuotaList(listMap);
-			List<NutMap> listMap = committeeConfigService.listMap(sql);
-			config.setDelegationQuotaList(listMap);
 		}
 		return Result.success(config);
 	}

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

@@ -15,7 +15,6 @@ 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;
@@ -41,13 +40,13 @@ import java.util.stream.Collectors;
 /**
  * @author zhf
  * @date 2025/8/25 15:18
- * @description 团长一次推选
+ * @description 分工会一次推选
  */
 @IocBean
 @At("/platform/executiveCommittee/delegationOnePush")
 @Ok("json:full")
 @Slf4j
-@Api(tags = "执委会推选-团长一次推选")
+@Api(tags = "执委会推选-分工会主席一次推选")
 public class ExecutiveCommitteeDelegationOnePushController {
 
     @Inject
@@ -61,8 +60,9 @@ public class ExecutiveCommitteeDelegationOnePushController {
     public void index() {
     }
 
+
     @At
-    @ApiOperation("查询某个代表团的团长一次推选的委员")
+    @ApiOperation("查询某个分工会的一次推选的委员")
     @SaCheckPermission("executiveCommittee.delegationOnePush")
     public Result pageData(PageForm pageForm,
                            String teacherMeetId,
@@ -91,19 +91,13 @@ public class ExecutiveCommitteeDelegationOnePushController {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
         if (StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
-            StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+                StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) ||
-            cnd.andEX("t1.delegationId", "=", delegationId);
+                StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            cnd.andEX("t3.id", "=", unionId);
         }else{
-            Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+            cnd.andEX("t3.id", "=", SecurityUtil.getUnionId());
-                    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("t1.delegationId", "=", delegationId);
-        cnd.andEX("t3.id", "=", unionId);
         cnd.andEX("t1.addType", "=", 1);
         if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup group = new SqlExpressionGroup();
@@ -121,11 +115,10 @@ public class ExecutiveCommitteeDelegationOnePushController {
     @ApiOperation("查询可以推选委员和已经推选的人员")
     @SaCheckPermission("executiveCommittee.delegationOnePush")
     public Result getDelegationUser(String teacherMeetId) {
-        Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+        if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
-                Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) ||
-                        .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+                StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) {
-        if (ObjectUtil.isEmpty(db)) {
+            return Result.error("没有权限,只有分工会主席才能推选");
-            return Result.error("没有权限,只有代表团团长才能推选");
         }
         ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
                 Cnd.where(ExecutiveCommitteeConfig::getTeacherMeetId, "=", teacherMeetId));
@@ -144,11 +137,6 @@ public class ExecutiveCommitteeDelegationOnePushController {
         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.*,
@@ -160,29 +148,33 @@ public class ExecutiveCommitteeDelegationOnePushController {
                   LEFT JOIN `vw_user` u ON db.userId = u.id
                 $condition
                 """);
+        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.unionId", "=", SecurityUtil.getUnionId());
         sql.setCondition(cnd);
         List<NutMap> userData = baseService.listMap(sql);
 
 
-        List<NutMap> delegationQuotaList = config.getDelegationQuotaList();
+        List<NutMap> unionQuotaList = config.getUnionQuotaList();
-        NutMap delegationQuota = delegationQuotaList.stream().filter(v -> v.get("delegationId").equals(db.getDelegationId())).findFirst().orElse(null);
+        NutMap unionQuota = unionQuotaList.stream().filter(v -> v.get("unionId").equals(SecurityUtil.getUnionId())).findFirst().orElse(null);
-        if (Lang.isNotEmpty(delegationQuota)) {
+        if (Lang.isNotEmpty(unionQuota)) {
-            return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", delegationQuota.getInt("quotaCount")));
+            return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", unionQuota.getInt("quotaCount")));
         }
         return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", 0));
     }
 
     @At
     @SaCheckPermission("executiveCommittee.delegationOnePush")
-    @SLog(tag = "执委会推选-团长推选委员", msg = "推选委员")
+    @SLog(tag = "执委会推选-分工会主席推选委员", msg = "推选委员")
     public Result addOnePush(@Param("userValue") String[] userValue,
                              String teacherMeetId) {
         try {
-            Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+            if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
-                    Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                    StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) ||
-                            .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+                    StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) {
-            if (ObjectUtil.isEmpty(db)) {
+                return Result.error("没有权限,只有分工会主席才能推选");
-                return Result.error("没有权限,只有代表团团长才能推选");
             }
 
             ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
@@ -196,19 +188,20 @@ public class ExecutiveCommitteeDelegationOnePushController {
             if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
                 return Result.error("一次预选已结束");
             }
-            List<NutMap> delegationQuotaList = config.getDelegationQuotaList();
+            List<NutMap> unionQuotaList = config.getUnionQuotaList();
 
-            NutMap delegationQuota = delegationQuotaList.stream().filter(v -> v.getString("delegationId").equals(db.getDelegationId())).findFirst().orElse(null);
+            NutMap unionQuota = unionQuotaList.stream().filter(v -> v.getString("unionId").equals(SecurityUtil.getUnionId())).findFirst().orElse(null);
-            if (ObjectUtil.isEmpty(delegationQuota)) {
+            if (ObjectUtil.isEmpty(unionQuota)) {
-                return Result.error("请先配置代表团人数");
+                return Result.error("请先配置分工会人数");
             }
 
             int dbCount = dao.count(ExecutiveCommitteeOnePush.class,
-                    Cnd.where("delegationId", "=", db.getDelegationId())
+                    Cnd.where("unionId", "=", SecurityUtil.getUnionId())
                             .and("teacherMeetId", "=", teacherMeetId)
                             .and("addType", "=", 1));
-            if (dbCount + userValue.length > delegationQuota.getInt("quotaCount")) {
+            assert unionQuota != null;
-                return Result.error("推选人数限制" + delegationQuota.getInt("quotaCount") + "人");
+            if (dbCount + userValue.length > unionQuota.getInt("quotaCount")) {
+                return Result.error("推选人数限制" + unionQuota.getInt("quotaCount") + "人");
             }
             Sql sql = Sqls.create("""
                      SELECT
@@ -236,6 +229,7 @@ public class ExecutiveCommitteeDelegationOnePushController {
                 onePush.setUserName(jdhDb.getString("userName"));
                 onePush.setLoginName(jdhDb.getString("loginName"));
                 onePush.setDelegationId(jdhDb.getString("delegationId"));
+                onePush.setUnionId(jdhDb.getString("unionId"));
                 onePush.setUnitId(jdhDb.getString("unitId"));
                 onePush.setTeacherMeetId(teacherMeetId);
                 String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName")));
@@ -253,7 +247,7 @@ public class ExecutiveCommitteeDelegationOnePushController {
 
     @At
     @SaCheckPermission("executiveCommittee.delegationOnePush")
-    @SLog(tag = "执委会推选-团长推选委员", msg = "删除推选的人")
+    @SLog(tag = "执委会推选-分工会主席推选委员", msg = "删除推选的人")
     public Result doDelete(@Valid String id, @Valid String teacherMeetId) {
         ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
                 Cnd.where("teacherMeetId", "=", teacherMeetId));

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

@@ -1,10 +1,12 @@
 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.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.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
@@ -34,7 +36,7 @@ import java.util.stream.Collectors;
 /**
  * @author zhf
  * @date 2025/6/23 15:25
- * @description 团长二次推选
+ * @description 分工会二次推选
  */
 @At("/platform/executiveCommittee/delegationTwoPush")
 @Ok("json:full")
@@ -87,7 +89,13 @@ public class ExecutiveCommitteeDelegationTwoPushController {
         cnd.andEX("t1.pushUserId", "=", SecurityUtil.getUserId());
         cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
         cnd.andEX("t2.delegationId", "=", delegationId);
-        cnd.andEX("t4.id", "=", unionId);
+        if (StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
+                StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) ||
+                StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            cnd.andEX("t4.id", "=", unionId);
+        } else {
+            cnd.andEX("t4.id", "=", SecurityUtil.getUnionId());
+        }
         if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup group = new SqlExpressionGroup();
             group.orLike("t2.userName", pageForm.getSearchKeyword());
@@ -101,13 +109,12 @@ public class ExecutiveCommitteeDelegationTwoPushController {
 
     @At
     @SaCheckPermission("executiveCommittee.delegationTwoPush")
-    @SLog(type = "执委会推选-团长二次推选", tag = "查询可以二次推选的名单", param = true, result = true)
+    @SLog(type = "执委会推选-分工会二次推选", tag = "查询可以二次推选的名单", param = true, result = true)
     public Result getDelegationUser(String teacherMeetId) {
-        Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+        if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
-                Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) ||
-                        .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+                StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) {
-        if (ObjectUtil.isEmpty(db)) {
+            return Result.error("没有权限,只有分工会主席才能推选");
-            return Result.error("没有权限,只有代表团团长才能推选");
         }
         ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
                 Cnd.where("teacherMeetId", "=", teacherMeetId));
@@ -125,10 +132,7 @@ public class ExecutiveCommitteeDelegationTwoPushController {
                         .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.*,
@@ -144,23 +148,26 @@ public class ExecutiveCommitteeDelegationTwoPushController {
                   LEFT JOIN `vw_user` t2 ON t1.userId = t2.id
                 $condition
                 """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("t1.teacherMeetId", "=", teacherMeetId);
+        cnd.andEX("t1.userId", "not in", userIds);
+        cnd.andEX("t1.userId", "!=", SecurityUtil.getUserId());
         sql.setCondition(cnd);
         List<NutMap> userData = baseService.listMap(sql);
-        return Result.success(Map.of("userData", userData, "userValue", userValue,"delegationQuotaCount",config.getDelegationQuotaCount()));
+        return Result.success(Map.of("userData", userData, "userValue", userValue, "committeeQuotaCount", config.getCommitteeQuotaCount()));
     }
 
     @At
     @SaCheckPermission("executiveCommittee.delegationTwoPush")
     @ApiOperation("推选委员")
-    @SLog(tag = "执委会推选-团长二次推选", msg = "推选委员")
+    @SLog(tag = "执委会推选-分工会二次推选", msg = "推选委员")
     public Result addOnePush(@Param("userValue") String[] userValue,
                              String teacherMeetId) {
         try {
-            Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class,
+            if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) ||
-                    Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId)
+                    StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) ||
-                            .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId()));
+                    StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) {
-            if (ObjectUtil.isEmpty(db)) {
+                return Result.error("没有权限,只有分工会主席才能推选");
-                return Result.error("没有权限,只有代表团团长才能推选");
             }
 
             ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
@@ -193,7 +200,8 @@ public class ExecutiveCommitteeDelegationTwoPushController {
                 ExecutiveCommitteeTwoPush twoPush = new ExecutiveCommitteeTwoPush();
                 twoPush.setPushDate(DateUtil.date());
                 twoPush.setUserId(id);
-                twoPush.setPushDelegationId(db.getDelegationId());
+                twoPush.setPushDelegationId(jdhDb.getDelegationId());
+                twoPush.setPushUnionId(SecurityUtil.getUnionId());
                 twoPush.setPushUserId(SecurityUtil.getUserId());
                 twoPush.setPushUserName(SecurityUtil.getUserUsername());
                 twoPush.setPushLoginName(SecurityUtil.getUserLoginname());
@@ -211,7 +219,7 @@ public class ExecutiveCommitteeDelegationTwoPushController {
     @At
     @ApiOperation("删除推选人员")
     @SaCheckPermission("executiveCommittee.delegationTwoPush")
-    @SLog(tag = "执委会推选-团长二次推选", msg = "删除推选人员")
+    @SLog(tag = "执委会推选-分工会二次推选", msg = "删除推选人员")
     public Result doDelete(@Valid String id, @Valid String teacherMeetId) {
         ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
                 Cnd.where("teacherMeetId", "=", teacherMeetId));

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

@@ -182,6 +182,7 @@ public class ExecutiveCommitteePushController {
                 onePush.setUserName(jdhDb.getString("userName"));
                 onePush.setLoginName(jdhDb.getString("loginName"));
                 onePush.setDelegationId(jdhDb.getString("delegationId"));
+                onePush.setUnionId(jdhDb.getString("unionId"));
                 onePush.setUnitId(jdhDb.getString("unitId"));
                 onePush.setTeacherMeetId(teacherMeetId);
                 String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName")));

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

@@ -47,9 +47,9 @@ public class ExecutiveCommitteeConfig extends BaseModel implements Serializable
 	private Integer committeeQuotaCount;
 
 	@Column
-	@Comment("代表团推荐名额总数")
+	@Comment("分工会推荐名额总数")
 	@ColDefine(type = ColType.INT)
-	private Integer delegationQuotaCount;
+	private Integer unionQuotaCount;
 
 	@Column
 	@Comment("一次预选开始时间")
@@ -72,8 +72,8 @@ public class ExecutiveCommitteeConfig extends BaseModel implements Serializable
 	private DateTime secondEndTime;
 
 	@Column
-	@Comment("各代表团名额数")
+	@Comment("各分工会名额数")
 	@ColDefine(type = ColType.MYSQL_JSON)
-	private List<NutMap> delegationQuotaList;
+	private List<NutMap> unionQuotaList;
 
 }

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

@@ -42,6 +42,11 @@ public class ExecutiveCommitteeOnePush extends BaseModel implements Serializable
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String delegationId;
 
+    @Column
+    @Comment("所属分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
     @Column
     @Comment("姓名")
     @ColDefine(type = ColType.VARCHAR, width = 20)

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

@@ -37,6 +37,11 @@ public class ExecutiveCommitteeTwoPush extends BaseModel implements Serializable
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String teacherMeetId;
 
+    @Column
+    @Comment("推选的分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String pushUnionId;
+
     @Column
     @Comment("推选的代表团")
     @ColDefine(type = ColType.VARCHAR, width = 32)

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

@@ -10,7 +10,6 @@ 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

src/main/resources/views/platform/zhgh/activity/fellowship/manage/basicForm.js

@@ -198,7 +198,7 @@ const basicForm = {
                             </template>
                         </el-table-column>
 
-                        <el-table-column :label="trainType + '人员'" prop="courseName">
+                        <el-table-column label="活动名称" prop="courseName">
                             <template v-slot="{row}">
                                 <el-input size="small" v-model="row.courseName"
                                           :placeholder="'请输入' + trainType + '名称'"></el-input>
@@ -280,7 +280,7 @@ const basicForm = {
                         <el-table-column :label="trainType + '时间'">
                             <template v-slot="scope">
                                 <el-button @click="openSetUpCourseTime(scope.$index)" type="text">设置{{ trainType
-                                    }}交友联谊时间
+                                    }}时间
                                 </el-button>
                             </template>
                         </el-table-column>

src/main/resources/views/platform/zhgh/activity/fellowship/manage/customForm.js

@@ -141,6 +141,17 @@ const customForm = {
                     </el-col>
                 </el-row>
 
+                <!-- 添加条件构造器 -->
+                <el-row :gutter="50" type="flex">
+                    <el-col :span="4">
+                        <span>可选条件</span>
+                    </el-col>
+                    <el-col :span="20">
+                        <el-button size="mini" type="primary"
+                                   @click="openCnd(moreInfoIndex)">设置可选条件                        </el-button>
+                    </el-col>
+                </el-row>
+
                 <el-row :gutter="50" type="flex">
                     <el-col :span="4">
                         <span>详细信息</span>
@@ -149,7 +160,7 @@ const customForm = {
                         <text-editor v-model="formData.courseList[moreInfoIndex].introduce"></text-editor>
                     </el-col>
                 </el-row>
-                
+
                 <div style="text-align: right">
                     <el-button @click="moreInfoDrawer = false">取 消</el-button>
                     <el-button type="primary" @click="moreInfoDrawer = false">保 存</el-button>
@@ -162,7 +173,16 @@ const customForm = {
                     <el-button type="primary" @click="mapDialog = false">确 定</el-button>
                 </span>
             </el-dialog>
-            
+
+            <el-dialog :visible.sync="conditionStructureDialogVisible" title="条件构造器" :append-to-body="true">
+                <condition-group :group="conditionGroup" :field_options="fieldOptions"
+                                 @remove="removeRootGroup"></condition-group>
+                <div slot="footer">
+                    <el-button @click="conditionStructureDialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="confirmCnd">确定</el-button>
+                </div>
+            </el-dialog>
+
             <union-form ref="unionFormRef"></union-form>
         </div>
     `,
@@ -177,13 +197,73 @@ const customForm = {
 
             mapDialog: false,
             mapIndex: 0,
+
+            // 条件构造器相关
+            conditionStructureDialogVisible: false,
+            // 可选字段列表
+            fieldOptions: [
+                {label: "姓名", value: "username"},
+                {label: "工号", value: "loginname"},
+                {label: "性别", value: "sex"},
+                {label: "年龄", value: "age"},
+                {label: "婚姻状况", value: "marriage"},
+                {label: "在职状态", value: "userState"},
+                {label: "编制类别", value: "preparedBy"},
+                {label: "教职工类别", value: "personType"},
+            ],
+
+            conditionGroup: {
+                logic: "AND",
+                conditions: [],
+                groups: []
+            },
+
+            // 条件构造器相关
+            currentCourseIndex: -1, // 当前编辑的课程索引
+            subjectMoneyIndex: null,
+            hospitalIndex: null
         }
     },
     components: {
         "union-form": unionForm,
-        "map-container": httpVueLoader("/components/plugins/mapContainer/MapContainer.vue?v=1.0.1")
+        "map-container": httpVueLoader("/components/plugins/mapContainer/MapContainer.vue?v=1.0.1"),
     },
     methods: {
+        removeRootGroup() {
+            // 重置根条件组
+            this.conditionGroup = {
+                logic: "AND",
+                conditions: [],
+                groups: []
+            }
+        },
+        openCnd(moreInfoIndex) {
+            this.currentCourseIndex = moreInfoIndex;
+            this.conditionStructureDialogVisible = true
+            const currentCourse = this.formData.courseList[moreInfoIndex];
+            if (currentCourse.matchCnd) {
+                this.conditionGroup = JSON.parse(JSON.stringify(currentCourse.matchCnd));
+            } else {
+                this.conditionGroup = {
+                    logic: "AND",
+                    conditions: [],
+                    groups: []
+                }
+            }
+            // this.$refs.conditionStructureDialog.onOpen(row.matchCnd ? row.matchCnd : null)
+        },
+        // 条件构造器确认
+        confirmCnd() {
+            if (this.currentCourseIndex >= 0) {
+                this.$set(
+                    this.formData.courseList[this.currentCourseIndex],
+                    'matchCnd',
+                    JSON.parse(JSON.stringify(this.conditionGroup))
+                );
+            }
+            this.conditionStructureDialogVisible = false;
+            this.currentCourseIndex = -1;
+        },
         openMap(index) {
             this.mapIndex = index
             this.mapDialog = true
@@ -198,6 +278,18 @@ const customForm = {
             this.unionList = await this.$businessTool.listUnion()
             this.moreInfoDrawer = true
         },
+        addCondition(val) {
+            // 保存条件到对应的课程
+            if (this.currentCourseIndex >= 0) {
+                this.$set(
+                    this.formData.courseList[this.currentCourseIndex],
+                    'matchCnd',
+                    val
+                );
+            }
+
+            this.currentCourseIndex = -1;
+        }
     },
     created() {
         if(!this.formData.courseList) {
@@ -205,6 +297,6 @@ const customForm = {
         }
     },
     style: /*language=CSS*/ `
-        
+
     `
 }

src/main/resources/views/platform/zhgh/activity/leadthought/query/index.html

@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
             <table-tool>
 <!--	            <el-button size="mini" type="primary" @click="exportAllInfo">导出全部</el-button>-->
             </table-tool>
-	        
+
 	        <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
 		        <el-table-column
 				        :index="indexMethod"
@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
 <script>
 	<!--#include("../common/info.js"){}#-->
 	<!--#include("../common/commonQuery.js"){}#-->
-	
+
     new Vue({
         el: '#app',
         mixins: [initTableMixins],
@@ -94,8 +94,9 @@ layout("/layouts/platform.html"){
                 //     "&projectName=" + projectName)
             },
             openView(row) {
-                this.$refs.guava.view()
+				this.$refs.guava.view(() => {
-                this.$refs.viewInfo.openView(row.id)
+					this.$refs.infoRef.onOpen(row)
+				})
             },
             exportInfo(id) {
 				this.$downLoad('/platform/leadThought/query/exportInfo', {id})

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js

@@ -4,7 +4,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = {
             <el-dialog
                     :close-on-click-modal="false"
                     :visible.sync="dialogVisible"
-                    title="团长推选委员"
+                    title="分工会推选委员"
                     width="70%"
 
             >
@@ -24,7 +24,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = {
                     <div slot-scope="{ option }">
                         <div class="transfer-item">
                             <div class="transfer-item-name">{{ option.userName }} - {{ option.loginName
-                                }} - {{option.unitName}}
+                                }} - {{option.unitName}} - {{option.unionName}}
                             </div>
                             <div class="transfer-item-details">
                                 <span class="detail-item">

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js

@@ -4,7 +4,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
             <el-dialog
                     :close-on-click-modal="false"
                     :visible.sync="dialogVisible"
-                    title="团长最终投票"
+                    title="分工会最终投票"
                     width="70%"
 
             >
@@ -36,7 +36,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
                     </div>
                 </el-transfer>
                 <span slot="footer">
-                    <span style="color:red;font-size: 15px; display:flex;text-align: right;">投票名额：{{delegationQuotaCount}}个</span>
+                    <span style="color:red;font-size: 15px; display:flex;text-align: right;">投票名额：{{committeeQuotaCount}}个</span>
                     <span class="dialog-footer">
                         <el-button @click="dialogVisible = false">取 消</el-button>
                         <el-button type="primary" @click="onConfirm">确 定</el-button>
@@ -53,7 +53,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
             rightChecked: [],
             attendanceRightChecked: [],
             teacherMeetId: null,
-            delegationQuotaCount: 0
+            committeeQuotaCount: 0
         }
     },
     methods: {
@@ -70,7 +70,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
                 data.userData.forEach(v => {
                     this.userData.push({userId: v.userId, ...v})
                 })
-                this.delegationQuotaCount = data.delegationQuotaCount
+                this.committeeQuotaCount = data.committeeQuotaCount
                 this.dialogVisible = true
             } else {
                 this.$message.error(msg)

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html

@@ -32,9 +32,9 @@ layout("/layouts/platform.html"){
                                      style="width: 100%"></el-input-number>
                 </el-form-item>
 
-                <el-form-item prop="delegationQuotaCount" label="代表团推荐总数">
+                <el-form-item prop="unionQuotaCount" label="分工会推荐总数">
-                    <el-input-number v-model="formData.delegationQuotaCount"
+                    <el-input-number v-model="formData.unionQuotaCount"
-                                     placeholder="请填写代表团推荐名额总数" style="width: 100%"></el-input-number>
+                                     placeholder="请填写分工会推荐名额总数" style="width: 100%"></el-input-number>
                 </el-form-item>
                 <el-form-item prop="committeeQuotaCount" label="委员会预选人数">
                     <el-input-number v-model="formData.committeeQuotaCount"
@@ -63,8 +63,8 @@ layout("/layouts/platform.html"){
                     ></el-date-picker>
                 </el-form-item>
             </el-form>
-            <table-tool label="代表团名额分配"></table-tool>
+            <table-tool label="分工会名额分配"></table-tool>
-            <el-table :data="formData.delegationQuotaList" show-summar size="mini" max-height="500">
+            <el-table :data="formData.unionQuotaList" show-summar size="mini" max-height="500">
                 <el-table-column
                         align="center"
                         header-align="center"
@@ -108,20 +108,20 @@ layout("/layouts/platform.html"){
         mixins: [initTableMixins],
         data() {
             return {
-                teacherMeets:[],
+                teacherMeets: [],
                 pageForm: {
                     sessionId: ''
                 },
                 tableColumns: [
-                    {prop: 'delegationName', label: '代表团名称', sortable: true},
+                    {prop: 'unionName', label: '分工会名称', sortable: true},
-                    {prop: 'dbCount', label: '代表人数', sortable: true},
+                    {prop: 'memberCount', label: '代表人数', sortable: true},
                     {prop: 'quotaCount', label: '分配人数', sortable: true}
                 ],
                 formData: {},
                 formRules: {
                     prepareGroupQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
                     committeeQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
-                    delegationQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
+                    unionQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
                     firstTime: [{required: true, message: '必填', trigger: ['blur']}],
                     secondTime: [{required: true, message: '必填', trigger: ['blur']}]
                 }
@@ -154,9 +154,9 @@ layout("/layouts/platform.html"){
                             cancelButtonText: '取消',
                             type: 'warning'
                         }).then(async () => {
-                            const total = this.formData.delegationQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0)
+                            const total = this.formData.unionQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0)
-                            if (total > this.formData.delegationQuotaCount) {
+                            if (total > this.formData.unionQuotaCount) {
-                                this.$message.warning('各代表团名额分配数之和不能超过' + this.formData.delegationQuotaCount)
+                                this.$message.warning('各分工会名额分配数之和不能超过' + this.formData.unionQuotaCount)
                                 return
                             }
                             if (this.formData.firstTime && this.formData.firstTime.length > 1) {
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
                                 this.$set(this.formData, 'secondEndTime', this.formData.secondTime[1])
                             }
                             this.$set(this.formData, 'teacherMeetId', this.pageForm.sessionId)
-                            this.$set(this.formData, 'delegationQuotaList', JSON.stringify(this.formData.delegationQuotaList))
+                            this.$set(this.formData, 'unionQuotaList', JSON.stringify(this.formData.unionQuotaList))
                             const resp = await this.$axios.post('/platform/executiveCommittee/executiveCommitteeConfig/onHandle', this.formData)
                             if (resp.code === 0) {
                                 await this.fetchConfig()