From 8730a49c37da739e45f80eed3699afaccfc94dc7 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Thu, 19 Sep 2024 16:20:46 +0800
Subject: [PATCH] commit

---
 .../io/v/nutz/lxy/controller/LxyHdCon.java    |  38 ++-
 .../lxy/controller/LxyXghshController.java    |   1 +
 .../io/v/nutz/lxy/service/LxyMefpService.java |   2 +
 .../lxy/service/impl/LxyMefpServiceImpl.java  |  23 ++
 .../controller/review/AddZbController.java    |   9 +
 .../review/StatisticsZpController.java        |  23 +-
 .../controller/review/ViewZbController.java   |   1 +
 .../wakershome/model/review/CommentBz.java    |   2 +
 .../wakershome/model/review/CommentNr.java    |   2 +
 .../model/review/CommentUnionGrading.java     |  66 ++++
 .../impl/review/CommentZbServiceImpl.java     |  35 +++
 .../service/review/CommentZbService.java      |   1 +
 src/main/resources/docTemplate/WakesHome.docx | Bin 11507 -> 11811 bytes
 .../mobile/wakeshome/review/commentator.html  |  78 +++--
 .../platform/wakeshome/review/doReview.html   |   9 +-
 .../platform/wakeshome/review/statistics.html |  80 ++++-
 .../views/platform/zgfw/lxy/HdMange.html      | 292 +++++++++++++++---
 .../views/platform/zgfw/lxy/HdXghsh.html      |  55 ++--
 18 files changed, 591 insertions(+), 126 deletions(-)
 create mode 100644 src/main/java/io/v/nutz/wakershome/model/review/CommentUnionGrading.java

diff --git a/src/main/java/io/v/nutz/lxy/controller/LxyHdCon.java b/src/main/java/io/v/nutz/lxy/controller/LxyHdCon.java
index 7f7d406..e6675df 100644
--- a/src/main/java/io/v/nutz/lxy/controller/LxyHdCon.java
+++ b/src/main/java/io/v/nutz/lxy/controller/LxyHdCon.java
@@ -1,5 +1,7 @@
 package io.v.nutz.lxy.controller;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import cn.wizzer.framework.base.service.BaseService;
 import io.v.nutz.annontation.ViReturn;
 import io.v.nutz.base.utils.PageUtil;
@@ -11,21 +13,25 @@ import io.v.nutz.lxy.service.LxyMefpService;
 import io.v.nutz.sys.models.Sys_file;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.boot.starter.ftp.FtpService;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.entity.Record;
 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.Strings;
 import org.nutz.lang.random.R;
