ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 待办/已发/已办/监控流程 增加发起人查询

Browse Source
This commit is contained in:
mzaxd
2024-06-05 10:29:29 +08:00
parent b9312a29cb
commit 4f3a66b21c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+5 -2
View File
@@ -1,5 +1,6 @@
package com.jero.modules.activiti.controller; package com.jero.modules.activiti.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -67,6 +68,7 @@ public class WorkCenterController {
queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue()); queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue());
queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue());
queryWrapper.ne("pa.prc_status", ProcessStatusEnum.COMPLETED.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.COMPLETED.getValue());
queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName());
Page<ProcessAll> page = new Page<>(pageNo, pageSize); Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> todoList = processAllService.getTodoList(page, queryWrapper, req); IPage<ProcessAll> todoList = processAllService.getTodoList(page, queryWrapper, req);
@@ -85,6 +87,7 @@ public class WorkCenterController {
queryWrapper.eq("par.user_id",userId); queryWrapper.eq("par.user_id",userId);
queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue()); queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue());
queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue());
queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName());
Page<ProcessAll> page = new Page<>(pageNo, pageSize); Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> completedList = processAllService.getCompletedList(page, queryWrapper, req); IPage<ProcessAll> completedList = processAllService.getCompletedList(page, queryWrapper, req);
return Result.OK(completedList); return Result.OK(completedList);
@@ -101,7 +104,7 @@ public class WorkCenterController {
String userId = loginUser.getId(); String userId = loginUser.getId();
queryWrapper.eq("pa.create_user_id",userId); queryWrapper.eq("pa.create_user_id",userId);
queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue());
queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName());
Page<ProcessAll> page = new Page<>(pageNo, pageSize); Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> sentList = processAllService.getSentList(page, queryWrapper, req); IPage<ProcessAll> sentList = processAllService.getSentList(page, queryWrapper, req);
return Result.OK(sentList); return Result.OK(sentList);
@@ -114,7 +117,7 @@ public class WorkCenterController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll, true); QueryWrapper<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll, true);
queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName());
Page<ProcessAll> page = new Page<>(pageNo, pageSize); Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> sentList = processAllService.getAllList(page, queryWrapper, req); IPage<ProcessAll> sentList = processAllService.getAllList(page, queryWrapper, req);
return Result.OK(sentList); return Result.OK(sentList);
laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
+4
View File
@@ -48,6 +48,7 @@
pa.project_id pa.project_id
from process_approval_record par from process_approval_record par
left join process_all pa on pa.process_instance_id = par.process_instance_id left join process_all pa on pa.process_instance_id = par.process_instance_id
left join sys_user u on u.id = pa.create_user_id
${ew.customSqlSegment} ${ew.customSqlSegment}
<include refid="order1"/> <include refid="order1"/>
</select> </select>
@@ -69,6 +70,7 @@
pa.completed_task_time pa.completed_task_time
from process_all pa from process_all pa
left join process_approval_record par on pa.process_instance_id = par.process_instance_id left join process_approval_record par on pa.process_instance_id = par.process_instance_id
left join sys_user u on u.id = pa.create_user_id
${ew.customSqlSegment} ${ew.customSqlSegment}
<include refid="order"/> <include refid="order"/>
</select> </select>
@@ -89,6 +91,7 @@
pa.received_task_time, pa.received_task_time,
pa.completed_task_time pa.completed_task_time
from process_all pa from process_all pa
left join sys_user u on u.id = pa.create_user_id
${ew.customSqlSegment} ${ew.customSqlSegment}
<include refid="order"/> <include refid="order"/>
</select> </select>
@@ -109,6 +112,7 @@
pa.received_task_time, pa.received_task_time,
pa.completed_task_time pa.completed_task_time
from process_all pa from process_all pa
left join sys_user u on u.id = pa.create_user_id
${ew.customSqlSegment} ${ew.customSqlSegment}
<include refid="order"/> <include refid="order"/>
</select> </select>