Merge remote-tracking branch 'origin/master'

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

@@ -396,8 +396,13 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
         for (String id:strings){
             for (ProjectPlanArrage planArrage:projectPlans){
                 if (id.equals(planArrage.getId())){
-                    planArrage.setBackToStauts("0");
-                    planArrage.setBackToText(backToText);
+                    if (null!=planArrage.getBackToStauts()&&planArrage.getBackToStauts().equals("2")){
+                        planArrage.setBackToStauts("0");
+                        planArrage.setArrageFlag("0");
+                    }else {
+                        planArrage.setBackToStauts("0");
+                        planArrage.setBackToText(backToText);
+                    }
                     break;
                 }
             }

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

@@ -476,6 +476,9 @@ public class ProjectPlanArrageController extends BaseController {
         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);
                 }
             }
@@ -645,6 +648,7 @@ public class ProjectPlanArrageController extends BaseController {
         List<Map<String, Object>> bookStrapTree = BookStrapTreeUtil.getAllBookStrapTree(objects, planArrageList,"1");
         return bookStrapTree;
     }
+
     //添加 -- 修改 时间
     @ResponseBody
     @RequestMapping(value = "addtimeNet")
@@ -736,12 +740,37 @@ public class ProjectPlanArrageController extends BaseController {
         return j;
     }
 
-    //安排计划设置时间 --返回页面 --- 施工单位项目经理
+    //安排计划设置时间 --返回页面 --- 配网项目经理
     @RequestMapping(value = "planNetDate")
     public String planNetDate(Model model){
         return "modules/sg/managementcenter/projectPlanArrage/act/newDateList";
     }
 
+    //验证时间 -- 配网项目经理
+    @ResponseBody
+    @RequestMapping(value = "judgeAddTimeNet")
+    public AjaxJson getJudgeAddTimeNet(HttpServletRequest request){
+        AjaxJson ajaxJson = new AjaxJson();
+        List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("networkList");
+        try {
+//            boolean judgePlanTimeNULL = projectPlanActService.getJudgePlanTimeNULL(projectPlans);
+//            if (judgePlanTimeNULL){
+//                ajaxJson.setSuccess(false);
+//                ajaxJson.setMsg("1");
+//                return ajaxJson;
+//            }
+            boolean flag = projectPlanActService.getJudgePlanTimeService(projectPlans);
+            if (flag){
+                ajaxJson.setSuccess(false);
+                ajaxJson.setMsg("时间不一致");
+                return ajaxJson;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ajaxJson;
+    }
+
     //安排计划时间列表
     @ResponseBody
     @RequestMapping(value = "planNetDateTable")

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/constructionManageAct.js

@@ -109,7 +109,7 @@
                 for (var i =0;i<split.length;i++){
                     if (split[i].htmlStatus=="2"){
                         // this.data.rows[i].setAttribute("style","color: red;");
-                        rows[i+1].style.backgroundColor = "#e6e6e6"
+                        rows[i+1].style.backgroundColor = "#BDD2AE"
                     }
                 }
             },

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/netWorkManageAct.js

@@ -298,36 +298,20 @@ function newWorkSubmit() {
             var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
             var flag = iframeWin.contentWindow.save();
             if (flag){
-                jp.prompt("审核通过", function (message) {
-                    jp.post("${ctx}/sg/managementCenter/projectPlanArrage/newWorkRunProInsId",
-                        {
-                            "flag": "yes",
-                            "comment": window.encodeURI(message)
-                        },
-                        function (data) {
-                            if(data.success){
-                                jp.success(data.msg);
-                                top.layer.close(index);
-                                jp.go("${ctx}/act/task/todo")
-                            }else {
-                                jp.error(data.msg);
-                            }
+                $.get("${ctx}/sg/managementCenter/projectPlanArrage/judgeAddTimeNet", function(data){
+                    if(data.success){
+                        // jp.success("安排计划成功");
+                        planSuccess();
+                        top.layer.close(index);
+                    }else if (data.msg == "1"){
+                        jp.error("您还要项目具体安排时间未填!");
+                    }else{
+                        jp.confirm('您安排的同一开关的项目时间不相同,是否继续？', function(){
+                            planSuccess();
+                            top.layer.close(index);
                         })
-                });
-                // $.get("${ctx}/sg/managementCenter/projectPlanArrage/judgeAddTime", function(data){
-                //     if(data.success){
-                //         jp.success("安排计划成功");
-                //         withTheProcess();
-                //         top.layer.close(index);
-                //     }else{
-                //         // jp.confirm('您安排的计划时间与其他项目经理安排时间不一致,是否继续执行？', function(){
-                //         //     withTheProcess();
-                //         // })
-                //         jp.error(data.msg);
-                //         top.layer.close(index);
-                //     }
-                // })
-                // refresh();
+                    }
+                })
             }
         },
         btn2: function(index){
@@ -354,5 +338,21 @@ function newWorkSubmit() {
     //         })
     // });
 }
-
+function planSuccess() {
+    jp.prompt("审核通过", function (message) {
+        jp.post("${ctx}/sg/managementCenter/projectPlanArrage/newWorkRunProInsId",
+            {
+                "flag": "yes",
+                "comment": window.encodeURI(message)
+            },
+            function (data) {
+                if(data.success){
+                    jp.success(data.msg);
+                    jp.go("${ctx}/act/task/todo")
+                }else {
+                    jp.error(data.msg);
+                }
+            })
+    });
+}
 </script>