..

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

@@ -0,0 +1,174 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.dashboard;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.model.ProcessModel;
+import com.budwk.app.flow.engine.model.TaskModel;
+import com.budwk.app.flow.entity.ProcessDefine;
+import com.budwk.app.flow.service.ProcessDefineService;
+import com.budwk.app.sys.models.Sys_dict;
+import com.budwk.app.sys.services.SysDictService;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/dashboard")
+@Api("提案数据看板")
+@Ok("json:full")
+public class ProposalDashboardController {
+
+    @Inject
+    private ProposalCommonService proposalCommonService;
+    @Inject
+    private ProcessDefineService processDefineService;
+    @Inject
+    private SysDictService sysDictService;
+    @Inject
+    private Dao dao;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/dashboard/index.html")
+    @SaCheckPermission("proposal.dashboard")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.dashboard")
+    public Result listNode(@Param("sessionId") String sessionId) {
+        List<NutMap> nodes = new ArrayList<>();
+
+        // 提案总数
+        nodes.add(NutMap.NEW().addv("name", "提案总数").addv("id", "total").addv("type", "total").addv("count", 0));
+
+        // 节点
+        ProcessDefine define = processDefineService.getLastByName("JDHTA");
+        ProcessModel processModel = processDefineService.processDefineToModel(define);
+        List<TaskModel> taskModels = processModel.getTasks();
+
+        List<String> excludeNodes = new ArrayList<>(3);
+        excludeNodes.add("撰写提案");
+        excludeNodes.add("邀请附议人");
+        excludeNodes.add("提案附议");
+
+        List<NutMap> taskNodes = taskModels.stream().filter(taskModel -> !excludeNodes.contains(taskModel.getDisplayName()))
+                .map(taskModel -> NutMap.NEW()
+                        .addv("name", taskModel.getDisplayName())
+                        .addv("id", taskModel.getName())
+                        .addv("type", "task")
+                        .addv("count", 0)).toList();
+        nodes.addAll(taskNodes);
+
+        // 立案结果
+        List<Sys_dict> caseFilingResult = sysDictService.getSubListByCode("PROPOSAL_CASE_FILING_RESULT");
+        for (Sys_dict dict : caseFilingResult) {
+            nodes.add(NutMap.NEW()
+                    .addv("name", dict.getName())
+                    .addv("id", dict.getCode())
+                    .addv("type", "caseFilingResult")
+                    .addv("count", 0));
+        }
+
+        // 查询待办任务
+        Sql todoSql = Sqls.create("""
+                SELECT
+                  t.taskName
+                FROM
+                  wf_process_task t
+                  INNER JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  INNER JOIN proposal_info info ON info.id = ins.businessNo
+                WHERE
+                  t.taskState = 10
+                  AND info.sessionId = @sessionId
+                """);
+        todoSql.setParam("sessionId", sessionId);
+        List<NutMap> todoTasks = processDefineService.listMap(todoSql);
+
+        for (NutMap node : nodes) {
+            if (node.getString("type").equals("task")) {
+                long count = todoTasks.stream().filter(task -> task.getString("taskName").equals(node.getString("id"))).count();
+                node.put("count", count);
+            } else if (node.getString("type").equals("total")) {
+                int count = dao.count(ProposalInfo.class, Cnd.where(ProposalInfo::getSessionId, "=", sessionId));
+                node.put("count", count);
+            } else if (node.getString("type").equals("caseFilingResult")) {
+                int count = dao.count(ProposalInfo.class, Cnd.where(ProposalInfo::getSessionId, "=", sessionId).and(ProposalInfo::getCaseFilingResult, "=", node.getString("id")));
+                node.put("count", count);
+            }
+        }
+
+        return Result.success(nodes);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.dashboard")
+    public Result pageData(PageForm pageForm, String sessionId, String selectNodeId, String selectNodeType) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	COUNT(p.consolidationIds) > 0 AS isConsolidation,
+                    type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.displayName curTaskName,
+                    JSON_UNQUOTE(JSON_EXTRACT(caseTasks.variable, '$.tf_hostUnitName')) AS masterUnitName,
+                    caseTasks.variable->>'$.tf_helpUnitNameStr' AS slaveUnitNames
+                FROM
+                    proposal_info info
+                	LEFT JOIN proposal_consolidation p ON JSON_CONTAINS(p.consolidationIds, JSON_QUOTE(info.id))
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                	LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
+                	LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+                	LEFT JOIN (SELECT processInstanceId, MAX(finishTime) AS finishTime FROM wf_process_task WHERE taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND taskState = 20 GROUP BY processInstanceId) latestTasks ON latestTasks.processInstanceId = ins.id
+                	LEFT JOIN wf_process_task caseTasks ON caseTasks.processInstanceId = ins.id AND caseTasks.taskName = '9846ab38-40c5-4093-bafc-a9b3b443338b' AND caseTasks.taskState = 20 AND caseTasks.finishTime = latestTasks.finishTime
+                	LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("info.sessionId", "=", sessionId);
+        cnd.groupBy("info.id");
+
+        if(StrUtil.isNotBlank(selectNodeType) && StrUtil.isNotBlank(selectNodeId)){
+            switch (selectNodeType){
+                case "task":
+                    cnd.and("t.taskName", "=", selectNodeId);
+                    break;
+                case "total":
+                    break;
+                case "caseFilingResult":
+                    cnd.and("info.caseFilingResult", "=", selectNodeId);
+                    break;
+            }
+        }
+
+        sql.setCondition(cnd);
+        Pagination pagination = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+}

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

@@ -120,6 +120,51 @@ public class ProposalMineController {
         return Result.success(pagination);
     }
 
+    @At
+    @SaCheckPermission("proposal.mine")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result selectOne(@Valid String id){
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                	type.name AS typeName,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    t.variable taskVariable,
+                    IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
+                    (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask' AND taskState in (10,20)) AS startTaskId
+                FROM
+                    proposal_info info
+                    LEFT JOIN proposal_type type on type.id = info.typeId
+                    LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                    LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                    LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("info.id", "=", id);
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        NutMap data = proposalCommonService.fetchMap(sql);
+        return Result.success(data);
+    }
+
+
     @At
     @SaCheckPermission("proposal.mine")
     @Aop(TransAop.READ_COMMITTED)

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

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

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

@@ -129,8 +129,8 @@ public class ProposalInfo extends BaseModel {
 
     @Column
     @Comment("建议落实部门")
-    @ColDefine(type = ColType.VARCHAR, width = 500)
-    private String implementUnitName;
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> suggestUnits;
 
     @Column
     @Comment("提案状态")

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java

@@ -457,7 +457,8 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     @Override
     public List<String> getSelfManageDelegationIds() {
         Sys_role role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD.name());
-        List<Sys_user_role> sysUserRoles = dao().query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+        Sys_role viceRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD.name());
+        List<Sys_user_role> sysUserRoles = dao().query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "in", List.of(role.getId(), viceRole.getId()))
                 .and(Sys_user_role::getUserId, "=", SecurityUtil.getUserId()));
         List<String> delegationIds = sysUserRoles.stream()
                 .map(Sys_user_role::getTcDelegationId)

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java

