Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改树遍历

Browse Source
This commit is contained in:
huangzj
2023-03-20 15:31:38 +08:00
parent b1bc145e57
commit a99d9febaa
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
View File

@@ -547,7 +547,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
cycleNum = rSurveyCyclePOS.get (0).getSurveyCycle ( ); cycleNum = rSurveyCyclePOS.get (0).getSurveyCycle ( );
} }
LocalDate enddate = LocalDate.now ( ).plusYears (cycleNum); LocalDate enddate = LocalDate.now ( ).plusYears (cycleNum);
rSurveyCyclePO = new RSurveyCyclePO(); rSurveyCyclePO = new RSurveyCyclePO ( );
rSurveyCyclePO.setStartYear (LocalDate.now ( )); rSurveyCyclePO.setStartYear (LocalDate.now ( ));
rSurveyCyclePO.setEndYear (enddate); rSurveyCyclePO.setEndYear (enddate);
rSurveyCyclePO.setSurveyCycle (cycleNum); rSurveyCyclePO.setSurveyCycle (cycleNum);
@@ -556,7 +556,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper1 = new LambdaQueryWrapper<> ( ); LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper1 = new LambdaQueryWrapper<> ( );
queryWrapper1.eq (RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId ( )); queryWrapper1.eq (RGeneralSurveyPlanPO::getCycleId, rSurveyCyclePO.getId ( ));
queryWrapper1.in(RGeneralSurveyPlanPO::getStatus,Stream.of (3,4).collect(Collectors.toList())); queryWrapper1.in (RGeneralSurveyPlanPO::getStatus, Stream.of (3, 4).collect (Collectors.toList ( )));
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper1); List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper1);
List<String> planIds = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( )); List<String> planIds = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( ));
List<String> subIds = new ArrayList<> ( ); List<String> subIds = new ArrayList<> ( );
@@ -614,7 +614,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
} }
} }
result = recursion(result,orgdid); result = recursion (result.get (0), orgdid);
return result; return result;
} }
@@ -641,25 +641,29 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
} else { } else {
flag = false; flag = false;
} }
RSurveyCycleVO rSurveyCycleVO = new RSurveyCycleVO(); RSurveyCycleVO rSurveyCycleVO = new RSurveyCycleVO ( );
BeanUtils.copyProperties (rSurveyCyclePO, rSurveyCycleVO); BeanUtils.copyProperties (rSurveyCyclePO, rSurveyCycleVO);
rSurveyCycleVO.setFlag (flag); rSurveyCycleVO.setFlag (flag);
return rSurveyCycleVO; return rSurveyCycleVO;
} }
public List<DeptSubstationVO> recursion ( List<DeptSubstationVO> result,String orgdid){ public List<DeptSubstationVO> recursion(DeptSubstationVO result, String orgdid) {
List<DeptSubstationVO> deptSubstationVOList = new ArrayList<> ( );
if (Objects.equals (result.getId ( ), orgdid)) {
deptSubstationVOList.add (result);
return deptSubstationVOList;
List<DeptSubstationVO> finalResult = new ArrayList<> (); } else {
for (DeptSubstationVO deptSubstationVO : result) { for (DeptSubstationVO deptSubstationVO : result.getChildren ( )) {
if(Objects.equals (deptSubstationVO.getId (),orgdid)){
finalResult.add (deptSubstationVO); List<DeptSubstationVO> recursion = recursion (deptSubstationVO, orgdid);
return finalResult; if(recursion.size ()>0){
}else {
List<DeptSubstationVO> recursion = recursion (deptSubstationVO.getChildren ( ), orgdid);
return recursion; return recursion;
} }
} }
return null; }
return deptSubstationVOList;
} }
} }