Merge remote-tracking branch 'origin/master'

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

@@ -75,7 +75,7 @@ public class ProjectDailyPlan extends DataEntity<ProjectDailyPlan> {
     public void setProjectSwitch(String projectSwitch) {
         this.projectSwitch = projectSwitch;
     }
-    @JsonFormat(pattern = "YYYY-MM")
+    @JsonFormat(pattern = "YYYY")
     public Date getProjectMonthDate() {
         return projectMonthDate;
     }

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

@@ -21,9 +21,11 @@ public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage>{
     private String constructionUnit;//施工单位项目经理
     private String operationUnit;//运行单位项目经理
 
+    private String attributionYear;//归属年份
 
-    private String arrageFlag;//未安排标识
-    private String whetherStatus;//是否未父类
+
+    private String arrageFlag;//未安排标识 0-未安排 1-已安排
+    private String whetherStatus;//是否未父类 0-时子类 1-是父类
 
     private String htmlStatus;//验证开关字段 0-无提示 1-有提示
 
@@ -36,6 +38,14 @@ public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage>{
     private Integer associatedSort;//关联包排序字段
     private Integer powerPackageSort;//停电包排序字段
 
+    public String getAttributionYear() {
+        return attributionYear;
+    }
+
+    public void setAttributionYear(String attributionYear) {
+        this.attributionYear = attributionYear;
+    }
+
     public Integer getAssociatedSort() {
         return associatedSort;
     }

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

@@ -185,8 +185,11 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="attributionYear != null and attributionYear != ''">
+				AND a.attributionYear = #{attributionYear}
+			</if>
 			<if test="arrageProject != null and arrageProject != ''">
-				AND a.arrageProject = '1' or a.arrageProject = '2' or a.arrageProject = '0'
+				AND a.arrageProject in(1,2,0)
 			</if>
 		</where>
 		<choose>

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

@@ -72,8 +72,11 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="attributionYear != null and attributionYear != ''">
+				AND a.attributionYear = #{attributionYear}
+			</if>
 			<if test="arrageProject != null and arrageProject != ''">
-				AND a.arrageProject = #{arrageProject} or a.arrageProject = #{arrageProject1}
+				AND a.arrageProject in(#{arrageProject},#{arrageProject1})
 			</if>
 		</where>
 		<choose>

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
@@ -47,11 +48,15 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
 
     //得到可以安排计划数据 统一存放在List<ProjectDailyPlan>集合当中
     //数据库中根据字段匹配 arrageProject 3 -为已经安排过的日计划 0-1-2为月计划
-    public List<ProjectDailyPlan> getProjectDailyPlan(){
+    public List<ProjectDailyPlan> getProjectDailyPlan(String year){
         //初始化
         List<ProjectDailyPlan> projectDailyPlans = new ArrayList<ProjectDailyPlan>();
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("1");
+        if (null!=year&&!"".equals(year)){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+            materialProject.setAttributionYear(year);
+        }
         //查询项目
         List<MaterialProject> listMaterialProject = projectDailyPlanMapper.findListMaterialProject(materialProject);
         //得到立项信息

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/ProjectDailyPlanController.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -144,12 +145,12 @@ public class ProjectDailyPlanController extends BaseController {
 
     //新增日计划选择项目定义号，或者项目名称后走的方法（可不选）
     @RequestMapping(value = "initAddDailyPlan")
-    public String getInitAddDailyPlan(ProjectDailyPlan projectDailyPlan,Model model,HttpServletRequest request){
+    public String getInitAddDailyPlan(ProjectDailyPlan projectDailyPlan,String year,Model model, HttpServletRequest request){
         try {
             String comment1 = URLDecoder.decode(projectDailyPlan.getProjectName(), "UTF-8");
             projectDailyPlan.setProjectName(comment1);
             //获取所有未安排的日计划
-            List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan();
+            List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan(year);
             List<ProjectDailyPlan> sxDailyPlan = projectDailyPlanService.getSxDailyPlan(projectDailyPlans, projectDailyPlan);
             for (ProjectDailyPlan plan:sxDailyPlan){
                 plan.preInsert();

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

@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -82,6 +83,7 @@ public class ProjectPlanArrageController extends BaseController {
     //返回安排计划列表，操作计划安排 -- 左树右边表 页面（projectPlanArrageForm） session(projectPlan)
     @RequestMapping(value = "isArranging")
     public String lsArranging(ProjectPlanArrage projectPlanArrage,Model model,HttpServletRequest request){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
         try {
             if (null!=projectPlanArrage.getProjectName()&&!"".equals(projectPlanArrage.getProjectName())){
                 String name = URLDecoder.decode(projectPlanArrage.getProjectName(),"utf-8");
@@ -90,7 +92,9 @@ public class ProjectPlanArrageController extends BaseController {
             //获取项目计划安排的初始项目
             MaterialProject materialProject = new MaterialProject();
             materialProject.setArrageProject("0");
-            materialProject.setArrageProject1("0");
+            materialProject.setArrageProject1("1");
+            //获取当前年份
+            materialProject.setAttributionYear(simpleDateFormat.format(projectPlanArrage.getProjectMonthDate()));
             //初始安排计划项目列表
             List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList(materialProject);
             if (!planArrageList.isEmpty()){
@@ -113,6 +117,8 @@ public class ProjectPlanArrageController extends BaseController {
                     par.preInsert();
                 }
                 request.getSession().setAttribute("projectPlan",projectPlanList);
+            }else {
+                request.getSession().setAttribute("projectPlan",planArrageList);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -191,6 +197,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);
     }
 
@@ -435,6 +442,8 @@ public class ProjectPlanArrageController extends BaseController {
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("0");
         materialProject.setArrageProject1("1");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+        materialProject.setAttributionYear(simpleDateFormat.format(mouthDate));
         //初始安排计划项目列表
         List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList(materialProject);
         //根据项目名称查询人员
@@ -494,7 +503,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 +514,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 +522,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);
@@ -631,7 +631,7 @@ public class ProjectPlanArrageController extends BaseController {
             boolean flag = projectPlanArrageService.deleteJudgePlanArrange(projectPlans, strings);
             if (!flag){
                 ajaxJson.setSuccess(false);
-                ajaxJson.setMessage("只允许删除本人的项目()!");
+                ajaxJson.setMessage("只允许删除本人的项目!");
                 return ajaxJson;
             }
             //删除项目
@@ -730,6 +730,15 @@ public class ProjectPlanArrageController extends BaseController {
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("0");
         materialProject.setArrageProject1("1");
+        //获取已经安排的年份
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+        for (ProjectActProclnsAss proclnsAss:listAss){
+            if (null!=proclnsAss.getProjectMonthDate()){
+                String year = simpleDateFormat.format(proclnsAss.getProjectMonthDate());
+                materialProject.setAttributionYear(year);
+                break;
+            }
+        }
         //初始安排计划项目列表
         List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList(materialProject);
         //根据项目名称查询人员
@@ -791,6 +800,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 +832,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 +843,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);
     }
     /*

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

@@ -25,7 +25,7 @@
                 <div class="col-sm-3 col-md-3">
                     <div style="margin-top: 11px">
                         <label>
-                            <input type="input" class="form-control" id="input-search" style="width: 200px;float: left">
+                            <input type="input" class="form-control" placeholder="请输入项目名称" id="input-search" style="width: 200px;float: left">
                             <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
                         </label>
                     </div>

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

@@ -26,7 +26,7 @@
                         <input type="text" hidden="hidden" value="" id="idsRemark">
                         <div style="margin-top: 11px">
                             <label>
-                                <input type="input" class="form-control" id="input-search" style="width: 200px;float: left">
+                                <input type="input" class="form-control" id="input-search" placeholder="请输入项目名称" style="width: 200px;float: left">
                                 <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
                             </label>
                         </div>

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyArrageForm.jsp

@@ -28,7 +28,7 @@
             <%--<input type="text" id="input-search" class="">--%>
             <div style="margin-top: 11px">
                 <label>
-                <input type="input" class="form-control" id="input-search" style="width: 70%;float: left">
+                <input type="input" class="form-control" placeholder="请输入项目名称" id="input-search" style="width: 70%;float: left">
                 <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
                 </label>
             </div>

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyDateForm.jsp

@@ -8,14 +8,15 @@
 
 		$(document).ready(function() {
 	        $('#arrangeTime').datetimepicker({
-                format: "YYYY-MM",
+                format: "YYYY",
                 minDate:new Date()-1
 		    })
 		});
 		function save() {
 		    var projectName= $("#projectName").val();
 		    var projectNumber = $("#projectNumber").val();
-            jp.getParent().addList(projectNumber,projectName);
+			var year = $("#arrange").val();
+            jp.getParent().addList(projectNumber,projectName,year);
             var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
             parent.layer.close(dialogIndex);
             <%--jp.get("${ctx}/sg/managementCenter/projectPlanArrage/isArranging?arrangeTime="+arrangeTime,function(data){--%>
@@ -46,17 +47,17 @@
 					<form:input path="projectNumber" htmlEscape="false"  id="projectNumber"  class="form-control"/>
 				</td>
 			</tr>
-			<%--<tr>--%>
-				<%--<td class="width-15 active"><label class="">选择月份：</label></td>--%>
-				<%--<td class="width-35">--%>
-					<%--<div class='input-group form_datetime' id='arrangeTime'>--%>
-						<%--<input type='text'  name="projectMonthDate" class="form-control required" id="arrange"  value="<fmt:formatDate value="${constructionProjectTemporary.arrangeTime}" pattern="yyyy-MM"/>"/>--%>
-						<%--<span class="input-group-addon">--%>
-			                        <%--<span class="glyphicon glyphicon-calendar"></span>--%>
-			            <%--</span>--%>
-					<%--</div>--%>
-				<%--</td>--%>
-			<%--</tr>--%>
+			<tr>
+				<td class="width-15 active"><label class="">选择年份：</label></td>
+				<td class="width-35">
+					<div class='input-group form_datetime' id='arrangeTime'>
+						<input type='text'  name="projectMonthDate" class="form-control required" id="arrange"  value="<fmt:formatDate value="${constructionProjectTemporary.arrangeTime}" pattern="yyyy"/>"/>
+						<span class="input-group-addon">
+			                        <span class="glyphicon glyphicon-calendar"></span>
+			            </span>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 	</form:form>

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyPlanList.js

@@ -205,13 +205,13 @@ $(document).ready(function() {
    function add(){
 	  jp.openSaveDialog('新增日计划安排', "${ctx}/sg/managementCenter/projectDailyPlan/formProject",'800px', '500px');
   }
-    function addList(projectNumber,projectName) {
+    function addList(projectNumber,projectName,year) {
     top.layer.open({
         type: 2,
         area: ['900px', '500px'],
-        title: '项目计划安排',
+        title: '日计划安排',
         maxmin: true, //开启最大化最小化按钮
-        content: "${ctx}/sg/managementCenter/projectDailyPlan/initAddDailyPlan?projectNumber="+projectNumber+"&projectName="+encodeURI(encodeURI(projectName)),
+        content: "${ctx}/sg/managementCenter/projectDailyPlan/initAddDailyPlan?projectNumber="+projectNumber+"&year="+year+"&projectName="+encodeURI(encodeURI(projectName)),
         btn: ['确定', '关闭'],
         yes: function(index, layero){
             top.layer.close(index);

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageForm.jsp

@@ -28,7 +28,7 @@
             <%--<input type="text" id="input-search" class="">--%>
             <div style="margin-top: 11px">
                 <label>
-                <input type="input" class="form-control" id="input-search" style="width: 70%;float: left">
+                <input type="input" class="form-control" placeholder="请输入项目名称" id="input-search" style="width: 70%;float: left">
                 <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
                 </label>
             </div>