@@ -18,7 +18,9 @@ import com.budwk.app.sys.services.SysRoleService;
 import com.budwk.app.sys.services.SysUserService;
 import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation;
 import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
@@ -69,25 +71,25 @@ public class TeacherCongressDelegationController {
     @POST
     @SaCheckPermission("tc.delegation")
     @ApiOperation(value = "届次信息列表", httpMethod = "POST")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "sessionId", value = "届次ID", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "delegationId", value = "代表团ID", dataType = "String", paramType = "query")
-    })
     public Result pageData(@Valid @ApiParam(value = "分页表单") PageForm pageForm, @Valid @ApiParam(value = "届次ID") String sessionId) {
         Sys_role role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD);
+        Sys_role role2 = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD);
         Sql sql = Sqls.create("""
                 SELECT
                    	tcd.*,
                    	tcs.fullName as sessionName,
-                   	GROUP_CONCAT(u.username,u.loginname) as delegationHead
+                   	GROUP_CONCAT(u.username,u.loginname) as delegationHead,
+                   	GROUP_CONCAT(u2.username,u2.loginname) as viceDelegationHead
                 FROM
                    	teacher_congress_delegation tcd
                    	LEFT JOIN teacher_congress_session tcs ON tcs.id = tcd.sessionId
-                   	LEFT JOIN sys_user_role sur ON sur.tcDelegationId = tcd.id
-                   	AND sur.roleId = @roleId
+                   	LEFT JOIN sys_user_role sur ON sur.tcDelegationId = tcd.id AND sur.roleId = @roleId
                    	LEFT JOIN sys_user u ON u.id = sur.userId
+                   	LEFT JOIN sys_user_role sur2 ON sur2.tcDelegationId = tcd.id AND sur2.roleId = @roleId2
+                   	LEFT JOIN sys_user u2 ON u2.id = sur2.userId
                 $condition""");
         sql.setParam("roleId", role.getId());
