项目计划安排日计划修改

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

@@ -5,7 +5,7 @@ import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.Date;
 
-public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage> {
+public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage>{
     private String projectName; //项目名称
     private String projectNumber; //项目定义号
     private String projectLine; //线路

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

@@ -128,7 +128,7 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
             plans.setArrangeDailyPlan("0");
             if (null!=splitNames){
                 for (String s:splitNames){
-                    if (s.equals(plans)){
+                    if (s.equals(plans.getProjectName())){
                         plans.setArrangeDailyPlan("1");
                         break;
                     }
@@ -136,7 +136,7 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
             }
             if (null!=splitIds){
                 for (String id:splitIds){
-                    if (id.equals(projectDailyPlan.getProjectNumber())){
+                    if (id.equals(plans.getProjectNumber())){
                         plans.setArrangeDailyPlan("1");
                         break;
                     }

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

@@ -348,35 +348,63 @@ public class ProjectPlanActService{
         boolean flag = false;
         List<ProjectPlanArrage> projectPlanArrageList = new ArrayList<ProjectPlanArrage>();
         for (ProjectPlanArrage plan:projectPlanArrages){
-            projectPlanArrageList.add(plan);
+            if (plan.getArrageFlag().equals("1")){
+                if (null!=plan.getPowerPackage()&&!"".equals(plan.getPowerPackage())){
+                    projectPlanArrageList.add(plan);
+                }
+            }
         }
-        HashSet<String> stringHashSet = new HashSet<String>();
-        for (ProjectPlanArrage planArrage:projectPlanArrages){
-            flag = false;
-            //如果时间不为空
-            if (null!=planArrage.getProjectDate()){
-                stringHashSet = new HashSet<String>();
-                PackagingUtil.getSplice(planArrage.getProjectPowerRange(),stringHashSet);
-                for (ProjectPlanArrage planArrage1:projectPlanArrageList){
-                    if (null!=planArrage1.getProjectDate()){
-                        for (String s:stringHashSet){
-                            if (planArrage1.getProjectPowerRange().contains(s)){
-                                if (!sdf.format(planArrage.getProjectDate()).equals(sdf.format(planArrage1.getProjectDate()))){
-                                    flag = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    if (flag){
-                        break;
+        //存放停电包 hashSet
+        HashSet<String> hashSets = new HashSet<String>();
+        for (ProjectPlanArrage projectPack:projectPlanArrageList){
+            hashSets.add(projectPack.getPowerPackage());//添加至停电包集合
+        }
+        //循环判断hashSet
+        HashSet<String> packHashSet = new HashSet<String>();
+        for (String str:hashSets){
+            packHashSet = new HashSet<String>();
+            for (ProjectPlanArrage pa:projectPlanArrageList){
+                if (str.equals(pa.getPowerPackage())){
+                    if (null!=pa.getProjectDate()){
+                        packHashSet.add(sdf.format(pa.getProjectDate()));
                     }
                 }
             }
-            if (flag){
-                break;
+            if (packHashSet.size()>1){
+                flag = true;
+                return flag;
             }
         }
+
+
+
+//        HashSet<String> stringHashSet = new HashSet<String>();
+//        for (ProjectPlanArrage planArrage:projectPlanArrages){
+//            flag = false;
+//            //如果时间不为空
+//            if (null!=planArrage.getProjectDate()){
+//                stringHashSet = new HashSet<String>();
+//                PackagingUtil.getSplice(planArrage.getProjectPowerRange(),stringHashSet);
+//                for (ProjectPlanArrage planArrage1:projectPlanArrageList){
+//                    if (null!=planArrage1.getProjectDate()){
+//                        for (String s:stringHashSet){
+//                            if (planArrage1.getProjectPowerRange().contains(s)){
+//                                if (!sdf.format(planArrage.getProjectDate()).equals(sdf.format(planArrage1.getProjectDate()))){
+//                                    flag = true;
+//                                    break;
+//                                }
+//                            }
+//                        }
+//                    }
+//                    if (flag){
+//                        break;
+//                    }
+//                }
+//            }
+//            if (flag){
+//                break;
+//            }
+//        }
         return  flag;
     }
 
@@ -440,7 +468,7 @@ public class ProjectPlanActService{
         OaNotify oaNotify = new OaNotify();
         int count = 0;
         oaNotify.setType("9");
-        oaNotify.setTitle("项目计划安排通知");//非缺货信息
+        oaNotify.setTitle("项目计划安排通知");
         oaNotify.setContent("请在详情中查看...");
         oaNotify.setStatus("1");
         oaNotify.setOaNotifyRecordIds(ids);

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

@@ -690,4 +690,45 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
         }
         return list;
     }
+
+
+    //初始安排的计划项目--右侧表格数据 展示计划安排的项目--根据管理包进行排序
+    public void getSortAssPackage(List<ProjectPlanArrage> projectPlanArrages){
+        Collections.sort(projectPlanArrages, new Comparator<ProjectPlanArrage>() {
+            @Override
+            public int compare(ProjectPlanArrage o1, ProjectPlanArrage o2) {
+                if (o1.getAssociatedSort()<o2.getAssociatedSort()){
+                    return 1;
+                }
+                if (o1.getAssociatedSort()==o2.getAssociatedSort()){
+                    return 0;
+                }
+                return -1;
+            }
+        });
+    }
+    //初始安排的计划项目--右侧表格数据 打停电包验证是否是统一关联包 true 验证通过
+    public Boolean getPowerOutagesInspection(List<String> strings,List<ProjectPlanArrage> projectPlanArrages){
+        boolean flag = true;
+        String assPackage = "";
+        for (ProjectPlanArrage planArrage:projectPlanArrages){
+            //计划安排的项目
+            if (planArrage.getArrageFlag().equals("1")){
+                //循环id集合
+                for (String s:strings){
+                    if (s.equals(planArrage.getId())){ //如果id相等
+                        if (!"".equals(assPackage)){
+                            if (!assPackage.equals(planArrage.getAssociatedBag())){
+                                flag = false;
+                                return flag;
+                            }
+                        }else {
+                            assPackage = planArrage.getAssociatedBag();//赋初始值
+                        }
+                    }
+                }
+            }
+        }
+        return flag;
+    }
 }

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

@@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -116,13 +117,19 @@ public class ProjectDailyPlanController extends BaseController {
     //新增日计划选择项目定义号，或者项目名称后走的方法（可不选）
     @RequestMapping(value = "initAddDailyPlan")
     public String getInitAddDailyPlan(ProjectDailyPlan projectDailyPlan,Model model,HttpServletRequest request){
-        //获取所有为安排的日计划
-        List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan();
-        List<ProjectDailyPlan> sxDailyPlan = projectDailyPlanService.getSxDailyPlan(projectDailyPlans, projectDailyPlan);
-        for (ProjectDailyPlan plan:sxDailyPlan){
-            plan.preInsert();
+        try {
+            String comment1 = URLDecoder.decode(projectDailyPlan.getProjectName(), "UTF-8");
+            projectDailyPlan.setProjectName(comment1);
+            //获取所有为安排的日计划
+            List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan();
+            List<ProjectDailyPlan> sxDailyPlan = projectDailyPlanService.getSxDailyPlan(projectDailyPlans, projectDailyPlan);
+            for (ProjectDailyPlan plan:sxDailyPlan){
+                plan.preInsert();
+            }
+            request.getSession().setAttribute("sxDailyPlan",sxDailyPlan);
+        }catch (Exception e){
+           e.printStackTrace();
         }
-        request.getSession().setAttribute("sxDailyPlan",sxDailyPlan);
         return "modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyArrageForm";
     }
     //初始安排的计划项目--操作列表