Merge branch 'main' of https://dd3skj.picp.vip/zhouhefeng/zhgh_whcp_new

# Conflicts:
#	src/main/java/com/budwk/app/flow/engine/handlers/impl/CountersignHandler.java

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
+import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
@@ -44,6 +45,7 @@ import org.nutz.mvc.annotation.Param;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @IocBean
 @At("/platform/proposal/mine")
@@ -262,15 +264,25 @@ public class ProposalMineController {
                 .desc(ProcessTask::getCreatedAt));
 
         // 已完成附议的代表
-        List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+        /*List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
                 .and(ProcessTask::getTaskName, "=", "second")
                 .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
                 .and(ProcessTask::getId, ">", inviteTask.getId())
+        );*/
+
+        List<ProcessTask> taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId())
+                .and(ProcessTask::getTaskName, "=", "second")
+                .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode()))
         );
 
+        List<ProcessTask> tasks = taskList.stream().filter(o -> {
+            Dict args = JSONUtil.toBean(o.getVariable(), Dict.class);
+            return Objects.equals(args.getInt("submitType"), ProcessSubmitTypeEnum.AGREE.getCode());
+        }).toList();
+
         ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
 
-        if (taskList.size() + seconders.length < proposalConfig.getSeconderNum()) {
+        if (tasks.size() + seconders.length < proposalConfig.getSeconderNum()) {
             return Result.error("至少邀请" + proposalConfig.getSeconderNum() + "个附议人");
         }
 

src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html

@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
-                        <el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
+                        <el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
                         <el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
                     </el-row>
                 </div>

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html

@@ -3,7 +3,7 @@ layout("/layouts/platform_h5.html"){
 #-->
 
 <div id="app" v-cloak>
-    <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="经办人签字" placeholder
+    <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="证明人签字" placeholder
                  fixed></van-nav-bar>
     <van-sticky offset-top="46px">
         <van-search