+        sql.setParam("roleId2", role2.getId());
         Cnd cnd = Cnd.NEW();
         cnd.and("tcd.sessionId", "=", sessionId);
         cnd.asc("tcd.code");
@@ -241,8 +243,8 @@ public class TeacherCongressDelegationController {
     public Result notHeadUser(@Valid String sessionId, @Valid String delegationId, String keyWord) {
         Sql sql = Sqls.create("select userId,loginName,userName,unitName from teacher_congress_delegate $condition");
         Cnd cnd = Cnd.NEW();
-        cnd.and("delegationId","=",delegationId);
-        cnd.and("sessionId","=",sessionId);
+        cnd.and("delegationId", "=", delegationId);
+        cnd.and("sessionId", "=", sessionId);
         SqlExpressionGroup seg = new SqlExpressionGroup();
         seg.orLike("loginName", keyWord);
         seg.orLike("userName", keyWord);
@@ -261,8 +263,14 @@ public class TeacherCongressDelegationController {
      */
     @At
     @SaCheckPermission("tc.delegation")
-    public Result headUser(@Valid String sessionId, @Valid String delegationId) {
-        Sys_role role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD);
+    public Result headUser(@Valid String sessionId, @Valid String delegationId, @Param(value = "type", df = "TEACHER_CONGRESS_DELEGATION_HEAD") String type) {
+        Sys_role role = null;
+        if (type.equals(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD.name())) {
+            role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD);
+        } else {
+            role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD);
+        }
+
         Record record = dao.fetch("sys_user_role", Cnd.where("tcSessionId", "=", sessionId).and("tcDelegationId", "=", delegationId).and("roleId", "=", role.getId()));
         String userId = Optional.ofNullable(record).map(r -> r.getString("userId")).orElse(null);
 
@@ -297,17 +305,23 @@ public class TeacherCongressDelegationController {
     @At
     @SaCheckPermission("tc.delegation")
     @Aop(TransAop.READ_COMMITTED)
-    public Result insertHead(@Valid String delegationId, @Valid String sessionId, @Valid String userId) {
+    public Result insertHead(@Valid String delegationId, @Valid String sessionId, @Valid String userId, String viceUserId) {
+        // 团长
         Sys_role role = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD);
-
-        //删除权限 只能有一个团长
         dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getTcDelegationId, "=", delegationId)
                 .and(Sys_user_role::getTcSessionId, "=", sessionId)
                 .and(Sys_user_role::getRoleId, "=", role.getId())
         );
-
-        //再加
         dao.insert("sys_user_role", Chain.make("userId", userId).add("roleId", role.getId()).add("tcDelegationId", delegationId).add("tcSessionId", sessionId));
+
+        // 副团长
+        Sys_role role2 = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD);
+        dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getTcDelegationId, "=", delegationId)
+                .and(Sys_user_role::getTcSessionId, "=", sessionId)
+                .and(Sys_user_role::getRoleId, "=", role2.getId())
+        );
+        dao.insert("sys_user_role", Chain.make("userId", viceUserId).add("roleId", role2.getId()).add("tcDelegationId", delegationId).add("tcSessionId", sessionId));
+
         sysUserService.clearCache();
         return Result.success();
     }