|
@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.contract; |
|
@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.contract; |
|
3
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
3
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
4
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
4
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
5
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
5
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
6
|
+import com.github.pagehelper.Page;
|
|
6
|
import com.github.pagehelper.PageInfo;
|
7
|
import com.github.pagehelper.PageInfo;
|
|
7
|
import com.lframework.starter.bpm.dto.FlowTaskDto;
|
8
|
import com.lframework.starter.bpm.dto.FlowTaskDto;
|
|
8
|
import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
|
9
|
import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
|
|
@@ -170,6 +171,28 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -170,6 +171,28 @@ public class ContractDistributorStandardServiceImpl extends |
|
170
|
// vo.setContractIdList(contractIdList);
|
171
|
// vo.setContractIdList(contractIdList);
|
|
171
|
// }
|
172
|
// }
|
|
172
|
|
173
|
|
|
|
|
174
|
+ // 是否需要审核:true=只查当前用户待审核(正式合同或标准合同任一待办)的数据;false或空=按原逻辑查所有
|
|
|
|
175
|
+ // examineType:FORMAL-只看正式合同待办;STANDARD-只看标准合同待办;空=两者任一
|
|
|
|
176
|
+ // 将待办ID集合下沉到SQL过滤,直接走数据库分页,避免全量查询入内存
|
|
|
|
177
|
+ if (Boolean.TRUE.equals(vo.getNeedExamine())) {
|
|
|
|
178
|
+ if (CollectionUtils.isEmpty(flowTaskList)) {
|
|
|
|
179
|
+ Page<ContractDistributorStandard> emptyPage = new Page<>(pageIndex, pageSize);
|
|
|
|
180
|
+ emptyPage.setTotal(0);
|
|
|
|
181
|
+ return PageResultUtil.convert(new PageInfo<>(emptyPage));
|
|
|
|
182
|
+ }
|
|
|
|
183
|
+
|
|
|
|
184
|
+ Set<String> formalTodoIds = flowTaskList.stream()
|
|
|
|
185
|
+ .filter(flowTaskDto -> FORMAL_FLAG.equals(flowTaskDto.getMode()))
|
|
|
|
186
|
+ .map(FlowTaskDto::getBusinessId)
|
|
|
|
187
|
+ .collect(Collectors.toSet());
|
|
|
|
188
|
+ Set<String> standardTodoIds = flowTaskList.stream()
|
|
|
|
189
|
+ .filter(flowTaskDto -> STANDARD_FLAG.equals(flowTaskDto.getMode()))
|
|
|
|
190
|
+ .map(FlowTaskDto::getBusinessId)
|
|
|
|
191
|
+ .collect(Collectors.toSet());
|
|
|
|
192
|
+ vo.setExamineFormalIds(new ArrayList<>(formalTodoIds));
|
|
|
|
193
|
+ vo.setExamineStandardIds(new ArrayList<>(standardTodoIds));
|
|
|
|
194
|
+ }
|
|
|
|
195
|
+
|
|
173
|
PageHelperUtil.startPage(pageIndex, pageSize);
|
196
|
PageHelperUtil.startPage(pageIndex, pageSize);
|
|
174
|
List<ContractDistributorStandard> datas = this.query(vo);
|
197
|
List<ContractDistributorStandard> datas = this.query(vo);
|
|
175
|
if (CollectionUtils.isEmpty(datas)) {
|
198
|
if (CollectionUtils.isEmpty(datas)) {
|