项目计划安排

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/mapper/ProjectPlanActMapper.java

@@ -33,4 +33,7 @@ public interface ProjectPlanActMapper extends BaseMapper<ProjectActProclnsAss> {
 
     //配网项目经理
     Integer deleteNetAss(ProjectActProclnsAss projectActProclnsAss);
+
+    //修改项目状态
+    Integer updateMaterialProject(@Param("list")List<String> strings);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/mapper/xml/ProjectPlanActMapper.xml

@@ -197,4 +197,13 @@
 		where proc_ins_id = #{procInsId}
 	</delete>
 
+	<update id="updateMaterialProject">
+		UPDATE xm_material_project SET
+		arrageProject = '1'
+		WHERE reserveProjectName in
+		<foreach collection="list" open="(" close=")" item="item" separator=",">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>

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

@@ -433,7 +433,7 @@ public class ProjectPlanActService{
 
     //配网项目 经理 ---结束流程
     @Transactional(readOnly = false)
-    public void disList2ProInsId(Act act){
+    public void disList2ProInsId(Act act,List<ProjectActProclnsAss> listAss){
         // 设置意见
         act.setComment(("yes".equals(act.getFlag()) ? "[同意] " : "[驳回] ") + act.getComment());
         act.preUpdate();
@@ -442,5 +442,13 @@ public class ProjectPlanActService{
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+        //获取项目名称
+        List<String> strings = new ArrayList<String>();
+        for (ProjectActProclnsAss proclnsAss:listAss){
+            if (null!=proclnsAss.getProjectName()&&!"".equals(proclnsAss.getProjectName())){
+                strings.add(proclnsAss.getProjectName());
+            }
+        }
+        projectPlanActMapper.updateMaterialProject(strings);
     }
 }

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

@@ -93,21 +93,23 @@ public class ProjectPlanArrageController extends BaseController {
 
             //初始安排计划项目列表
             List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList();
-            //根据项目名称查询人员
-            List<ProjectAssignment> listAssignment = projectPlanArrageService.findListAssignment(planArrageList);
-            //获得最终集合
-            List<ProjectPlanArrage> projectPlanArrageList = projectPlanArrageService.getPlanArrageList(planArrageList, listAssignment);
-
-            //区分开关与项目--整体集合
-            List<ProjectPlanArrage> projectList = projectPlanArrageService.getProjectList(projectPlanArrageList);
-            //开关 - 项目 统一集合 用WhetherStatus区分
-            List<ProjectPlanArrage> projectPlanList = PackagingUtil.getProjectPlanList(projectPlanArrage,projectList);
-            for (ProjectPlanArrage par:projectList){
-                par.setProjectMonthDate(projectPlanArrage.getProjectMonthDate());
-                par.setHtmlStatus("0");
-                par.preInsert();
+            if (!planArrageList.isEmpty()){
+                //根据项目名称查询人员
+                List<ProjectAssignment> listAssignment = projectPlanArrageService.findListAssignment(planArrageList);
+                //获得最终集合
+                List<ProjectPlanArrage> projectPlanArrageList = projectPlanArrageService.getPlanArrageList(planArrageList, listAssignment);
+
+                //区分开关与项目--整体集合
+                List<ProjectPlanArrage> projectList = projectPlanArrageService.getProjectList(projectPlanArrageList);
+                //开关 - 项目 统一集合 用WhetherStatus区分
+                List<ProjectPlanArrage> projectPlanList = PackagingUtil.getProjectPlanList(projectPlanArrage,projectList);
+                for (ProjectPlanArrage par:projectList){
+                    par.setProjectMonthDate(projectPlanArrage.getProjectMonthDate());
+                    par.setHtmlStatus("0");
+                    par.preInsert();
+                }
+                request.getSession().setAttribute("projectPlan",projectPlanList);
             }
-            request.getSession().setAttribute("projectPlan",projectPlanList);
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -129,9 +131,11 @@ public class ProjectPlanArrageController extends BaseController {
         dataRuleFilter(entity);
         entity.setPage(page);
         List<ProjectPlanArrage> planArrages = new ArrayList<ProjectPlanArrage>();
-        for (ProjectPlanArrage projectPlanArrage:list){
-            if (entity.getWhetherStatus().equals(projectPlanArrage.getWhetherStatus())&&entity.getArrageFlag().equals(projectPlanArrage.getArrageFlag())){
-                planArrages.add(projectPlanArrage);
+        if (null!=list){
+            for (ProjectPlanArrage projectPlanArrage:list){
+                if (entity.getWhetherStatus().equals(projectPlanArrage.getWhetherStatus())&&entity.getArrageFlag().equals(projectPlanArrage.getArrageFlag())){
+                    planArrages.add(projectPlanArrage);
+                }
             }
         }
         page.setList(planArrages);
@@ -146,9 +150,11 @@ public class ProjectPlanArrageController extends BaseController {
         List<Map<String,Object>> objects = Lists.newArrayList();
         List<ProjectPlanArrage> projectPlans = (List<ProjectPlanArrage>)request.getSession().getAttribute("projectPlan");
         List<ProjectPlanArrage> planArrageList = new ArrayList<ProjectPlanArrage>();
-        for (ProjectPlanArrage p:projectPlans){
-            if (p.getArrageFlag().equals("0")){
-                planArrageList.add(p);
+        if (null!=projectPlans){
+            for (ProjectPlanArrage p:projectPlans){
+                if (p.getArrageFlag().equals("0")){
+                    planArrageList.add(p);
+                }
             }
         }
         List<Map<String, Object>> bookStrapTree = BookStrapTreeUtil.getAllBookStrapTree(objects, planArrageList,"1");
@@ -824,7 +830,10 @@ public class ProjectPlanArrageController extends BaseController {
         try {
             String comment1 = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment1);
-            projectPlanActService.disList2ProInsId(act);
+            ProjectActProclnsAss proclnsAss = new ProjectActProclnsAss();
+            proclnsAss.setProcInsId(act.getProcInsId());
+            List<ProjectActProclnsAss> listAss = projectPlanActService.findListAss(proclnsAss);
+            projectPlanActService.disList2ProInsId(act,listAss);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }