|
@@ -606,10 +606,29 @@ public class ProjectPlanArrageController extends BaseController {
|
|
|
projectPlanArrage.setArrageFlag("1");
|
|
|
projectPlanArrage.setWhetherStatus("0");
|
|
|
List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("networkList");
|
|
|
- Page<ProjectPlanArrage> page = findPageList(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
|
|
|
+ Page<ProjectPlanArrage> page = findPageListNetWorkArragePlan(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
|
|
|
return getBootstrapData(page);
|
|
|
}
|
|
|
-
|
|
|
+ public Page<ProjectPlanArrage> findPageListNetWorkArragePlan(Page<ProjectPlanArrage> page, ProjectPlanArrage entity,List<ProjectPlanArrage> list) {
|
|
|
+ dataRuleFilter(entity);
|
|
|
+ entity.setPage(page);
|
|
|
+ List<ProjectPlanArrage> planArrages = new ArrayList<ProjectPlanArrage>();
|
|
|
+ if (null!=list){
|
|
|
+ for (ProjectPlanArrage projectPlanArrage:list){
|
|
|
+ if (entity.getWhetherStatus().equals(projectPlanArrage.getWhetherStatus())&&entity.getArrageFlag().equals(projectPlanArrage.getArrageFlag())){
|
|
|
+ if (projectPlanArrage.getBackToStauts().equals("2")){
|
|
|
+ projectPlanArrage.setHtmlStatus("2");//新增项目
|
|
|
+ }
|
|
|
+ if (null!=projectPlanArrage.getBackToText()&&!"".equals(projectPlanArrage.getBackToText())){
|
|
|
+ projectPlanArrage.setHtmlStatus("1");//删除项目
|
|
|
+ }
|
|
|
+ planArrages.add(projectPlanArrage);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ page.setList(planArrages);
|
|
|
+ return page;
|
|
|
+ }
|
|
|
//所有未安排的计划-树形表格展示--配网项目经理
|
|
|
@ResponseBody
|
|
|
@RequestMapping(value = "bootstrapNetWorkTreeTable")
|