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

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-03-26 14:03:21 +08:00
parent c5fbf8576c
commit dc71dc22d8
21 changed files with 585 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java
+24 -7
View File
@@ -3,12 +3,15 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
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.vo.LabelValueVO;
import com.budwk.app.flow.constant.FlowConst;
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.flow.enums.ProcessTaskStateEnum;
import com.budwk.app.flow.service.FlowCommonService;
import com.budwk.app.flow.service.ProcessTaskService;
@@ -136,13 +139,19 @@ public class ProposalSchoolLeaderApprovalController {
return Result.success();
}
@At
@SaCheckPermission("proposal.schoolLeaderApproval")
@ApiOperation("执行任务")
public Result executeTask(@Param("data") String data) {
Dict args = Json.fromJson(Dict.class, data);
if("back".equals(args.getStr("tf_approval"))) {
args.put("submitType", ProcessSubmitTypeEnum.JUMP.getCode());
args.put("taskName", "committee");
flowCommonService.executeTask(args);
return Result.success();
}
String proposalId = args.getStr("proposalId");
ProcessTask thisTask = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
@@ -150,8 +159,20 @@ public class ProposalSchoolLeaderApprovalController {
Dict dict = Json.fromJson(Dict.class, parentTask.getVariable());
args.put("tf_caseFilingResult", dict.getStr("tf_caseFilingResult"));
args.put("tf_helpunitreply", dict.getStr("tf_helpunitreply"));
args.put("tf_masterUnitId", dict.getStr("tf_masterUnitId"));
args.put("tf_slaveUnitIds", dict.getObj("tf_slaveUnitIds"));
// 方案流程实例
ProcessInstance instance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getId, "=", thisTask.getProcessInstanceId()));
Dict instanceDict = Json.fromJson(Dict.class, instance.getVariable());
instanceDict.put("tf_helpunitreply", dict.getStr("tf_helpunitreply"));
instanceDict.put("tf_masterUnitId", dict.getStr("tf_masterUnitId"));
instanceDict.put("tf_slaveUnitIds", dict.getObj("tf_slaveUnitIds"));
instance.setVariable(JSONUtil.toJsonStr(instanceDict));
dao.update(instance);
// 方案流程实例
// 单条审核
List<String> mergeProposalIds = proposalCommonService.mergeProposal(proposalId);
@@ -161,7 +182,6 @@ public class ProposalSchoolLeaderApprovalController {
}
// 并案审核
List<ProcessTask> mergeTasks = processTaskService.getDoingTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName());
for (ProcessTask mergeTask : mergeTasks) {
Dict cloneArgs = args.clone();
@@ -170,7 +190,4 @@ public class ProposalSchoolLeaderApprovalController {
}
return Result.success();
}
}
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
+3 -2
View File
@@ -114,10 +114,11 @@ public class ProposalSecondedController {
LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
$condition
""");
sql.setParam("seconderId", SecurityUtil.getUserId());
Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "in", List.of("invite", "second", "delegation", "committee"));
cnd.and(new Static("ps.isAgree is null"));
sql.setParam("seconderId", SecurityUtil.getUserId());
cnd.and("ps.isAgree", "is", null);
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnSubmitQueryController.java
+2 -2
View File
@@ -53,8 +53,8 @@ public class ProposalUnSubmitQueryController {
tcd.name as delegationName,
pt.name as typeName,
manner.name as mannerName,
(select count(DISTINCT(seconderId))from proposal_seconded where proposalId = info.id) AS secondedNum,
(select count(DISTINCT(seconderId))from proposal_seconded where proposalId = info.id and isAgree = 1) AS secondedAgreeNum,
(select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id) AS secondedNum,
(select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id and isAgree = 1) AS secondedAgreeNum,
IF(info.stateCode <= 200 ,'未审核','已审核') AS delegationAudit
FROM
proposal_info info
src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalSchoolLeaderAssignmentHandler.java
+16 -19
View File
@@ -1,16 +1,24 @@
package com.budwk.app.zhgh.democratic.proposal.handler;
import cn.hutool.core.lang.Dict;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.exception.BaseException;
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 com.budwk.app.flow.entity.Candidate;
import com.budwk.app.sys.models.Sys_role;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.sys.models.Sys_user_role;
import com.budwk.app.sys.services.SysRoleService;
import com.budwk.app.web.controllers.open.commons.service.CommonService;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.lang.Lang;
import org.nutz.lang.util.NutMap;
import java.util.List;
@@ -22,30 +30,19 @@ public class ProposalSchoolLeaderAssignmentHandler implements AssignmentHandler
@Override
public List<String> assign(TaskModel model, Execution execution) {
Dao dao = ServiceContext.find(Dao.class);
ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
List<String> unitIds = proposalConfig.getSchoolLeaderUnitIds();
Sql sql = Sqls.create("select id,username,loginname from vw_user where unitId in (@unitIds)");
sql.setParam("unitIds", unitIds);
sql.setCallback(Sqls.callback.maps());
dao.execute(sql);
List<NutMap> list = sql.getList(NutMap.class);
CommonService commonService = ServiceContext.find(CommonService.class);
List<Sys_user> users = commonService.findUserInfoByRoleCode(RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name());
List<Candidate> candidates = list.stream().map(item -> Candidate.builder()
.userId(item.getString("id"))
.userName(item.getString("username"))
.ext(Dict.of("loginName", item.getString("loginname")))
.build()
).toList();
if(candidates.size() > 0) {
return candidates.stream().map(Candidate::getUserId).toList();
}
return List.of();
if(Lang.isEmpty(users)) {
throw new BaseException("未查询到相关审批人");
}
return users.stream().map(Sys_user::getId).toList();
}
@Override
public String getMessage() {
return "指定主管校领导";
return "获取提案主管校领导";
}
@Override
src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalCaseFilingInterceptor.java
+7
View File
@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.democratic.proposal.interceptor;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.flow.constant.FlowConst;
import com.budwk.app.flow.engine.FlowInterceptor;
@@ -100,5 +101,11 @@ public class ProposalCaseFilingInterceptor implements FlowInterceptor {
}
dao.update(processTaskList,"variable");
String helpUnitReply = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "helpunitreply");
ProcessTask processTask = execution.getProcessTask();
Dict dict = JSONUtil.toBean(processTask.getVariable(), Dict.class);
dict.set(FlowConst.TASK_FORM_DATA_PREFIX + "helpunitreply", helpUnitReply);
processTask.setVariable(JSONUtil.toJsonStr(dict));
dao.update(processTask);
}
}