update 流程中心
This commit is contained in:
+1
-1
@@ -93,7 +93,7 @@ public class WorkCenterController {
|
|||||||
QueryWrapper<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
|
QueryWrapper<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
|
||||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String userId = loginUser.getId();
|
String userId = loginUser.getId();
|
||||||
queryWrapper.eq("pa.user_id",userId);
|
queryWrapper.eq("pa.create_user_id",userId);
|
||||||
|
|
||||||
Page<ProcessAll> page = new Page<>(pageNo, pageSize);
|
Page<ProcessAll> page = new Page<>(pageNo, pageSize);
|
||||||
IPage<ProcessAll> sentList = processAllService.getSentList(page, queryWrapper);
|
IPage<ProcessAll> sentList = processAllService.getSentList(page, queryWrapper);
|
||||||
|
|||||||
+25
-3
@@ -9,15 +9,37 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getCompletedList" resultType="com.jero.modules.activiti.entity.ProcessAll">
|
<select id="getCompletedList" resultType="com.jero.modules.activiti.entity.ProcessAll">
|
||||||
select p.*, group_concat(par.user_id) as handleUserId, par.node_id
|
select p.id,
|
||||||
|
p.prc_name,
|
||||||
|
p.process_instance_id,
|
||||||
|
p.prc_mes,
|
||||||
|
p.prc_num,
|
||||||
|
p.create_user_id,
|
||||||
|
p.prc_type,
|
||||||
|
p.prc_status,
|
||||||
|
p.create_user_name,
|
||||||
|
p.mes,
|
||||||
|
p.create_time,
|
||||||
|
p.end_time,
|
||||||
|
p.over_time,
|
||||||
|
p.due_time,
|
||||||
|
p.project_id,
|
||||||
|
p.project_name,
|
||||||
|
p.prc_name_en,
|
||||||
|
group_concat(par.user_id) as handleUserId,
|
||||||
|
par.node_id
|
||||||
from (
|
from (
|
||||||
select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime, par.node_id
|
select pa.*,
|
||||||
|
max(par.create_time) as receivedTaskTime,
|
||||||
|
max(par.end_time) as completedTaskTime,
|
||||||
|
par.node_id
|
||||||
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
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
) p
|
) p
|
||||||
left join process_approval_record par on p.process_instance_id = par.process_instance_id
|
left join process_approval_record par on p.process_instance_id = par.process_instance_id
|
||||||
WHERE par.finish_flag = 0 or par.id is null
|
WHERE par.finish_flag = 0
|
||||||
|
or par.id is null
|
||||||
group by p.process_instance_id
|
group by p.process_instance_id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user