项目计划安排

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

@@ -187,6 +187,7 @@ public class ProjectPlanActService{
             projectActProclnsAss.preInsert();
             projectActProclnsAss.setProcInsId(procInsId);
             projectActProclnsAss.setCustomId("0");
+            projectActProclnsAss.setRemarks(planArrage.getRemarks());//发起人备注
             projectActProclnsAss.setProjectName(planArrage.getProjectName());
             projectActProclnsAss.setProjectNumber(planArrage.getProjectNumber());
             projectActProclnsAss.setProjectLine(planArrage.getProjectLine());
@@ -286,6 +287,7 @@ public class ProjectPlanActService{
                     planArrage.setAssociatedSort(proclnsAss.getAssociatedSort());
                     planArrage.setPowerPackage(proclnsAss.getPowerPackage());
                     planArrage.setPowerPackageSort(proclnsAss.getPowerPackageSort());
+                    planArrage.setRemarks(proclnsAss.getRemarks());
                     if (proclnsAss.getConstructionUnit().equals(name)){
                         planArrage.setOperationStatus("0");//允许操作
                     }else {
@@ -313,6 +315,7 @@ public class ProjectPlanActService{
                     planArrage.setAssociatedSort(proclnsAss.getAssociatedSort());
                     planArrage.setPowerPackage(proclnsAss.getPowerPackage());
                     planArrage.setPowerPackageSort(proclnsAss.getPowerPackageSort());
+                    planArrage.setRemarks(proclnsAss.getRemarks());
                     break;
                 }
             }
@@ -443,6 +446,14 @@ public class ProjectPlanActService{
         oaNotify.setOaNotifyRecordIds(ids);
         oaNotifyService.saveListProjectArrage(oaNotify,netList);
         projectPlanActMapper.insertProcInsAssList(netList);//保存流程表
+
+        List<String> strings = new ArrayList<String>();
+        for (ProjectActProclnsAss proclnsAss:netList){
+            if (null!=proclnsAss.getProjectName()&&!"".equals(proclnsAss.getProjectName())){
+                strings.add(proclnsAss.getProjectName());
+            }
+        }
+        projectPlanActMapper.updateMaterialProject(strings);
         List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
         for(OaNotifyRecord o : list){
             count++;

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

@@ -350,7 +350,17 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
             }
         }
     }
-
+    //发起人备注
+    public void getRemarksBack(List<ProjectPlanArrage> projectPlanArrages,List<String> idList,ProjectPlanArrage projectPlanArrage){
+        for (ProjectPlanArrage planArrage:projectPlanArrages){
+            for (String id:idList){
+                if (planArrage.getId().equals(id)){
+                    planArrage.setRemarks(projectPlanArrage.getRemarks());
+                    break;
+                }
+            }
+        }
+    }
     //退回项目计划 -- 单个项目 -- 按钮功能 获取相同id相同以及包含开关的方法
     public void getTheRoBackOneService(List<ProjectPlanArrage> projectPlanArrages,List<String> idList){
        for (String id:idList){

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

@@ -4,7 +4,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.websocket.service.system.SystemInfoSocketHandler;
 import com.jeeplus.core.persistence.Page;
@@ -116,6 +115,10 @@ public class ProjectPlanArrageController extends BaseController {
                 //开关 - 项目 统一集合 用WhetherStatus区分
                 List<ProjectPlanArrage> projectPlanList = PackagingUtil.getProjectPlanList(projectPlanArrage,projectList);
                 for (ProjectPlanArrage par:projectList){
+                    if (par.getWhetherStatus().equals("0")&&par.getArrageFlag().equals("1")){
+                        par.setAssociatedBag("关联项目包1");
+                        par.setAssociatedSort(1);
+                    }
                     par.setProjectMonthDate(projectPlanArrage.getProjectMonthDate());
                     par.setHtmlStatus("0");
                     par.preInsert();
@@ -313,6 +316,45 @@ public class ProjectPlanArrageController extends BaseController {
         }
         return j;
     }
+    //发起人备注 -- 配网项目经理
+    @ResponseBody
+    @RequestMapping(value = "remarksBack")
+    public Result getRemarksBack(ProjectPlanArrage projectPlanArrage, String ids, HttpServletRequest request){
+        Result j = new Result();
+        j.setSuccess(true);
+        j.setMessage("备注成功");
+        List<String> strings = PackagingUtil.getString(ids);
+        boolean flag = true;
+        try {
+            String comment = URLDecoder.decode(projectPlanArrage.getRemarks(), "UTF-8");
+            projectPlanArrage.setRemarks(comment);
+            //获取项目信息
+            List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("projectPlan");
+            if (!projectPlans.isEmpty()&&!strings.isEmpty()){
+                projectPlanArrageService.getRemarksBack(projectPlans,strings,projectPlanArrage);
+            }else {
+                flag = false;
+                j.setSuccess(false);
+                j.setMessage("备注失败");
+            }
+            List<ProjectPlanArrage> planArrages = new ArrayList<ProjectPlanArrage>();
+            for (ProjectPlanArrage planArrage:projectPlans){
+                if (planArrage.getArrageFlag().equals("0")){
+                    planArrages.add(planArrage);
+                }
+            }
+            List<Map<String,Object>> objects = Lists.newArrayList();
+            List<Map<String, Object>> bookStrapTree = BookStrapTreeUtil.getAllBookStrapTree(objects, planArrages,"1");
+            j.setMapListTree(bookStrapTree);
+            if (flag){
+                j.setSuccess(true);
+                j.setMessage("备注成功");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return j;
+    }
 
     //安排带电项目展示form
     @ResponseBody
@@ -360,7 +402,7 @@ public class ProjectPlanArrageController extends BaseController {
         }
         return j;
     }
-    //保存并且发送流程
+    //保存并且发送流程 -- 配网项目经理
     @ResponseBody
     @RequestMapping(value = "save")
     public AjaxJson saveStartupProcess(ProjectPlanArrage projectPlanArrage,Model model,HttpServletRequest request,HttpServletResponse response) throws Exception{
@@ -795,6 +837,46 @@ public class ProjectPlanArrageController extends BaseController {
         return j;
     }
 
+    //发起人备注 -- 配网项目经理
+    @ResponseBody
+    @RequestMapping(value = "netRemarksBack")
+    public Result getNetRemarksBack(ProjectPlanArrage projectPlanArrage, String ids, HttpServletRequest request){
+        Result j = new Result();
+        j.setSuccess(true);
+        j.setMessage("备注成功");
+        List<String> strings = PackagingUtil.getString(ids);
+        boolean flag = true;
+        try {
+            String comment = URLDecoder.decode(projectPlanArrage.getRemarks(), "UTF-8");
+            projectPlanArrage.setRemarks(comment);
+            //获取项目信息
+            List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("networkList");
+            if (!projectPlans.isEmpty()&&!strings.isEmpty()){
+                projectPlanArrageService.getRemarksBack(projectPlans,strings,projectPlanArrage);
+            }else {
+                flag = false;
+                j.setSuccess(false);
+                j.setMessage("备注失败");
+            }
+            List<ProjectPlanArrage> planArrages = new ArrayList<ProjectPlanArrage>();
+            for (ProjectPlanArrage planArrage:projectPlans){
+                if (planArrage.getArrageFlag().equals("0")){
+                    planArrages.add(planArrage);
+                }
+            }
+            List<Map<String,Object>> objects = Lists.newArrayList();
+            List<Map<String, Object>> bookStrapTree = BookStrapTreeUtil.getAllBookStrapTree(objects, planArrages,"1");
+            j.setMapListTree(bookStrapTree);
+            if (flag){
+                j.setSuccess(true);
+                j.setMessage("备注成功");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return j;
+    }
+
     //安排停电打包  --- 配网项目经理2
     @ResponseBody
     @RequestMapping(value = "unNetplannedPackage")