c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
那些花儿
2025-08-15 18:03:25 +08:00
parent 8eb6442d41
commit 0b07ce45d0
114 changed files with 20404 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
+11 -1
View File
@@ -80,7 +80,17 @@ public class FlowCommonController {
@At
@SaCheckLogin
@ApiOperation("已办任务")
public Result doneTasks(Long instanceId) {
public Result doneTasks(Long instanceId, String bizId) {
if (instanceId == null && StrUtil.isBlank(bizId)) {
return Result.error("参数错误");
}
if (instanceId == null) {
ProcessInstance instance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", bizId));
if (instance == null) {
return Result.success(Collections.emptyList());
}
instanceId = instance.getId();
}
List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(instanceId, null);
for (ProcessTask doneTask : doneTaskList) {
src/main/java/com/budwk/app/flow/controller/FlowDefineController.java
+10 -1
View File
@@ -1,13 +1,13 @@
package com.budwk.app.flow.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.exception.BaseException;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.flow.entity.ProcessDefine;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.service.ProcessDefineService;
import com.budwk.app.flow.vo.ProcessDefineVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
@@ -45,6 +45,15 @@ public class FlowDefineController {
public void preview(HttpServletRequest request) {
request.setAttribute("defineId", request.getParameter("defineId"));
request.setAttribute("instanceId", request.getParameter("instanceId"));
String defineKey = request.getParameter("defineKey");
if (StrUtil.isNotBlank(defineKey)) {
ProcessDefine define = dao.fetch(ProcessDefine.class, Cnd.where(ProcessDefine::getName, "=", defineKey).desc(ProcessDefine::getVersion));
if (define != null) {
request.setAttribute("defineId", define.getId());
}
}
}
src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java
+5 -2
View File
@@ -75,9 +75,12 @@ public class ArticleWriteController {
@ApiOperation("保存新闻投稿")
@Aop(TransAop.READ_COMMITTED)
public Result save(@Param("article") Article article) {
// dao.insertOrUpdate(article);
// // 启动流程 阻塞在第一个任务节点
// ProcessInstance instance = flowEngine.startProcessInstanceByKey("XWTG", article.getId(), SecurityUtil.getUserId(), null);
// 保存
dao.insertOrUpdate(article);
// 启动流程 阻塞在第一个任务节点
ProcessInstance instance = flowEngine.startProcessInstanceByKey("XWTG", article.getId(), SecurityUtil.getUserId(), null);
return Result.success(article);
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalApplyControllerX.java
-108
View File
@@ -1,108 +0,0 @@
package com.budwk.app.zhgh.democratic.proposal.controller.transact;
import cn.dev33.satoken.annotation.SaCheckLogin;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.flow.engine.FlowEngine;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
@IocBean
@At("/platform/proposal/apply")
@Ok("json:full")
@Api("撰写提案")
public class ProposalApplyControllerX {
@Inject
private FlowEngine flowEngine;
@Inject
private ProposalWriteService proposalWriteService;
@At("/index")
@Ok("beetl:/platform/zhgh/democratic/proposal/transact/apply/index.html")
@SaCheckLogin
public void index() {
}
@At("/form")
@Ok("beetl:/platform/zhgh/democratic/proposal/transact/apply/form.html")
@SaCheckLogin
public void form() {
}
@At
@SaCheckLogin
public Result pageData(Integer pageNumber, Integer pageSize) {
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,
t.id taskId,
t.taskName AS taskKey,
t.displayName taskName,
t.taskType,
t.performType taskPerformType,
t.taskState,
t.finishTime,
t.taskParentId,
t.variable taskVariale,
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') AS startTaskId
FROM
proposal_info info
LEFT JOIN proposal_type type on type.id = info.typeId
LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
cnd.desc("info.createdAt");
sql.setCondition(cnd);
Pagination<NutMap> pagination = proposalWriteService.listPageMap(pageNumber, pageSize, sql);
return Result.success(pagination);
}
@At
@SaCheckLogin
public Result info(String id) {
ProposalInfo info = proposalWriteService.fetch(id);
return Result.success(info);
}
@At
@SaCheckLogin
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("删除")
public Result delete(@Param("id") String id) {
proposalWriteService.delete(id);
flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java
+76 -61
View File
@@ -1,18 +1,14 @@
package com.budwk.app.zhgh.democratic.proposal.controller.transact;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.PageUtil;
import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
import com.budwk.app.bpm.param.BpmTaskApprovalParam;
import com.budwk.app.bpm.service.BpmService;
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
@@ -30,13 +26,11 @@ import org.nutz.dao.util.cri.Static;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.validation.Valid;
import java.util.List;
/**
* 团长审核
@@ -48,78 +42,99 @@ import java.util.List;
@Api(tags = "提案-办理-团长审核")
public class ProposalDelegationController {
@Inject
private BaseService baseService;
@Inject
private ProposalCommonService proposalCommonService;
@Inject
private ProposalDelegationService proposalDelegationService;
@Inject
private BpmService bpmService;
@At("/index")
@At("")
@Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/index.html")
@SaCheckLogin
@SaCheckPermission("proposal.delegation")
public void index() {
}
@At("/form")
@Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/form.html")
@SaCheckLogin
public void form() {
}
@At
@SaCheckPermission("proposal.seconded")
@SaCheckLogin
public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
@SaCheckPermission("proposal.delegation")
@ApiOperation("分页列表")
public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) {
Sql sql = Sqls.create("""
SELECT
info.*,
type.name AS typeName,
tcs.fullName AS sessionName,
tcd.`name` AS delegationName,
ins.id AS instanceId,
ins.businessNo,
ins.state instanceState,
ins.variable instanceVariale,
t.id taskId,
t.taskName AS taskKey,
t.displayName taskName,
t.taskType,
t.performType taskPerformType,
t.taskState,
t.finishTime,
t.taskParentId,
t.variable taskVariable,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
SELECT
info.*,
type.name AS typeName,
tcs.fullName AS sessionName,
tcd.`name` AS delegationName,
inst.id processInstanceId,
inst.processInstanceNodeId,
inst.processInstanceNodeName,
inst.processInstanceTaskIds,
inst.processInstanceStatus,
task.id processInstanceTaskId,
task.taskStatus processInstanceTaskStatus,
EXISTS (
SELECT 1
FROM bpm_process_task next_task
WHERE next_task.prevTaskId = task.id
AND next_task.taskStatus = 'COMPLETE'
) AS nextTaskIsComplete
FROM
wf_process_task t
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
LEFT JOIN proposal_info info ON info.id = ins.businessNo
LEFT JOIN proposal_type type on type.id = info.typeId
LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
bpm_process_task task
INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
LEFT JOIN proposal_type type on type.id = info.typeId
LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "=", "93d5ba64-8220-4e62-9783-83422f474b36");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
}
cnd.and("nd.nodeCode", "=", 30);
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
cnd.groupBy("info.id");
} else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
}
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.createdAt");
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("t.id");
ProposalSearchParam.buildSearch(cnd, pageForm);
cnd.and(new Static("""
NOT EXISTS(
SELECT 1
FROM bpm_process_task t2
WHERE t2.processInstanceId = task.processInstanceId
AND t2.processTaskNodeCode = task.processTaskNodeCode
AND t2.createdOn > task.createdOn
)
"""));
sql.setCondition(cnd);
Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO);
Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
return Result.success(pagination);
}
@At
@SaCheckPermission("proposal.delegation")
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "提案", msg = "团长审核")
@ApiOperation("审核")
public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
proposalDelegationService.approval(approvalParam);
return Result.success();
}
@At
@SaCheckPermission("proposal.delegation")
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "提案", msg = "团长审核撤回")
@ApiOperation("撤回")
public Result revoke(@Valid String taskId) {
proposalDelegationService.revokeTask(taskId);
// bpmService.revokeTask(taskId);
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
+59 -57
View File
@@ -1,23 +1,19 @@
package com.budwk.app.zhgh.democratic.proposal.controller.transact;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.PageUtil;
import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
import com.budwk.app.bpm.param.BpmTaskApprovalParam;
import com.budwk.app.bpm.service.BpmService;
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
import com.budwk.app.zhgh.democratic.proposal.service.ProposalSecondedService;
import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,13 +27,11 @@ import org.nutz.dao.util.cri.Static;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.validation.Valid;
import java.util.List;
/**
* 附议提案
@@ -52,76 +46,84 @@ public class ProposalSecondedController {
@Inject
private Dao dao;
@Inject
private BaseService baseService;
@Inject
private ProposalCommonService proposalCommonService;
@Inject
private BpmService bpmService;
@Inject
private ProposalSecondedService proposalSecondedService;
@At("/index")
@At("")
@Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/index.html")
@SaCheckPermission("proposal.seconded")
public void index() {
}
@At("/form")
@Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/form.html")
@SaCheckPermission("proposal.seconded")
public void form() {
}
@At
@SaCheckPermission("proposal.seconded")
public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
Sql sql = Sqls.create("""
SELECT
info.*,
type.name AS typeName,
tcs.fullName AS sessionName,
tcd.`name` AS delegationName,
ins.id AS instanceId,
ins.businessNo,
ins.state instanceState,
ins.variable instanceVariale,
t.id taskId,
t.taskName AS taskKey,
t.displayName taskName,
t.taskType,
t.performType taskPerformType,
t.taskState,
t.finishTime,
t.taskParentId,
t.variable taskVariable,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
SELECT
info.*,
type.name AS typeName,
tcs.fullName AS sessionName,
tcd.`name` AS delegationName,
inst.id processInstanceId,
inst.processInstanceNodeId,
inst.processInstanceNodeName,
inst.processInstanceTaskIds,
inst.processInstanceStatus,
task.id processInstanceTaskId,
task.taskStatus processInstanceTaskStatus,
JSON_EXTRACT( task.createVariable, '$.userName' ) AS seconderName,
COUNT( nt.id ) OVER ( PARTITION BY task.id ) > 0 AS nextTaskIsComplete
FROM
wf_process_task t
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
LEFT JOIN proposal_info info ON info.id = ins.businessNo
LEFT JOIN proposal_type type on type.id = info.typeId
LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
bpm_process_task task
INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
LEFT JOIN proposal_type type on type.id = info.typeId
LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE'
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "=", "74458b33-ad6e-46c4-b8d9-1aa897142b25");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
}
cnd.and("nd.nodeCode", "=", 20);
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
} else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
}
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.createdAt");
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("t.id");
ProposalSearchParam.buildSearch(cnd, pageForm);
// cnd.and(new Static("""
// NOT EXISTS(
// SELECT 1
// FROM bpm_process_task t2
// WHERE t2.processInstanceId = task.processInstanceId
// AND t2.processTaskNodeCode = task.processTaskNodeCode
// AND t2.createdOn > task.createdOn
// )
// """));
// cnd.groupBy("task.id");
sql.setCondition(cnd);
Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO);
Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
return Result.success(pagination);
}
@At
@SaCheckPermission("proposal.seconded")
@ApiOperation("附议")
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "提案", msg = "提案人附议")
public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
proposalSecondedService.approval(approvalParam);
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalLianDecisionHandler.java
+21
View File
@@ -0,0 +1,21 @@
package com.budwk.app.zhgh.democratic.proposal.handler;
import com.budwk.app.flow.constant.FlowConst;
import com.budwk.app.flow.engine.DecisionHandler;
import com.budwk.app.flow.engine.core.Execution;
/**
* 提案立案
*/
public class ProposalLianDecisionHandler implements DecisionHandler {
@Override
public String decide(Execution execution) {
// 立案结果
String caseFilingResult = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "case_filing_result");
return caseFilingResult;
}
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalUnitReplyAssignmentHandler.java
+33
View File
@@ -0,0 +1,33 @@
package com.budwk.app.zhgh.democratic.proposal.handler;
import com.budwk.app.flow.engine.AssignmentHandler;
import com.budwk.app.flow.engine.core.Execution;
import com.budwk.app.flow.engine.core.ServiceContext;
import com.budwk.app.flow.engine.model.TaskModel;
import org.nutz.dao.Dao;
import java.util.List;
/**
* 承办单位答复人处理类
*/
public class ProposalUnitReplyAssignmentHandler implements AssignmentHandler {
@Override
public List<String> assign(TaskModel model, Execution execution) {
Dao dao = ServiceContext.find(Dao.class);
List<String> unitIds = (List<String>)execution.getArgs().get("unitIds");
return List.of();
}
@Override
public String getMessage() {
return "承办单位答复人";
}
@Override
public int getOrder() {
return 20;
}
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalApplyInterceptor.java
+10
View File
@@ -1,11 +1,13 @@
package com.budwk.app.zhgh.democratic.proposal.interceptor;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.flow.constant.FlowConst;
import com.budwk.app.flow.engine.FlowInterceptor;
import com.budwk.app.flow.engine.core.Execution;
import com.budwk.app.flow.engine.core.ServiceContext;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
@@ -17,9 +19,17 @@ import org.nutz.json.Json;
public class ProposalApplyInterceptor implements FlowInterceptor {
@Override
public void intercept(Execution execution) {
ProposalWriteService writeService = ServiceContext.find(ProposalWriteService.class);
String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
ProposalInfo info = Json.fromJson(ProposalInfo.class, formDataStr);
if (StrUtil.isBlank(info.getId())) {
String code = writeService.generateProposalCode(info.getSessionId(), info.getDelegationId());
info.setCode(code);
}
Dao dao = ServiceContext.find(Dao.class);
dao.insertOrUpdate(info);
execution.getArgs().set(FlowConst.FORM_DATA, Json.toJson(info));
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxAdminController.java
-154
View File
@@ -1,154 +0,0 @@
package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
import io.swagger.annotations.Api;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.dao.util.cri.Static;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;
@IocBean
@At("/platform/suggestionBox/admin")
@Ok("json:full")
@Api(tags = "意见箱管理员端")
public class SuggestionBoxAdminController {
@Inject
private Dao dao;
@Inject
private BaseService baseService;
@At("/h5")
@Ok("beetl:/platform/zhghh5/democratic/suggestionBox/admin.html")
@SaCheckLogin
public void h5() {
}
@At
@Ok("beetl:/platform/zhghh5/democratic/suggestionBox/taskForm.html")
@SaCheckLogin
public void taskForm() {
}
/**
* 分页数据
*
* @param pageForm 分页
* @param status 状态 是否回复
* @param timeRange 时间范围 今日 本周 本月
* @return
*/
@At("/pageData")
@SaCheckLogin
public Result pageData(PageForm pageForm, Integer status, String timeRange, String keyword) {
Sql sql = Sqls.create("select * from suggestion_box $condition");
Cnd cnd = Cnd.NEW();
cnd.and("submitterId", "=", SecurityUtil.getUserId());
cnd.andEX("isReply", "=", status);
if (StrUtil.isNotBlank(timeRange)) {
switch (timeRange) {
case "today":
cnd.and(new Static("DATE(submitTime) = CURDATE()"));
break;
case "week":
cnd.and(new Static("WEEKOFYEAR(submitTime) = WEEKOFYEAR(CURDATE())"));
break;
case "month":
cnd.and(new Static("MONTH(submitTime) = MONTH(CURDATE())"));
break;
default:
break;
}
}
if (StrUtil.isNotBlank(keyword)) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("submitterName", keyword);
seg.orLike("content", keyword);
seg.orLike("title", keyword);
cnd.and(seg);
}
cnd.desc("submitTime");
sql.setCondition(cnd);
Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
}
/**
* 统计
*/
@At("/getStats")
@SaCheckLogin
public Result stats() {
// 查询总意见数
int total = dao.count(SuggestionBox.class);
// 待回复数
int pending = dao.count(SuggestionBox.class, Cnd.where("isReply", "=", 0));
// 已回复数
int replied = dao.count(SuggestionBox.class, Cnd.where("isReply", "=", 1));
// 今日新增
int today = dao.count(SuggestionBox.class, Cnd.NEW().and(new Static("DATE(submitTime) = CURDATE()")));
return Result.success(Map.of("total", total, "pending", pending, "replied", replied, "today", today));
}
/**
* 答复
*/
@At
@SaCheckLogin
@Aop(TransAop.READ_COMMITTED)
public Result reply(@Param("reply") SuggestionBox suggestionBox, @Param("taskId") String taskId) {
// 1. 保存业务数据
suggestionBox.setIsReply(true);
suggestionBox.setReplyTime(LocalDateTime.now());
suggestionBox.setReplyUserId(SecurityUtil.getUserId());
suggestionBox.setReplyUserName(SecurityUtil.getUserUsername());
dao.update(suggestionBox, "isReply|replyContent|replyTime|replyUserId|replyUserName");
// // 2. 完成工作流任务
// taskService.complete(taskId, new HashMap<>() {{
// put("replyContent", suggestionBox.getReplyContent());
// put("replyTime", suggestionBox.getReplyTime());
// put("replyUserId", suggestionBox.getReplyUserId());
// put("replyUserName", suggestionBox.getReplyUserName());
// }});
return Result.success();
}
/**
* 根据ID获取意见箱数据
*/
@At("/getSuggestionById")
@SaCheckLogin
public Result getSuggestionById(@Param("id") String id) {
SuggestionBox suggestionBox = dao.fetch(SuggestionBox.class, id);
if (suggestionBox == null) {
return Result.error("数据不存在");
}
return Result.success(suggestionBox);
}
}
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxController.java
-118
View File
@@ -1,118 +0,0 @@
package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.hutool.core.lang.Dict;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.flow.constant.FlowConst;
import com.budwk.app.flow.engine.FlowEngine;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
import io.swagger.annotations.Api;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
@IocBean
@At("/platform/suggestionBox")
@Ok("json:full")
@Api(tags = "意见箱")
public class SuggestionBoxController {
@Inject
private Dao dao;
@Inject
private BaseService baseService;
@Inject
private FlowEngine flowEngine;
// @At
// @SaCheckLogin
// @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/index.html")
// public void apply() {
//
// }
//
//
// @At("/h5")
// @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/index.html")
// @SaCheckLogin
// public void h5Index() {
//
// }
//
// @At("/h5/write")
// @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/write.html")
// @SaCheckLogin
// public void h5Write() {
//
// }
//
// @At("/h5/mine")
// @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/mine.html")
// @SaCheckLogin
// public void h5Mine() {
//
// }
@At
@SaCheckLogin
@Aop(TransAop.READ_COMMITTED)
public Result submit(@Param("suggestion") SuggestionBox suggestionBox) {
Dict dict = Dict.create();
dict.set(FlowConst.FORM_DATA, suggestionBox);
flowEngine.startProcessInstanceByKey("JYXC", "", SecurityUtil.getUserId(), dict);
return Result.success();
}
@At
@SaCheckLogin
@Aop(TransAop.READ_COMMITTED)
public Result delete(@Param("id") String id) {
dao.delete(SuggestionBox.class, id);
// FlowInstance instance = dao.fetch(FlowInstance.class, Cnd.where(FlowInstance::getBusinessId, "=", id));
// if (instance != null) {
// insService.remove(List.of(instance.getId()));
// }
return Result.success();
}
/**
* 我的意见列表
*/
@At
@SaCheckLogin
public Result pageData(PageForm pageForm) {
Sql sql = Sqls.create("""
SELECT
info.*,
ins.id instanceId,
ins.business_id,
ins.node_type,
ins.node_code,
ins.node_name,
ins.flow_status
FROM
suggestion_box info
LEFT JOIN flow_instance ins ON ins.business_id = info.id
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("info.submitterId", "=", SecurityUtil.getUserId());
cnd.desc("info.submitTime");
sql.setCondition(cnd);
Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
}
}
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionApplyController.java → src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
+12 -13
View File
@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
@@ -21,29 +22,25 @@ import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
@IocBean
@At("/platform/suggestionBox2/apply")
@At("/platform/suggestionBox/mine")
@Ok("json:full")
@Api("意见箱")
public class SuggestionApplyController {
@Api("意见箱-我的")
public class SuggestionBoxMineController {
@Inject
private SuggestionBoxService suggestionBoxService;
private Dao dao;
@Inject
private FlowEngine flowEngine;
@Inject
private SuggestionBoxService suggestionBoxService;
@At("/index")
@Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/apply/index.html")
@At("")
@Ok("beetl:/platform/zhgh/democratic/suggestionBox/mine/index.html")
@SaCheckLogin
public void index() {
}
@At("/form")
@Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/apply/form.html")
@SaCheckLogin
public void form() {
}
@At
@SaCheckLogin
@@ -61,6 +58,7 @@ public class SuggestionApplyController {
ins.businessNo,
ins.state instanceState,
ins.variable instanceVariale,
ins.processDefineId instanceProcessDefineId,
t.id taskId,
t.taskName AS taskKey,
t.displayName taskName,
@@ -71,7 +69,7 @@ public class SuggestionApplyController {
t.taskParentId,
t.variable taskVariale,
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') AS startTaskId
(select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask' AND taskState in (10,20)) AS startTaskId
FROM
suggestion_box info
LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
@@ -97,4 +95,5 @@ public class SuggestionApplyController {
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java
+80
View File
@@ -0,0 +1,80 @@
package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.hutool.core.lang.Dict;
import com.budwk.app.base.result.Result;
import com.budwk.app.flow.constant.FlowConst;
import com.budwk.app.flow.engine.FlowEngine;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.entity.ProcessTask;
import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import java.util.List;
@IocBean
@At("/platform/suggestionBox/write")
@Ok("json:full")
@Api("意见箱-撰写")
public class SuggestionBoxWriteController {
@Inject
private Dao dao;
@Inject
private FlowEngine flowEngine;
@At("")
@Ok("beetl:/platform/zhgh/democratic/suggestionBox/write/index.html")
@SaCheckLogin
public void index() {
}
@At
@SaCheckLogin
@ApiOperation("保存申请")
public Result save(@Param("data") SuggestionBox suggestionBox) {
dao.insertOrUpdate(suggestionBox);
return Result.success();
}
@At
@SaCheckLogin
@ApiOperation("提交申请")
public Result submit(@Param("data") SuggestionBox suggestionBox) {
dao.insertOrUpdate(suggestionBox);
// 开启流程实例
Dict args = Dict.create();
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
args.set(FlowConst.FORM_DATA, suggestionBox);
ProcessInstance instance = flowEngine.startProcessInstanceByKey("JYXC", suggestionBox.getId(), SecurityUtil.getUserId(), args);
// 自动完成第一个申请任务
List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
for (ProcessTask task : doingTaskList) {
flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
}
return Result.success();
}
@At
@SaCheckLogin
@ApiOperation("获取申请信息")
public Result info(@Param("id") String id) {
SuggestionBox box = dao.fetch(SuggestionBox.class, id);
return Result.success(box);
}
}
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionCommonController.java
+33
View File
@@ -0,0 +1,33 @@
package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import com.budwk.app.base.result.Result;
import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
@IocBean
@At("/platform/suggestionBox/common")
@Ok("json:full")
@Api("意见箱-公共")
public class SuggestionCommonController {
@Inject
private Dao dao;
@At
@SaCheckLogin
@ApiOperation("获取申请信息")
public Result info(@Param("id") String id) {
SuggestionBox box = dao.fetch(SuggestionBox.class, id);
return Result.success(box);
}
}
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java
+4 -10
View File
@@ -22,7 +22,7 @@ import org.nutz.mvc.annotation.Ok;
import java.util.List;
@IocBean
@At("/platform/suggestionBox2/xgh")
@At("/platform/suggestionBox/xgh")
@Ok("json:full")
@Api("意见箱")
public class SuggestionXghController {
@@ -30,20 +30,13 @@ public class SuggestionXghController {
@Inject
private SuggestionBoxService suggestionBoxService;
@At("/index")
@Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/xgh/index.html")
@At("")
@Ok("beetl:/platform/zhgh/democratic/suggestionBox/xgh/index.html")
@SaCheckLogin
public void index() {
}
@At("/form")
@Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/xgh/form.html")
@SaCheckLogin
public void form() {
}
@At
@SaCheckLogin
public Result pageData(PageForm pageForm, String title, Integer year, boolean approval) {
@@ -60,6 +53,7 @@ public class SuggestionXghController {
ins.businessNo,
ins.state instanceState,
ins.variable instanceVariale,
ins.processDefineId instanceProcessDefineId,
t.id taskId,
t.taskName AS taskKey,
t.displayName taskName,