+import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.*;
 import org.nutz.mvc.upload.TempFile;
 import org.nutz.mvc.upload.UploadAdaptor;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -91,19 +97,22 @@ public class LxyHdCon {
 
     @At
     @POST
-    @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
     @ViReturn
+    @Aop(TransAop.READ_COMMITTED)
     @RequiresPermissions("zgfw.lxy.hdmange")
-    public Object doAdd(Lxy_hd hd, @Param(value = "files",required = false) TempFile[] files, Lxy_mefp[] mefp) throws IOException {
+    @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
+    public Object doAdd(Lxy_hd hd, @Param(value = "files",required = false) TempFile[] files,@Param(value = "mefp") String jsonStr) throws IOException {
 
         hd.setHdcjsj(new Date());
         hd = lxyHdService.insert(hd);
 
-        for (Lxy_mefp lxyMefp : mefp) {
-            lxyMefp.setHdid(hd.getId());
-            lxyMefp.setNumber(lxyMefp.getNumber() == null ? 0 : lxyMefp.getNumber());
-            lxyMefpService.insert(lxyMefp);
-        }
+        lxyMefpService.setMefp(jsonStr, hd.getId());
+
+//        for (Lxy_mefp lxyMefp : mefp) {
+//            lxyMefp.setHdid(hd.getId());
+//            lxyMefp.setNumber(lxyMefp.getNumber() == null ? 0 : lxyMefp.getNumber());
+//            lxyMefpService.insert(lxyMefp);
+//        }
 
         for (TempFile file : files) {
             String rid = R.UU32();
@@ -123,19 +132,23 @@ public class LxyHdCon {
 
     @At
     @ViReturn
+    @Aop(TransAop.READ_COMMITTED)
     @RequiresPermissions("zgfw.lxy.hdmange")
-    public Object doEditMefp(Lxy_mefp[] mefp) {
-        for (Lxy_mefp lxyMefp : mefp) {
-            baseService.dao().update("lxy_mefp", Chain.make("number", lxyMefp.getNumber()), Cnd.where("ghid", "=", lxyMefp.getGhid()).and("hdid", "=", lxyMefp.getHdid()));
-        }
+    public Object doEditMefp(@Param("mefp") String jsonStr, String hdId) {
+        lxyMefpService.dao().clear(Lxy_mefp.class, Cnd.where("hdid","=",hdId));
+        lxyMefpService.setMefp(jsonStr, hdId);
+//        for (Lxy_mefp lxyMefp : mefp) {
+//            baseService.dao().update("lxy_mefp", Chain.make("number", lxyMefp.getNumber()), Cnd.where("ghid", "=", lxyMefp.getGhid()).and("hdid", "=", lxyMefp.getHdid()));
+//        }
         return null;
     }
 
     @At
     @POST
-    @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
     @ViReturn
+    @Aop(TransAop.READ_COMMITTED)
     @RequiresPermissions("zgfw.lxy.hdmange")
+    @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
     public Object doEdit(Lxy_hd hd, @Param(value = "files",required = false) TempFile[] files, String[] delFiles) throws IOException {
         lxyHdService.updateIgnoreNull(hd);
 
@@ -163,6 +176,7 @@ public class LxyHdCon {
 
     @At
     @ViReturn
+    @Aop(TransAop.READ_COMMITTED)
     @RequiresPermissions("zgfw.lxy.hdmange")
     public Object delete(String id) {
         List<Record> files = baseService.dao().query("sys_file", Cnd.where("reid", "=", id));
diff --git a/src/main/java/io/v/nutz/lxy/controller/LxyXghshController.java b/src/main/java/io/v/nutz/lxy/controller/LxyXghshController.java
index 2b352f8..8427ad3 100644
--- a/src/main/java/io/v/nutz/lxy/controller/LxyXghshController.java
+++ b/src/main/java/io/v/nutz/lxy/controller/LxyXghshController.java
@@ -235,6 +235,7 @@ public class LxyXghshController {
     }
 
     @At
+    @Ok("void")
     @RequiresPermissions("zgfw.lxy.xghsh")
     public void downLoadAll(@Param(value = "year", required = false) Integer year,
                             @Param(value = "hdid", required = false) String hdid,
diff --git a/src/main/java/io/v/nutz/lxy/service/LxyMefpService.java b/src/main/java/io/v/nutz/lxy/service/LxyMefpService.java
index b99703e..09ede34 100644
--- a/src/main/java/io/v/nutz/lxy/service/LxyMefpService.java
+++ b/src/main/java/io/v/nutz/lxy/service/LxyMefpService.java
@@ -5,4 +5,6 @@ import io.v.nutz.lxy.model.Lxy_mefp;
 
 
 public interface LxyMefpService extends BaseService<Lxy_mefp> {
+
+    void setMefp(String jsonStr, String hdId);
 }
diff --git a/src/main/java/io/v/nutz/lxy/service/impl/LxyMefpServiceImpl.java b/src/main/java/io/v/nutz/lxy/service/impl/LxyMefpServiceImpl.java
index e7d05ab..36aee9f 100644
--- a/src/main/java/io/v/nutz/lxy/service/impl/LxyMefpServiceImpl.java
+++ b/src/main/java/io/v/nutz/lxy/service/impl/LxyMefpServiceImpl.java
@@ -1,10 +1,16 @@
 package io.v.nutz.lxy.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import cn.wizzer.framework.base.service.BaseServiceImpl;
 import io.v.nutz.lxy.model.Lxy_mefp;
 import io.v.nutz.lxy.service.LxyMefpService;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: 1V
@@ -16,4 +22,21 @@ public class LxyMefpServiceImpl extends BaseServiceImpl<Lxy_mefp> implements Lxy
     public LxyMefpServiceImpl(Dao dao) {
         super(dao);
     }
+
+
+    @Override
+    public void setMefp(String jsonStr, String hdId) {
+        if (StrUtil.isNotBlank(jsonStr)) {
+            List<NutMap> list = JSONUtil.parseArray(jsonStr).toList(NutMap.class);
+            List<Lxy_mefp> mefpList = new ArrayList<>();
+            for (NutMap map : list) {
+                Lxy_mefp mefp = new Lxy_mefp();
+                mefp.setGhid(map.getString("id"));
+                mefp.setHdid(hdId);
+                mefp.setNumber(map.getInt("limitNum"));
+                mefpList.add(mefp);
+            }
+            dao().insert(mefpList);
+        }
+    }
 }
diff --git a/src/main/java/io/v/nutz/wakershome/controller/review/AddZbController.java b/src/main/java/io/v/nutz/wakershome/controller/review/AddZbController.java
index 4e13442..1923b03 100644
--- a/src/main/java/io/v/nutz/wakershome/controller/review/AddZbController.java
+++ b/src/main/java/io/v/nutz/wakershome/controller/review/AddZbController.java
@@ -1,18 +1,26 @@
 package io.v.nutz.wakershome.controller.review;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import io.v.nutz.annontation.ViReturn;
+import io.v.nutz.sys.models.Sys_union;
 import io.v.nutz.wakershome.model.review.CommentNr;
+import io.v.nutz.wakershome.model.review.CommentUnionGrading;
 import io.v.nutz.wakershome.model.review.CommentZb;
 import io.v.nutz.wakershome.service.review.CommentZbService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.nutz.dao.Cnd;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+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 org.nutz.trans.Trans;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @ClassName addZbController
  * @Description TODO
@@ -44,6 +52,7 @@ public class AddZbController {
                 nr.getBzs().forEach(v->v.setZb_id(zb.getId()));
                 commentZbService.insertWith(nr, "bzs");
             }
+            commentZbService.setGrading(zb);
         });
         return null;
 
diff --git a/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java b/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java
index 1e0f344..5f8a098 100644
--- a/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java
+++ b/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java
@@ -1,6 +1,7 @@
 package io.v.nutz.wakershome.controller.review;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
@@ -11,10 +12,7 @@ import io.v.nutz.base.utils.Vi;
 import io.v.nutz.modules.models.PageForm;
 import io.v.nutz.sys.models.Sys_file;
 import io.v.nutz.util.ShiroUtil;
-import io.v.nutz.wakershome.model.review.CommentBz;
-import io.v.nutz.wakershome.model.review.CommentNr;
-import io.v.nutz.wakershome.model.review.CommentPeo;
-import io.v.nutz.wakershome.model.review.CommentZb;
+import io.v.nutz.wakershome.model.review.*;
 import io.v.nutz.wakershome.service.review.CommentPeoService;
 import io.v.nutz.wakershome.service.review.CommentStatisticsService;
 import io.v.nutz.wakershome.service.review.CommentZbService;
@@ -24,6 +22,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.ddr.poi.html.HtmlRenderPolicy;
 import org.nutz.boot.starter.ftp.FtpService;
+import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
@@ -91,11 +90,14 @@ public class StatisticsZpController {
                 SELECT
                 	un.id,
                 	un.unionname unionName,
+                	IFNULL(grading.gradingName,'未定级') AS gradingName,
+                 	grading.isGrading,
                 	count( peo.id ) num
                 FROM
                 	sys_union un
                 	LEFT JOIN `user` u ON u.unionId = un.id
                 	LEFT JOIN comment_peo peo ON peo.userId = u.id AND peo.zbId = @zbId
+                	LEFT JOIN comment_union_grading grading on un.id = grading.unionId AND grading.zbId = @zbId
                 $condition
                 """).setParam("zbId", zbId);
         Cnd cnd = Cnd.NEW();
@@ -413,4 +415,17 @@ public class StatisticsZpController {
 
 //        Map<String, List<CommentPeo>> collect = peoList.stream().collect(Collectors.groupingBy(CommentPeo::getUnionId));
     }
+
+
+    @At
+    @RequiresPermissions("wakeshome.review.statistics")
+    public Object doGrading(CommentUnionGrading grading){
+        if (StrUtil.isAllBlank(grading.getZbId(),grading.getUnionId(),grading.getGradingName())) {
+            return Result.error("必要参数为空");
+        }
+        commentPeoService.dao().update(CommentUnionGrading.class,
+                Chain.make("isGrading",true).add("gradingName",grading.getGradingName()).add("gradingTime", DateUtil.now()),
+                Cnd.where("zbId","=",grading.getZbId()).and("unionId","=",grading.getUnionId()));
+        return Result.success();
+    }
 }
diff --git a/src/main/java/io/v/nutz/wakershome/controller/review/ViewZbController.java b/src/main/java/io/v/nutz/wakershome/controller/review/ViewZbController.java
index f75b3f1..ff3f83e 100644
--- a/src/main/java/io/v/nutz/wakershome/controller/review/ViewZbController.java
+++ b/src/main/java/io/v/nutz/wakershome/controller/review/ViewZbController.java
@@ -151,6 +151,7 @@ public class ViewZbController {
             });
 
         }
+        commentZbService.setGrading(commentZb);
        /* for (CommentNr nr : commentZb.getNrs()) {
             nr.setZb_id(commentZb.getId());
             commentNrService.insertWith(nr, "bzs");
diff --git a/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java b/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java
index 179ea37..edd4ed1 100644
--- a/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java
+++ b/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java
@@ -2,6 +2,7 @@ package io.v.nutz.wakershome.model.review;
 
 import cn.wizzer.framework.base.model.BaseModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.nutz.dao.DB;
 import org.nutz.dao.entity.annotation.*;
 
@@ -13,6 +14,7 @@ import org.nutz.dao.entity.annotation.*;
  */
 @Data
 @Table
+@EqualsAndHashCode(callSuper = true)
 public class CommentBz extends BaseModel {
 
     @Column
diff --git a/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java b/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java
index 65df940..49d1509 100644
--- a/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java
+++ b/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java
@@ -2,6 +2,7 @@ package io.v.nutz.wakershome.model.review;
 
 import cn.wizzer.framework.base.model.BaseModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.nutz.dao.DB;
 import org.nutz.dao.entity.annotation.*;
 
@@ -15,6 +16,7 @@ import java.util.List;
  */
 @Data
 @Table
+@EqualsAndHashCode(callSuper = true)
 public class CommentNr extends BaseModel {
 
 
diff --git a/src/main/java/io/v/nutz/wakershome/model/review/CommentUnionGrading.java b/src/main/java/io/v/nutz/wakershome/model/review/CommentUnionGrading.java
new file mode 100644
index 0000000..1a4450b
--- /dev/null
+++ b/src/main/java/io/v/nutz/wakershome/model/review/CommentUnionGrading.java
@@ -0,0 +1,66 @@
+package io.v.nutz.wakershome.model.review;
+
+import io.v.nutz.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.Date;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：CommentUnionGrading
+ * @Date 2024/9/19 8:48
+ * @注释 校工会给分工会定级
+ */
+@Data
+@Table
+@Comment("校工会给分工会定级表")
+@EqualsAndHashCode(callSuper = true)
+public class CommentUnionGrading extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @Comment("考核指标id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String zbId;
+
+    @Column
+    @Comment("定级的分工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("分工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unionName;
+
+    @Column
+    @Comment("分工会编码")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionCode;
+
+    @Column
+    @Comment("定级的名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String gradingName;
+
+    @Column
+    @Default("0")
+    @Comment("是否定级")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isGrading;
+
+    @Column
+    @Comment("定级时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date gradingTime;
+
+}
diff --git a/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java b/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java
index 75bd5df..b4a5382 100644
--- a/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java
+++ b/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java
@@ -1,9 +1,12 @@
 package io.v.nutz.wakershome.service.impl.review;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import io.v.nutz.service.impl.ViServiceImpl;
+import io.v.nutz.sys.models.Sys_union;
 import io.v.nutz.wakershome.model.review.CommentBz;
 import io.v.nutz.wakershome.model.review.CommentNr;
+import io.v.nutz.wakershome.model.review.CommentUnionGrading;
 import io.v.nutz.wakershome.model.review.CommentZb;
 import io.v.nutz.wakershome.service.review.CommentNrService;
 import io.v.nutz.wakershome.service.review.CommentZbService;
@@ -11,7 +14,9 @@ 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.random.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,4 +49,34 @@ public class CommentZbServiceImpl extends ViServiceImpl<CommentZb> implements Co
         return zb;
     }
 
+
+    @Override
+    public void setGrading(CommentZb commentZb) {
+        int count = dao().count(CommentUnionGrading.class, Cnd.where("zbId", "=", commentZb.getId()));
+        if (count > 0) {
+            dao().clear(CommentUnionGrading.class, Cnd.where("zbId", "=", commentZb.getId()));
+        }
+
+        if (ObjectUtil.isNotNull(commentZb.getCommentTarget()) && commentZb.getCommentTarget() != 1) {
+            List<Sys_union> query = new ArrayList<>();
+            if (commentZb.getCommentTarget() == 2) {
+                query = dao().query(Sys_union.class, Cnd.NEW());
+            } else if (commentZb.getCommentTarget() == 3) {
+                query = dao().query(Sys_union.class, Cnd.where("id", "in", commentZb.getUnionIds()));
+            }
+            List<CommentUnionGrading> commentUnionGradings = new ArrayList<>();
+            for (Sys_union union : query) {
+                CommentUnionGrading unionGrading = new CommentUnionGrading();
+                unionGrading.setId(R.UU32());
+                unionGrading.setUnionId(union.getId());
+                unionGrading.setZbId(commentZb.getId());
+                unionGrading.setUnionName(union.getUnionname());
+                unionGrading.setUnionCode(union.getUnioncode());
+                unionGrading.setIsGrading(false);
+                unionGrading.setGradingTime(null);
+                commentUnionGradings.add(unionGrading);
+            }
+            dao().insert(commentUnionGradings);
+        }
+    }
 }
diff --git a/src/main/java/io/v/nutz/wakershome/service/review/CommentZbService.java b/src/main/java/io/v/nutz/wakershome/service/review/CommentZbService.java
index 19f50c9..c88453c 100644
--- a/src/main/java/io/v/nutz/wakershome/service/review/CommentZbService.java
+++ b/src/main/java/io/v/nutz/wakershome/service/review/CommentZbService.java
@@ -8,4 +8,5 @@ public interface CommentZbService extends ViService<CommentZb> {
 
     CommentZb khzb(String zbid);
 
+    void setGrading(CommentZb zb);
 }
diff --git a/src/main/resources/docTemplate/WakesHome.docx b/src/main/resources/docTemplate/WakesHome.docx
index 42c097ffc46484e5bc5333b4f396841232149dbc..537073bcb2dca100b78500b16ba99bbb60a17751 100644
GIT binary patch
delta 5378
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
WPAK|?pbSn0dQgxTUxEK0)PDh7w#aY*

delta 5065
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%0A9y1Uh!YZmg(zvPMJopbeERTvyDD45*Mv7Vldgt
zjzU1hc^wW9z&6bzl8Q4gcuwed?vIfN?{B=ZH==}1WiWrXPcol}m_Byi1w8HIF3X`O
zNzBZEyj^sH_IH13oRFO$BA2KmucaB6Mq5OEuW-5#*gRmBybn5-@R^1Im@d_z#0z9E
zVvwDC{uL>iSj>AQlN9Op<q0WSx72`tK8tG;d_d#+%4e(2YI=s=!xv+hHM90D?^$@%
z30buIORsj|Lf_Bq$HxWb;AhYKJEN8D@JFnE*WVyE?2^#2UuKe5x#RBiIkzN~%F;fe
z|NSR%{y-DJAC!`YN6^a4B8-L-$eQ5*kwn>N%BY3#qu?-SY(jMYC0rR|9D>yU3tj$J
z00QX$>}?qd985HSV*<z@C`0@Q%8>q@{ImYabD(CZqmpH8b3lO68MvJMD7-8glAOXQ
zhAbKWoZQs^+uQ&9Fe9U%lZocPZR7uR|6f>%;g5+hQU41g{uvJb6==wi;*tQ?WWc$^
Wfm|8gTp~cdjB74741D&#@B9ap9zBi#

diff --git a/src/main/resources/views/mobile/wakeshome/review/commentator.html b/src/main/resources/views/mobile/wakeshome/review/commentator.html
index 4043069..fecd31f 100644
--- a/src/main/resources/views/mobile/wakeshome/review/commentator.html
+++ b/src/main/resources/views/mobile/wakeshome/review/commentator.html
@@ -3,7 +3,7 @@ layout("/mobile/platform.html"){
 #-->
 <style>
     .van-doc-card {
-        margin: 14px;
+        margin: 5px;
         padding: 6px;
         background-color: #fff;
         border-radius: 10px;
@@ -78,7 +78,9 @@ layout("/mobile/platform.html"){
                                         {{item.contentNumber}}、{{item.inspection}}
                                     </div>
                                     <van-row>
-                                        <div style="font-size: 15px;text-align: right;margin-right: 30px;margin-bottom:-4px">标准分:{{item.score}}</div>
+                                        <div style="font-size: 15px;text-align: right;margin-right: 30px;margin-bottom:-4px">
+                                            标准分:{{item.score}}
+                                        </div>
                                     </van-row>
                                     <van-field
                                             v-model="item.resultScore"
@@ -98,7 +100,7 @@ layout("/mobile/platform.html"){
                                 <van-field v-model="o.remark"
                                            name="备注" label="备注"
                                            required rows="3" type="textarea"
-                                           autosize  show-word-limit
+                                           autosize show-word-limit
                                            maxlength="300"
                                            placeholder="请填写备注"
                                            :readonly="isReadOnly"
@@ -107,7 +109,8 @@ layout("/mobile/platform.html"){
                         </van-collapse-item>
                     </div>
                     <div v-if="commentatorData.reviewMode == 1" class="content_div">
-                        <van-field name="files" label="职工评家总结" required style="flex-flow: column" input-align="left">
+                        <van-field name="files" label="职工评家总结" required style="flex-flow: column"
+                                   input-align="left">
                             <template #label>
                                 <div class="mb10">职工评家总结</div>
                             </template>
@@ -120,28 +123,35 @@ layout("/mobile/platform.html"){
 
                 <div v-if="commentatorData.scoringMode==2">
 
-                    <div class="search-fixed">
+                    <div class="search-fixed" style="margin: 0px auto 60px auto" v-if="commentatorData.assessmentMode == 2">
                         <van-dropdown-menu active-color="#1989fa">
                             <van-dropdown-item v-model="president" :options="presidentList"
                                                @change="presidentChange"></van-dropdown-item>
                         </van-dropdown-menu>
                     </div>
 
-                    <div v-for="o in commentatorData.nrs" style="margin: 60px auto 0 auto">
-                        <div v-for="item in o.bzs">
-                            <div class="van-doc-card">
-                                <div style="font-size: 15px;color: black">{{item.contentNumber}}、{{item.inspection}}
+                    <div>
+                        <div v-for="o in commentatorData.nrs">
+                            <van-collapse-item :title="o.content" :name="o.id" style="margin: 5px">
+                                <div v-for="item in o.bzs">
+                                    <div class="van-doc-card">
+                                        <div style="font-size: 15px;color: black">
+                                            {{item.contentNumber}}、{{item.inspection}}
+                                        </div>
+                                        <van-field name="radio" style="padding: 12px 2px;margin: 5px">
+                                            <template #input>
+                                                <van-radio-group v-model="item.resultScore" :disabled="isReadOnly"
+                                                                 direction="horizontal">
+                                                    <van-radio name="非常满意">非常满意</van-radio>
+                                                    <van-radio name="满意">满意</van-radio>
+                                                    <van-radio name="良好">良好</van-radio>
+                                                    <van-radio name="一般">一般</van-radio>
+                                                </van-radio-group>
+                                            </template>
+                                        </van-field>
+                                    </div>
                                 </div>
-                                <van-field name="radio" label="满意度" style="padding: 12px 2px;margin: 5px">
-                                    <template #input>
-                                        <van-radio-group style="margin-left: -20px" v-model="item.resultScore" :disabled="isReadOnly" direction="horizontal">
-                                            <van-radio name="满意">满意</van-radio>
-                                            <van-radio name="基本满意">基本满意</van-radio>
-                                            <van-radio name="不满意">不满意</van-radio>
-                                        </van-radio-group>
-                                    </template>
-                                </van-field>
-                            </div>
+                            </van-collapse-item>
                         </div>
                     </div>
                     <div class="van-doc-card">
@@ -163,8 +173,11 @@ layout("/mobile/platform.html"){
 
     <div>
         <van-tabbar>
-            <van-button id="buttonAss" :disabled="isShowSubmit" round block type="info" @click="showAssess">查看测评结果</van-button>
-            <van-button id="buttonSub" :disabled="isShowSubmit" round block type="info" @click="onSubmit">提交</van-button>
+            <van-button id="buttonAss" :disabled="isShowSubmit" round block type="info" @click="showAssess">
+                查看测评结果
+            </van-button>
+            <van-button id="buttonSub" :disabled="isShowSubmit" round block type="info" @click="onSubmit">提交
+            </van-button>
         </van-tabbar>
     </div>
 
@@ -183,10 +196,10 @@ layout("/mobile/platform.html"){
                 bzList: [],
                 president: '',
                 presidentList: [],
-                userList:[],
+                userList: [],
                 isShowSubmit: false,
-                isReadOnly:false,
-                formData:{
+                isReadOnly: false,
+                formData: {
                     id: '',
                     reviewResult: '',
                     presidentOpinions: '',
@@ -201,7 +214,7 @@ layout("/mobile/platform.html"){
                     assessmentFiles: [],
                     assessmentNrs: [],
                     assessmentReviewMode: '',
-                    assessmentScoringMode:'',
+                    assessmentScoringMode: '',
                 }
             }
         },
@@ -226,7 +239,10 @@ layout("/mobile/platform.html"){
                 this.bzList = [];
                 this.commentatorData.nrs.forEach(v => {
                     v.bzs.forEach(o => {
-                        if (self.commentatorData.assessmentMode === 1 && v.remark){
+                        if (self.commentatorData.assessmentMode === 1 && v.remark) {
+                            if (!o.resultScore) {
+                                return
+                            }
                             o.options = v.remark
                         }
                         self.bzList.push(o)
@@ -241,8 +257,8 @@ layout("/mobile/platform.html"){
                     })
                     await this.assignment();
 
-                    let evaluatedPersonName=null;
-                    let evaluatedPersonType=null;
+                    let evaluatedPersonName = null;
+                    let evaluatedPersonType = null;
 
                     if (this.commentatorData.assessmentMode === 1) {
                         let source = 0; // 标准分
@@ -272,7 +288,7 @@ layout("/mobile/platform.html"){
                             this.reviewResult = '不满意'
                         }
 
-                        const user = this.userList.find(v=> v.id === this.president)
+                        const user = this.userList.find(v => v.id === this.president)
                         evaluatedPersonName = user.username
                         evaluatedPersonType = user.evaluatedPersonType
                     }
@@ -291,9 +307,9 @@ layout("/mobile/platform.html"){
                     if (resp.code === 0) {
                         await this.getCommentById();
                         vant.Toast.success('操作成功')
-                        setTimeout(()=>{
+                        setTimeout(() => {
                             window.location.href = '/mobile/wakeshome/review/appraisal/mine'
-                        },500)
+                        }, 500)
                     }
                 })
             },
diff --git a/src/main/resources/views/platform/wakeshome/review/doReview.html b/src/main/resources/views/platform/wakeshome/review/doReview.html
index a0c0048..210e5c8 100644
--- a/src/main/resources/views/platform/wakeshome/review/doReview.html
+++ b/src/main/resources/views/platform/wakeshome/review/doReview.html
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
                             <template v-if="!scope.row.isReview">
                                 <el-tooltip content="评议页面的提交按钮在右上角哦" placement="top">
                                     <el-button size="mini" type="primary" @click="doReview(scope.row)">
-                                        去评议
+                                        自评
                                     </el-button>
                                 </el-tooltip>
                             </template>
@@ -123,7 +123,7 @@ layout("/layouts/platform.html"){
             <el-form :model="formData" ref="form" label-width="100px"
                      style="height: calc(100vh - 50px);overflow-y: scroll;padding: 10px 15px">
 
-                <template v-if="formData.scoringMode==2">
+                <template v-if="formData.assessmentMode==2">
                     <vi-title title="评议对象选择"></vi-title>
                     <el-row>
                         <el-col :span="12">
@@ -189,9 +189,10 @@ layout("/layouts/platform.html"){
                                                  align="center" width="350px">
                                     <template slot-scope="{row}">
                                         <el-radio-group v-model="row.resultScore" size="small">
+                                            <el-radio label="非常满意">非常满意</el-radio>
                                             <el-radio label="满意">满意</el-radio>
-                                            <el-radio label="基本满意">基本满意</el-radio>
-                                            <el-radio label="不满意">不满意</el-radio>
+                                            <el-radio label="良好">良好</el-radio>
+                                            <el-radio label="一般">一般</el-radio>
                                         </el-radio-group>
                                     </template>
                                 </el-table-column>
diff --git a/src/main/resources/views/platform/wakeshome/review/statistics.html b/src/main/resources/views/platform/wakeshome/review/statistics.html
index e6b43ef..c7f62b3 100644
--- a/src/main/resources/views/platform/wakeshome/review/statistics.html
+++ b/src/main/resources/views/platform/wakeshome/review/statistics.html
@@ -76,11 +76,25 @@ layout("/layouts/platform.html"){
                         :sortable="column.sortable"
                         :label="column.label"
                         :prop="column.prop" :width="column.width" min-width="100px">
+                    <template v-if="column.prop=='isGrading'" scope="{row}">
+                        <el-tag v-if="row.isGrading" type="success">是</el-tag>
+                        <el-tag v-else type="danger">否</el-tag>
+                    </template>
                 </el-table-column>
                 <el-table-column prop="userOnline" align="center" header-align="center" label="操作"
-                                 width="240px" fixed="right">
+                                 width="380px" fixed="right">
                     <template scope="{row}">
                         <el-button size="mini" @click="openView(row)">查看</el-button>
+                        <el-button
+                                v-if="!row.isGrading && row.num > 0 && ${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}"
+                                size="mini" type="primary"
+                                @click="openGrading(row)">定级
+                        </el-button>
+                        <el-button
+                                v-if="row.isGrading && row.num > 0 && ${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}"
+                                size="mini" type="primary"
+                                @click="editGrading(row)">修改定级
+                        </el-button>
                         <el-tooltip
                                 :content="canDownload ? ('导出【'+ row.unionName +'】管理员自我评议的评议结果') : ('导出【'+ row.unionName +'】下所有评议结果的压缩包') "
                                 placement="top">
@@ -185,6 +199,26 @@ layout("/layouts/platform.html"){
     <el-dialog title="评议结果" :visible.sync="userDrawer" close-on-press-escape>
         <wakes-home-review ref="wakesHomeReview"></wakes-home-review>
     </el-dialog>
+
+
+    <el-dialog :title="gradingTitle" :visible.sync="gradingDialog" width="40%" :close-on-press-escape="false">
+        <el-form :model="gradingData" ref="gradingForm" :rules="gradingRules" label-width="120px">
+            <el-form-item prop="zbName" label="评测名称">
+                <el-input readonly v-model="gradingData.zbName"></el-input>
+            </el-form-item>
+            <el-form-item prop="unionName" label="定级分工会">
+                <el-input readonly v-model="gradingData.unionName"></el-input>
+            </el-form-item>
+            <el-form-item prop="gradingName" label="定级结果">
+                <dict-select v-model="gradingData.gradingName" style="width: 100%" clearable
+                             placeholder="请选择定级结果" code="GRADING_TYPE"></dict-select>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="gradingDialog = false">取 消</el-button>
+            <el-button type="primary" @click="doGrading">确 定</el-button>
+        </span>
+    </el-dialog>
 </div>
 
 
@@ -216,6 +250,8 @@ layout("/layouts/platform.html"){
                 tableColumns: [
                     {prop: 'unionName', label: '分工会名称'},
                     {prop: 'num', label: '测评人数'},
+                    {prop: 'isGrading', label: '是否定级'},
+                    {prop: 'gradingName', label: '定级结果'},
                 ],
                 tableData: [],
                 userTableData: [],
@@ -235,13 +271,53 @@ layout("/layouts/platform.html"){
                     pageOrderName: "",
                     pageOrderBy: ""
                 },
-                reviewResultData: {}
+                reviewResultData: {},
+
+                gradingDialog: false,
+                gradingTitle: '',
+                gradingData: {
+                    unionName: '',
+                    unionId: '',
+                    zbId: '',
+                    zbName: '',
+                },
+                gradingRules: {
+                    gradingName: [ {required: true, message: '请选择定级结果', trigger: 'blur'} ]
+                }
             }
         },
         components: {
             'wakes-home-review': httpVueLoader('/components/wakeshome/review/ReviewResult.vue?v=' + moment(new Date()).unix()),
+            'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=' + moment(new Date()).unix()),
         },
         methods: {
+            editGrading(row) {
+                this.gradingData = {...row}
+                this.$set(this.gradingData, 'zbId', this.pageForm.zbId)
+                this.$set(this.gradingData, 'zbName', this.zbList.find(v => v.id === this.pageForm.zbId).assessment)
+                this.gradingDialog = true
+            },
+            doGrading() {
+                this.$refs['gradingForm'].validate(async (valid) => {
+                    if (valid) {
+                        const resp = await $.post(loc() + '/doGrading', this.gradingData)
+                        if (resp.code === 0) {
+                            this.gradingDialog = false
+                            this.pageData()
+                            this.$message.success(resp.msg)
+                        } else {
+                            this.$message.warning(resp.msg)
+                        }
+                    }
+                })
+            },
+            openGrading(row) {
+                this.$set(this.gradingData, 'unionId', row.id)
+                this.$set(this.gradingData, 'unionName', row.unionName)
+                this.$set(this.gradingData, 'zbId', this.pageForm.zbId)
+                this.$set(this.gradingData, 'zbName', this.zbList.find(v => v.id === this.pageForm.zbId).assessment)
+                this.gradingDialog = true
+            },
             doDownLoad(row, flag) {
                 if (flag) {
                     // 为true，自我评议
diff --git a/src/main/resources/views/platform/zgfw/lxy/HdMange.html b/src/main/resources/views/platform/zgfw/lxy/HdMange.html
index 027154c..01b9876 100644
--- a/src/main/resources/views/platform/zgfw/lxy/HdMange.html
+++ b/src/main/resources/views/platform/zgfw/lxy/HdMange.html
@@ -271,9 +271,86 @@ layout("/layouts/platform.html"){
                                 </div>
                             </transition>
                             <transition name="el-zoom-in-bottom">
-                                <div class="transition-box" style="margin-top: 20px;"
-                                     v-show="stepActive==1">
-                                    <div class="pull-right offscreen-right mt5">
+                                <div class="transition-box" style="margin-top: 20px;" v-show="stepActive==1">
+                                    <vi-title2 title="分段设置">
+                                        <template #func>
+                                            <el-button size="small" type="primary" @click="unionLimitQuickSetting">
+                                                应用分段设置
+                                            </el-button>
+                                        </template>
+                                    </vi-title2>
+                                    <el-row v-for="(item,index) in unionUserNumCalc" :gutter="20" class="mb5">
+                                        <el-col :span="7">
+                                            <el-input-number v-model="item.startNum" :precision="0" :step="1" :min="1"
+                                                             placeholder="请输入最小人数"
+                                                             style="width: 100%"></el-input-number>
+                                        </el-col>
+                                        <el-col :span="7">
+                                            <el-input-number v-model="item.endNum" :precision="0" :step="1" :min="1"
+                                                             placeholder="请输入最大人数"
+                                                             style="width: 100%"></el-input-number>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <el-input-number v-model="item.resultNum" :precision="0" :step="1" :min="1"
+                                                             placeholder="请输入限制人数"
+                                                             style="width: 100%"></el-input-number>
+                                        </el-col>
+                                        <el-col :span="4" class="text-right">
+                                            <el-button icon="el-icon-plus"
+                                                       @click="unionUserNumCalc.push({})"></el-button>
+                                            <el-button icon="el-icon-minus" @click="unionUserNumCalc.splice(index,1)"
+                                                       :disabled="unionUserNumCalc.length===1"></el-button>
+                                        </el-col>
+                                    </el-row>
+                                    <el-row class="mt10">
+                                        <div v-for="(item,index) in unionUserNumCalcTips" class="text-danger">
+                                            <span class="mr10">({{index+1}}).</span> {{item}}
+                                        </div>
+                                    </el-row>
+
+                                    <vi-title2 title="比例设置" class="mt20">
+                                        <template #func>
+                                            一键比例：
+                                            <el-input-number v-model="unionUserNumOneKeyRatio" :precision="0" :step="1"
+                                                             :min="0"
+                                                             placeholder="请输入一键比例"
+                                                             size="small"
+                                                             :max="100"></el-input-number>
+                                            <el-button size="small" type="primary" @click="applyScaleSettings"
+                                                       class="ml5">应用比例设置
+                                            </el-button>
+                                        </template>
+                                    </vi-title2>
+                                    <el-table :data="unionUserNumberLimit" max-height="500px">
+                                        <el-table-column prop="unionname" label="分工会"></el-table-column>
+                                        <el-table-column prop="teacherCount" label="人数"></el-table-column>
+                                        <el-table-column prop="ratio" label="比例(%)">
+                                            <template scope="{row}">
+                                                <el-input-number v-model="row.ratio" :precision="0" :step="1" :min="0"
+                                                                 :max="100"></el-input-number>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column prop="limitNum" label="限制人数">
+                                            <template scope="{row}">
+                                                <el-input-number v-model="row.limitNum" :precision="0" :step="1"
+                                                                 :min="0"
+                                                                 :max="row.teacherCount"
+                                                                 @change="calSummaryCount"></el-input-number>
+                                            </template>
+                                        </el-table-column>
+                                    </el-table>
+
+                                    <el-row class="mt20" justify="end" type="flex">
+                                        <div class="text-danger"
+                                             style="width: 100%;font-size: 18px;display: flex;align-items: center;font-weight: bold">
+                                            限制总人数：{{summaryCount}}人
+                                        </div>
+                                       <el-button @click="clearUnionLimit" type="danger">清空分工会人数限制</el-button>
+                                       <!--<el-button @click="setUpUnionLimitDialog=false">取消</el-button>-->
+                                       <!--<el-button @click="doConfirmSetUpUnionLimit" type="primary">确定</el-button>-->
+                                    </el-row>
+
+                                    <!--<div class="pull-right offscreen-right mt5">
                                         <span style="color:#409EFF">沿用之前活动名额&nbsp;&nbsp;</span>
                                         <el-select @change="mefpChange" class="d-select" clearable
                                                    filterable
@@ -313,7 +390,7 @@ layout("/layouts/platform.html"){
                                                                  v-model="scope.row.number"></el-input-number>
                                             </template>
                                         </el-table-column>
-                                    </el-table>
+                                    </el-table>-->
 
                                     <div style="float: right;margin: 20px 0">
                                         <el-button @click="stepActive=0">上一步</el-button>
@@ -416,59 +493,93 @@ layout("/layouts/platform.html"){
                                     </el-form>
                                     <div style="float: right;margin: 20px 0">
                                         <el-button :disabled="subDis" @click="doEdit()"
-                                                   type="primary">修 改
+                                                   type="primary">修改基础数据
                                         </el-button>
                                     </div>
                                 </el-tab-pane>
                                 <el-tab-pane label="名额分配" name="2">
-                                    <el-form label-width="120px">
-                                        <vi-title title="修改名额分配"></vi-title>
-                                        <div class="pull-right offscreen-right mt5">
-                                            <span style="color:#409EFF">沿用之前活动名额&nbsp;&nbsp;</span>
-                                            <el-select @change="mefpChange" class="d-select"
-                                                       clearable filterable
-                                                       placeholder="请选择活动"
-                                                       v-model="pastQuota" width="300px">
-                                                <el-option
-                                                        :key="item.id"
-                                                        :label="item.name"
-                                                        :value="item.id"
-                                                        v-for="item in lxyHd">
-                                                </el-option>
-                                            </el-select>
+                                    <vi-title2 title="分段设置">
+                                        <template #func>
+                                            <el-button size="small" type="primary" @click="unionLimitQuickSetting">
+                                                应用分段设置
+                                            </el-button>
+                                        </template>
+                                    </vi-title2>
+                                    <el-row v-for="(item,index) in unionUserNumCalc" :gutter="20" class="mb5">
+                                        <el-col :span="7">
+                                            <el-input-number v-model="item.startNum" :precision="0" :step="1" :min="1"
+                                                             placeholder="请输入最小人数"
+                                                             style="width: 100%"></el-input-number>
+                                        </el-col>
+                                        <el-col :span="7">
+                                            <el-input-number v-model="item.endNum" :precision="0" :step="1" :min="1"
+                                                             placeholder="请输入最大人数"
+                                                             style="width: 100%"></el-input-number>
+                                        </el-col>
+                                        <el-col :span="6">
+                                            <el-input-number v-model="item.resultNum" :precision="0" :step="1" :min="1"
+                                                             placeholder="请输入限制人数"
+                                                             style="width: 100%"></el-input-number>
+                                        </el-col>
+                                        <el-col :span="4" class="text-right">
+                                            <el-button icon="el-icon-plus"
+                                                       @click="unionUserNumCalc.push({})"></el-button>
+                                            <el-button icon="el-icon-minus" @click="unionUserNumCalc.splice(index,1)"
+                                                       :disabled="unionUserNumCalc.length===1"></el-button>
+                                        </el-col>
+                                    </el-row>
+                                    <el-row class="mt10">
+                                        <div v-for="(item,index) in unionUserNumCalcTips" class="text-danger">
+                                            <span class="mr10">({{index+1}}).</span> {{item}}
                                         </div>
-                                    </el-form>
-                                    <el-table :data="unions_" height="70vh" size="medium">
-                                        <el-table-column align="center" header-align="center"
-                                                         label="序号"
-                                                         type="index"></el-table-column>
+                                    </el-row>
 
-                                        <el-table-column label="分工会" prop="unionname" sortable>
+                                    <vi-title2 title="比例设置" class="mt20">
+                                        <template #func>
+                                            一键比例：
+                                            <el-input-number v-model="unionUserNumOneKeyRatio" :precision="0" :step="1"
+                                                             :min="0"
+                                                             placeholder="请输入一键比例"
+                                                             size="small"
+                                                             :max="100"></el-input-number>
+                                            <el-button size="small" type="primary" @click="applyScaleSettings"
+                                                       class="ml5">应用比例设置
+                                            </el-button>
+                                        </template>
+                                    </vi-title2>
+                                    <el-table :data="unionUserNumberLimit" max-height="500px">
+                                        <el-table-column prop="unionname" label="分工会"></el-table-column>
+                                        <el-table-column prop="teacherCount" label="人数"></el-table-column>
+                                        <el-table-column prop="ratio" label="比例(%)">
                                             <template scope="{row}">
-                                                {{isDisPlayCode?'（'+row.unioncode+'）':null}}{{row.unionname}}
+                                                <el-input-number v-model="row.ratio" :precision="0" :step="1" :min="0"
+                                                                 :max="100"></el-input-number>
                                             </template>
                                         </el-table-column>
-
-                                        <el-table-column label="会员人数" prop="membercount"
-                                                         sortable></el-table-column>
-
-                                        <el-table-column align="center" header-align="center"
-                                                         label="名额" prop="number"
-                                                         width="200px">
-                                            <template scope="scope">
-                                                <el-input-number :max="1000"
+                                        <el-table-column prop="limitNum" label="限制人数">
+                                            <template scope="{row}">
+                                                <el-input-number v-model="row.limitNum" :precision="0" :step="1"
                                                                  :min="0"
-                                                                 controls-position="right"
-                                                                 placeholder="请填写名额数"
-                                                                 v-model="scope.row.number"></el-input-number>
+                                                                 :max="row.teacherCount"
+                                                                 @change="calSummaryCount"></el-input-number>
                                             </template>
                                         </el-table-column>
                                     </el-table>
 
+                                    <el-row class="mt20" justify="end" type="flex">
+                                        <div class="text-danger"
+                                             style="width: 100%;font-size: 18px;display: flex;align-items: center;font-weight: bold">
+                                            限制总人数：{{summaryCount}}人
+                                        </div>
+                                        <el-button @click="clearUnionLimit" type="danger">清空分工会人数限制</el-button>
+                                        <!--<el-button @click="setUpUnionLimitDialog=false">取消</el-button>-->
+                                        <!--<el-button @click="doConfirmSetUpUnionLimit" type="primary">确定</el-button>-->
+                                    </el-row>
+
                                     <div style="float: right;margin: 20px 0">
 
                                         <el-button :disabled="subDis" @click="doEditMefp"
-                                                   type="primary">提 交
+                                                   type="primary">修改名额分配
                                         </el-button>
                                     </div>
                                 </el-tab-pane>
@@ -501,6 +612,10 @@ layout("/layouts/platform.html"){
                 }
             };
             return {
+                summaryCount: 0,
+                unionUserNumCalc: [{}],
+                unionUserNumOneKeyRatio: null,
+                unionUserNumberLimit: [],
                 pastQuota: "",
                 tabs_active: '1',
                 unions: [],
@@ -541,7 +656,7 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
-            mefpChange() {
+            /*mefpChange() {
                 if (this.pastQuota === '') {
                     this.unions_ = this.unions.map(v => {
                         const o = {
@@ -558,7 +673,7 @@ layout("/layouts/platform.html"){
                 $.post(base + "/platform/zgfw/lxy/hd/getPastQuota", {pastQuota: this.pastQuota}, res => {
                     this.unions_ = res.data
                 })
-            },
+            },*/
             doEditMefp() {
                 const loading = this.$loading({
                     lock: true,
@@ -567,7 +682,10 @@ layout("/layouts/platform.html"){
                     background: 'rgba(0, 0, 0, 0.7)'
                 });
 
-                $.post(base + "/platform/zgfw/lxy/hd/doEditMefp", {mefp: JSON.stringify(this.unions_)}, (data) => {
+                $.post(base + "/platform/zgfw/lxy/hd/doEditMefp", {
+                    mefp: JSON.stringify(this.unionUserNumberLimit),
+                    hdId: this.id
+                }, (data) => {
                     loading.close()
                     if (data.code == 0) {
                         this.v = 'index'
@@ -703,7 +821,8 @@ layout("/layouts/platform.html"){
                     }
                 });
             },
-            openEdit(id) {
+            async openEdit(id) {
+                this.id = id
                 this.pastQuota = ""
                 this.fileList = []
                 this.delFiles = []
@@ -754,6 +873,20 @@ layout("/layouts/platform.html"){
 
                     this.loading = false
                 }, "json");
+
+                this.unionUserNumberLimit = []
+                this.unionUserNumOneKeyRatio = null
+                this.unionUserNumCalc = [{}]
+                // this.summaryCount = 0
+                await this.getLimitUnionData()
+
+                this.unionUserNumberLimit.forEach(v=>{
+                    v.limitNum = this.unions_.find(item=>item.ghid===v.id).number
+                })
+                this.summaryCount = this.unionUserNumberLimit.reduce((accumulator, currentObject) => {
+                    return accumulator + currentObject.limitNum;
+                }, 0);
+
             },
             doDelete(id) {
                 this.$confirm('确定要删除吗？', '提示', {
@@ -798,7 +931,7 @@ layout("/layouts/platform.html"){
                             formdata.append("files", val.raw, val.raw.name);
                         });
                         //const unions_ = this.unions_.filter(v => v.number)
-                        formdata.append('mefp', JSON.stringify(this.unions_))
+                        formdata.append('mefp', JSON.stringify(this.unionUserNumberLimit))
 
                         this.subDis = true
                         const loading = this.$loading({
@@ -872,6 +1005,11 @@ layout("/layouts/platform.html"){
                 if (this.$refs['form']) {
                     this.$refs['form'].resetFields()
                 }
+                this.unionUserNumberLimit = []
+                this.unionUserNumOneKeyRatio = null
+                this.unionUserNumCalc = [{}]
+                this.summaryCount = 0
+                this.getLimitUnionData()
             },
             doSearch() {
                 this.tabKey = new Date().getTime()
@@ -908,6 +1046,70 @@ layout("/layouts/platform.html"){
                     }
                 }, "json");
             },
+            applyScaleSettings() {
+                this.unionUserNumberLimit.forEach(v => {
+                    v.limitNum = parseFloat((v.teacherCount * this.unionUserNumOneKeyRatio / 100).toFixed(0))
+                    if (v.ratio) {
+                        v.limitNum = parseFloat((v.teacherCount * v.ratio / 100).toFixed(0))
+                    }
+                })
+                this.calSummaryCount()
+            },
+            calSummaryCount() {
+                const array = this.unionUserNumberLimit
+                if (array) {
+                    this.summaryCount = array.reduce((prev, curr) => {
+                        const value = Number(curr.limitNum);
+                        if (!isNaN(value)) {
+                            return prev + curr.limitNum;
+                        } else {
+                            return prev;
+                        }
+                    }, 0)
+                }
+            },
+            unionLimitQuickSetting() {
+                this.unionUserNumCalc.forEach((v, i) => {
+                    const startNum = v.startNum
+                    const endNum = v.endNum
+                    const resultNum = v.resultNum
+                    if (startNum > endNum) {
+                        this.$message.warning('第' + (i + 1) + '行设置错误')
+                    } else {
+                        this.unionUserNumberLimit.forEach(x => {
+                            if (x.teacherCount >= startNum && x.teacherCount <= endNum) {
+                                x.limitNum = resultNum
+                            }
+                        })
+                        this.calSummaryCount()
+                    }
+                })
+            },
+            async clearUnionLimit(){
+                const confirm = await this.$confirm('确定要清空分工会人数限制吗, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                })
+                if ('confirm' === confirm) {
+                    this.unionUserNumberLimit = []
+                    this.unionUserNumOneKeyRatio = null
+                    this.unionUserNumCalc = [{}]
+                    this.summaryCount = 0
+                    await this.getLimitUnionData()
+                }
+            },
+            async getLimitUnionData() {
+                const resp = await $.get('/platform/trainSingUp/manage/activity/getUnionLimit')
+                this.unionUserNumberLimit = resp.data
+            }
+        },
+        computed: {
+            unionUserNumCalcTips() {
+                return this.unionUserNumCalc.map(v => {
+                    return (v.startNum ? v.startNum : '?') + '-' + (v.endNum ? v.endNum : '?') + '人的分工会，限报' + (v.resultNum ? v.resultNum : '?') + '人'
+                })
+            },
         },
         async created() {
             const unions_resp = await $.get(loc() + '/getUnions')
diff --git a/src/main/resources/views/platform/zgfw/lxy/HdXghsh.html b/src/main/resources/views/platform/zgfw/lxy/HdXghsh.html
index 035a1c8..8695ffe 100644
--- a/src/main/resources/views/platform/zgfw/lxy/HdXghsh.html
+++ b/src/main/resources/views/platform/zgfw/lxy/HdXghsh.html
@@ -470,45 +470,44 @@ display: -webkit-box;
             async yjTg() {
                 if (this.multipleSelectionGh.length == 0) {
                     this.$message({
-                        message: '请选择工会！',
+                        message: '请勾选审核列表的分工会！',
                         type: 'warning'
                     });
                     return
                 }
-                const confirm = await this.$confirm('确定要给报名人员发送消息吗', '提示', {
+                const confirm = await this.$confirm('确定要一键审核勾选的分工会吗', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
                 })
                 if (confirm === "confirm") {
-
-                }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '数据提交中...',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(0, 0, 0, 0.7)'
-                });
-                let arr = []
-                this.multipleSelectionGh.map(v => {
-                    arr.push({ghid: v.ghid, hdid: v.hdid})
-                })
-                const data = await $.post(base + "/platform/zgfw/lxy/xghsh/yjSh", {maps: JSON.stringify(arr)})
-
-                if (data.code == 0) {
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                    this.toggleSelectionGh()
-                    this.openShGh({id: this.pageForm.hdid});
-                } else {
-                    this.$message({
-                        message: data.msg,
-                        type: 'error'
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '数据提交中...',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
                     });
+                    let arr = []
+                    this.multipleSelectionGh.map(v => {
+                        arr.push({ghid: v.ghid, hdid: v.hdid})
+                    })
+                    const data = await $.post(base + "/platform/zgfw/lxy/xghsh/yjSh", {maps: JSON.stringify(arr)})
+
+                    if (data.code === 0) {
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                        this.toggleSelectionGh()
+                        this.openShGh({id: this.pageForm.hdid});
+                    } else {
+                        this.$message({
+                            message: data.msg,
+                            type: 'error'
+                        });
+                    }
+                    loading.close()
                 }
-                loading.close()
             },
             sh(zt) {
                 if (this.multipleSelection.length == 0) {