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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-03-12 17:49:25 +08:00
parent 2b2344beb3
commit c4a5872484
4 changed files with 107 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/controller/FlowDesignController.java
-39
View File
@@ -12,9 +12,6 @@ import com.budwk.app.base.result.Result;
import com.budwk.app.flow.engine.AssignmentHandler;
import com.budwk.app.flow.engine.CandidateHandler;
import com.budwk.app.flow.entity.ProcessDesign;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.entity.ProcessTask;
import com.budwk.app.flow.entity.ProcessTaskActor;
import com.budwk.app.flow.service.ProcessDesignService;
import com.budwk.app.sys.services.SysUserService;
import io.swagger.annotations.Api;
@@ -109,42 +106,6 @@ public class FlowDesignController {
request.setAttribute("id", request.getParameter("id"));
}
@At
@ApiOperation("获取流程设计分页列表")
@SaCheckPermission("flow.design")
public void onUpdate(){
List<ProcessTask> tasks = dao.query(ProcessTask.class, Cnd.where("taskName", "=", "committee"));
List<Long> list = tasks.stream().map(ProcessTask::getId).toList();
List<ProcessTaskActor> actorList = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "in", list));
List<ProcessInstance> instanceList = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getProcessDefineId, "=", 389));
for (ProcessTask task : tasks) {
task.setTaskName("personnelOffice");
task.setDisplayName("人事处审核");
task.setFormKey("/platform/proposal/personnelOffice");
task.setH5FormKey("/platform/proposal/personnelOffice/h5");
}
for (ProcessTaskActor actor : actorList) {
actor.setActorId("a2e5874eb28e42e9811f1af4d4bcb5a5");
actor.setActorAccount("001094");
actor.setActorName("郑胜水");
actor.setActorUnitName("人事处(党委教师工作部、人才工作办公室)");
actor.setActorUnitId("1001");
}
for (ProcessInstance instance : instanceList) {
instance.setProcessDefineId(396L);
}
dao.update(tasks);
dao.update(actorList);
dao.update(instanceList);
}
@At
@ApiOperation("获取流程设计分页列表")
@SaCheckPermission("flow.design")
src/main/java/com/budwk/app/sys/controller/SysMenuController.java
+7 -8
View File
@@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@IocBean
@At("/platform/sys/menu")
@@ -391,11 +390,11 @@ public class SysMenuController {
@At
@Ok("json")
@SaCheckPermission("sys.manager.menu.edit")
public Object sortDo(@Param("ids") String ids, HttpServletRequest req) {
public Object sortDo(@Param("ids") String ids, @Param("platform") String platform, HttpServletRequest req) {
try {
String[] menuIds = StringUtils.split(ids, ",");
int i = 0;
sysMenuService.execute(Sqls.create("update sys_menu set location=0"));
sysMenuService.execute(Sqls.create("update sys_menu set location=0 where platform = '%s'".formatted(platform)));
for (String s : menuIds) {
if (!Strings.isBlank(s)) {
sysMenuService.update(org.nutz.dao.Chain.make("location", i), Cnd.where("id", "=", s));
@@ -425,11 +424,11 @@ public class SysMenuController {
@SaCheckPermission("sys.manager.menu")
@ApiOperation("更新首页推荐应用或服务")
public Result updateRecommendSetting(@Param("menuIds") String[] menuIds, String platform, String type) {
String column = "";
switch (type) {
case "app" -> column = "isRecommendApp";
case "service" -> column = "isRecommendService";
}
String column = "";
switch (type) {
case "app" -> column = "isRecommendApp";
case "service" -> column = "isRecommendService";
}
sysMenuService.update(Chain.make(column, 0), Cnd.where("id", "is not", null).and("platform", "=", platform));
if (ArrayUtil.isNotEmpty(menuIds)) {
sysMenuService.update(Chain.make(column, 1), Cnd.where("id", "in", menuIds).and("platform", "=", platform));