1、修改【我确认的】接口
This commit is contained in:
@@ -111,6 +111,11 @@ public class SpdmAddDemandReq extends BaseEntity {
|
||||
*/
|
||||
private String nodeId;
|
||||
|
||||
/**
|
||||
* 工位id
|
||||
*/
|
||||
private String workspaceId;
|
||||
|
||||
/**
|
||||
* 3D负责人
|
||||
*/
|
||||
|
||||
@@ -356,6 +356,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
||||
if (CollectionUtils.isNotEmpty(pDemandMemberVoList)) {
|
||||
List<String> myDemandIdList = pDemandMemberVoList.stream().map(SpdmDemandMemberVo::getDemandId).toList();
|
||||
demandList = demandList.stream().filter(demand -> myDemandIdList.contains(demand.getUuid())).toList();
|
||||
}else {
|
||||
return SdmResponse.success(jsonObject);
|
||||
}
|
||||
}
|
||||
if (CollectionUtils.isEmpty(demandList)) {
|
||||
|
||||
@@ -1002,6 +1002,8 @@ public class TaskServiceImpl implements ITaskService {
|
||||
taskVoList = mapper.taskList(req, tenantId, allNodeIdList, pos, limit);
|
||||
}
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("total", taskVoList.size());
|
||||
taskVoList = taskVoList.stream().skip((long) (req.getCurrent() - 1) * req.getSize()).limit(req.getSize()).toList();
|
||||
if (CollectionUtils.isEmpty(taskVoList)) {
|
||||
log.error("数据分析中未查询到任务信息");
|
||||
jsonObject.put("data", new ArrayList<>());
|
||||
@@ -1054,7 +1056,6 @@ public class TaskServiceImpl implements ITaskService {
|
||||
}
|
||||
jsonObject.put("currentPage", req.getCurrent());
|
||||
jsonObject.put("pageSize", req.getSize());
|
||||
jsonObject.put("total", taskVoList.size());
|
||||
jsonObject.put("data", taskVoList.stream().skip((long) (req.getCurrent() - 1) * req.getSize()).limit(req.getSize()).toList());
|
||||
return SdmResponse.success(jsonObject);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user