项目计划安排页面排序调整

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/entity/ProjectPlanArrage.java

@@ -22,8 +22,8 @@ public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage>{
     private String operationUnit;//运行单位项目经理
 
 
-    private String arrageFlag;//未安排标识
-    private String whetherStatus;//是否未父类
+    private String arrageFlag;//未安排标识 0-未安排 1-已安排
+    private String whetherStatus;//是否未父类 0-时子类 1-是父类
 
     private String htmlStatus;//验证开关字段 0-无提示 1-有提示
 

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/service/ProjectPlanArrageService.java

@@ -736,7 +736,7 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
     }
 
 
-    //初始安排的计划项目--右侧表格数据 展示计划安排的项目--根据管理包进行排序
+    //初始安排的计划项目--右侧表格数据 展示计划安排的项目--根据管理包进行排序 -- 以关联包排序
     public void getSortAssPackage(List<ProjectPlanArrage> projectPlanArrages){
         Collections.sort(projectPlanArrages, new Comparator<ProjectPlanArrage>() {
             @Override
@@ -775,4 +775,35 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
         }
         return flag;
     }
+    //初始项目经理发布流程后  --  以停电包进行排序，如果为null 则放到最后
+    public void getSortPowerPackage(List<ProjectPlanArrage> projectPlanArrages){
+        //最后计划安排：存放  停电包为空的 数据
+        List<ProjectPlanArrage> endPlan = new ArrayList<ProjectPlanArrage>();
+        for (ProjectPlanArrage projectPlanArrage:projectPlanArrages){
+            if (null==projectPlanArrage.getPowerPackageSort()){
+                endPlan.add(projectPlanArrage);
+            }
+        }
+        for (int i = 0; i < projectPlanArrages.size(); i++) {
+            if (null == projectPlanArrages.get(i).getPowerPackageSort()){
+                projectPlanArrages.remove(i);
+                i--;
+            }
+        }
+        Collections.sort(projectPlanArrages, new Comparator<ProjectPlanArrage>() {
+            @Override
+            public int compare(ProjectPlanArrage o1, ProjectPlanArrage o2) {
+                if (o1.getPowerPackageSort()>o2.getPowerPackageSort()){
+                    return 1;
+                }
+                if (o1.getPowerPackageSort()==o2.getPowerPackageSort()){
+                    return 0;
+                }
+                return -1;
+            }
+        });
+        for (ProjectPlanArrage planArrage:endPlan){
+            projectPlanArrages.add(planArrage);
+        }
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/web/ProjectPlanArrageController.java

@@ -191,6 +191,7 @@ public class ProjectPlanArrageController extends BaseController {
         projectPlanArrage.setWhetherStatus("0");
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("projectPlan");
         Page<ProjectPlanArrage> page = findPageList(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
+        projectPlanArrageService.getSortPowerPackage(page.getList());
         return getBootstrapData(page);
     }
 
@@ -494,7 +495,7 @@ public class ProjectPlanArrageController extends BaseController {
         projectPlanArrage.setWhetherStatus("0");
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("summaryList");
         Page<ProjectPlanArrage> page = findPageListCons(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
-        projectPlanArrageService.getSortAssPackage(page.getList());
+        projectPlanArrageService.getSortPowerPackage(page.getList());
         return getBootstrapData(page);
     }
     //施工单位项目经理安排时间列表 session(summaryList) 页面(constructionDateList)
@@ -505,6 +506,7 @@ public class ProjectPlanArrageController extends BaseController {
         projectPlanArrage.setWhetherStatus("0");
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("summaryList");
         Page<ProjectPlanArrage> page = findPageListCons(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
+        projectPlanArrageService.getSortPowerPackage(page.getList());
         return getBootstrapData(page);
     }
 
@@ -512,22 +514,12 @@ public class ProjectPlanArrageController extends BaseController {
         dataRuleFilter(entity);
         entity.setPage(page);
         List<ProjectPlanArrage> planArrages = new ArrayList<ProjectPlanArrage>();
-        String name = UserUtils.getUser().getName();
-        for (ProjectPlanArrage projectPlanArrage:list){
-            if (entity.getWhetherStatus().equals(projectPlanArrage.getWhetherStatus())&&entity.getArrageFlag().equals(projectPlanArrage.getArrageFlag())){
-                if (name.equals(projectPlanArrage.getConstructionUnit())){
-                    if (null != projectPlanArrage.getBackToStauts() && projectPlanArrage.getBackToStauts().equals("2")) {
-                        projectPlanArrage.setHtmlStatus("2");
-                    }
-                    planArrages.add(projectPlanArrage);
-                }
-            }
-        }
         for (ProjectPlanArrage projectPlanArrage:list){
             if (entity.getWhetherStatus().equals(projectPlanArrage.getWhetherStatus())&&entity.getArrageFlag().equals(projectPlanArrage.getArrageFlag())){
-                if (!name.equals(projectPlanArrage.getConstructionUnit())){
-                    planArrages.add(projectPlanArrage);
+                if (null != projectPlanArrage.getBackToStauts() && projectPlanArrage.getBackToStauts().equals("2")) {
+                    projectPlanArrage.setHtmlStatus("2");
                 }
+                planArrages.add(projectPlanArrage);
             }
         }
         page.setList(planArrages);
@@ -791,6 +783,7 @@ public class ProjectPlanArrageController extends BaseController {
         projectPlanArrage.setWhetherStatus("0");
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("networkList");
         Page<ProjectPlanArrage> page = findPageListNetWorkArragePlan(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
+        projectPlanArrageService.getSortPowerPackage(page.getList());
         return getBootstrapData(page);
     }
     public Page<ProjectPlanArrage> findPageListNetWorkArragePlan(Page<ProjectPlanArrage> page, ProjectPlanArrage entity,List<ProjectPlanArrage> list) {
@@ -822,6 +815,7 @@ public class ProjectPlanArrageController extends BaseController {
         projectPlanArrage.setWhetherStatus("0");
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("networkList");
         Page<ProjectPlanArrage> page = findPageList(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
+        projectPlanArrageService.getSortPowerPackage(page.getList());
         return getBootstrapData(page);
     }
     //安排计划时间列表 --配网项目经理（第二个节点）--人工选择带电页面（newDateList）
@@ -832,6 +826,7 @@ public class ProjectPlanArrageController extends BaseController {
         projectPlanArrage.setWhetherStatus("0");
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("networkList");
         Page<ProjectPlanArrage> page = findPageList(new Page<ProjectPlanArrage>(request, response),projectPlanArrage,projectPlans);
+        projectPlanArrageService.getSortPowerPackage(page.getList());
         return getBootstrapData(page);
     }
     /*