Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/entity/ConstructionProject.java

@@ -19,7 +19,7 @@ public class ConstructionProject extends DataEntity<ConstructionProject> {
     private String substationName;//  变电站名称
     private String lineName;//  线路名称
     private String projectType;//  项目类型
-    private String instructions;//  说明
+    private String instructions;//  是否停电
     private String workAreaNote;//  工区备注
     private String contructiveContent;//  建设必要性内容
     private Double costEstimate;//  费用估算
@@ -192,12 +192,12 @@ public class ConstructionProject extends DataEntity<ConstructionProject> {
         this.arrangeTime = arrangeTime;
     }
 
-    @JsonFormat(pattern = "YYYY-MM-DD")
+    @JsonFormat(pattern = "YYYY-MM-dd")
     public Date getSpecificTime() {
         return specificTime;
     }
 
-    @JsonFormat(pattern = "YYYY-MM-DD")
+    @JsonFormat(pattern = "YYYY-MM-dd")
     public void setSpecificTime(Date specificTime) {
         this.specificTime = specificTime;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/mapper/xml/ConstructionProjectMapper.xml

@@ -151,18 +151,18 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
-			<if test="projectStatus != null and  projectStatus != ''">
-				AND a.projectStatus = #{projectStatus}
+			<if test="projectName != null and projectName != ''">
+				AND a.projectName = #{projectName}
 			</if>
-			<if test="id != null and id != ''">
-				AND a.id = #{id}
-			</if>
-			<if test="lineName != null and lineName != ''">
-				AND a.lineName = #{lineName}
+			<if test="projectNumber != null and projectNumber != ''">
+				AND a.projectNumber = #{projectNumber}
 			</if>
 			<if test="arrangeTime != null">
 				AND a.arrangeTime = #{arrangeTime}
 			</if>
+			<if test="specificTime != null">
+				AND a.specificTime = #{specificTime}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/web/ConstructionProjectController.java

@@ -58,7 +58,7 @@ public class ConstructionProjectController extends BaseController {
 	/**
 	 * 项目列表页面
 	 */
-//	@RequiresPermissions("managementcenter:materialproject:list")
+	@RequiresPermissions("sg:managementCenter:constructionProject")
 	@RequestMapping(value = {"list", ""})
 	public String list(ConstructionProject constructionProject, Model model) {
 		model.addAttribute("constructionProject", constructionProject);
@@ -87,7 +87,7 @@ public class ConstructionProjectController extends BaseController {
 	/**
 	 * 查看，增加，编辑表单页面
 	 */
-//	@RequiresPermissions(value={"managementcenter:materialproject:view","managementcenter:materialproject:add","managementcenter:materialproject:edit"},logical=Logical.OR)
+//	@RequiresPermissions(value={"managementcenter:materialproject:view")
 	@RequestMapping(value = "form")
 	public String form(ConstructionProject constructionProject, Model model) {
 		model.addAttribute("constructionProject", constructionProject);
@@ -117,7 +117,8 @@ public class ConstructionProjectController extends BaseController {
 		return "modules/sg/managementcenter/constructionProject/constructionForm";
 	}
 
-	//选择月分页面
+	//选择月份页面
+    @RequiresPermissions("sg:managementCenter:constructionProject:add")
 	@RequestMapping(value = "formDateMonth")
 	public String formDateMonth(ConstructionProjectTemporary constructionProject,Model model){
 		return "modules/sg/managementcenter/constructionProject/constructionDateForm";
@@ -126,7 +127,6 @@ public class ConstructionProjectController extends BaseController {
 	 * 保存
 	 */
 	@ResponseBody
-//	@RequiresPermissions(value={"managementcenter:materialproject:add","managementcenter:materialproject:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public AjaxJson save(ConstructionProject constructionProject, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
@@ -189,7 +189,7 @@ public class ConstructionProjectController extends BaseController {
 	 * 批量删除
 	 */
 	@ResponseBody
-	@RequiresPermissions("managementcenter:materialproject:del")
+	@RequiresPermissions("sg:managementCenter:constructionProject:del")
 	@RequestMapping(value = "deleteAll")
 	public AjaxJson deleteAll(String ids) {
 		AjaxJson j = new AjaxJson();
@@ -258,18 +258,22 @@ public class ConstructionProjectController extends BaseController {
 		return result;
 	}
 
-	/**
-	 * 计划安排时间修改
-	 * @param constructionProject
-	 * @return
-	 */
-	@ResponseBody
-	@RequestMapping(value = "unplannedPlan")
-	public AjaxJson getUnplannedPlan(ConstructionProject constructionProject,Date historyTime){
-		AjaxJson j = new AjaxJson();
-		constructionProject.setProjectStatus("1");
-		constructionProjectService.updateSpecificTime(constructionProject,historyTime);
-		j.setMsg("设置时间成功");
-		return j;
-	}
+    @ResponseBody
+    @RequestMapping(value = "monthTime")
+    public AjaxJson monthTimeController(ConstructionProject constructionProject){
+        AjaxJson ajaxJson = new AjaxJson();
+        try {
+            List<ConstructionProject> list = constructionProjectService.findList(constructionProject);
+            if (list.size()>0){
+                ajaxJson.setSuccess(false);
+                ajaxJson.setMsg("该日期已经存在项目");
+                return ajaxJson;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        ajaxJson.setSuccess(true);
+        ajaxJson.setMsg("操作成功");
+        return ajaxJson;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/web/ConstructionProjectTemporaryController.java

@@ -308,4 +308,5 @@ public class ConstructionProjectTemporaryController extends BaseController {
 		}
 		return constructionProjectTemporaries;
 	}
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -77,7 +77,8 @@
 		a.construction_status AS "constructionStatus",
 		a.whether_close_status AS "whetherCloseStatus",
 		a.earlyMaterial AS "earlyMaterial",
-		a.preConstruction AS "preConstruction"
+		a.preConstruction AS "preConstruction",
+		a.rezkey AS "rezkey"
 	</sql>
     
 	<select id="get" resultType="Project" >
@@ -262,7 +263,8 @@
 			construction_status,
 			whether_close_status,
 			earlyMaterial,
-			preConstruction
+			preConstruction,
+			rezkey
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -338,7 +340,8 @@
     		#{constructionStatus},
     		#{whetherCloseStatus},
     		#{earlyMaterial},
-    		#{preConstruction}
+    		#{preConstruction},
+    		#{rezkey}
 		)
 	</insert>
 
@@ -418,7 +421,8 @@
 		construction_status,
 		whether_close_status,
 		earlyMaterial,
-		preConstruction
+		preConstruction,
+		rezkey
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -496,7 +500,8 @@
 			#{item.constructionStatus},
 			#{item.whetherCloseStatus},
 			#{item.earlyMaterial},
-			#{item.preConstruction}
+			#{item.preConstruction},
+			#{item.rezkey}
 		)
 		</foreach>
 	</insert>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -103,6 +103,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 					projectA.setConstructionStatus(projectB.getConstructionStatus());
 					projectA.setEarlyMaterial(projectB.getEarlyMaterial());
 					projectA.setPreConstruction(projectB.getPreConstruction());
+					projectA.setRezkey(projectB.getRezkey());
 					updateList.add(projectA);
 					flag = false;
 					break;
@@ -115,6 +116,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 				projectA.setWhetherCloseStatus(statusString);
 				projectA.setEarlyMaterial(statusInt);
 				projectA.setPreConstruction(statusInt);
+				projectA.setRezkey("0");
 				projectA.preInsert();
 				insertList.add(projectA);
 			}

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -115,6 +115,7 @@ public  class ProExcelInfo {
                 project.setRingNetworkCabinet((String)importUtil.getCellValue(row,59));//环网柜
                 project.setAutomatedRemarks((String)importUtil.getCellValue(row,60));//自动化备注
                 project.setStationDtu((String)importUtil.getCellValue(row,61));//站房dtu
+                project.setRezkey("0");
                 list.add(project);
             }
         }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -115,8 +115,10 @@ public class ProjectController extends BaseController {
 		String loginName = UserUtils.getUser().getLoginName();//获取登录名
 		String name = UserUtils.getUser().getName();//获取登录名
 		if (!"admin".equals(loginName)){
-			project.setLoginNameFindStats("1");
-			project.setLoginNameFind(name);
+			if ("".equals(project.getRequireName())){
+				project.setLoginNameFindStats("1");
+				project.setLoginNameFind(name);
+			}
 		}
 		HttpSession session = request.getSession();
 		session.setAttribute("projectEpo",project);

src/main/webapp/webpage/modules/sg/managementcenter/constructionProject/constructionDateForm.jsp

@@ -10,7 +10,7 @@
 	        $('#arrangeTime').datetimepicker({
                 format: "YYYY-MM",
                 minDate:new Date()-1
-		    });
+		    })
 		});
 		function save() {
 		    var projectNumber = $("#projectNumber").val();
@@ -23,9 +23,16 @@
 			    jp.error("请选择时间!")
 				return false;
             }
-            jp.getParent().addList(projectNumber,arrangeTime);
-            var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-            parent.layer.close(dialogIndex);
+            jp.get("${ctx}/sg/managementCenter/constructionProject/monthTime?arrangeTime="+arrangeTime,function(data){
+                if (data.success){
+                    jp.getParent().addList(projectNumber,arrangeTime);
+                    var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                    parent.layer.close(dialogIndex);
+				}else {
+				    jp.error(data.msg);
+				}
+            })
+
         }
 	</script>
 </head>

src/main/webapp/webpage/modules/sg/managementcenter/constructionProject/constructionDateList.js

@@ -80,7 +80,7 @@ $(document).ready(function() {
                 var arrangeTime = split[i].arrangeTime;
                 var date = new Date(arrangeTime);
                 var date1 = new Date(arrangeTime);
-                date1.setDate(date1.getMonth()+1);
+                date1.setMonth(date1.getMonth()+1);
                 $('#' + split[i].id).datetimepicker({
                     format: "YYYY-MM-DD",
                     minDate:date,

src/main/webapp/webpage/modules/sg/managementcenter/constructionProject/constructionForm.js

@@ -130,7 +130,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 = "#999999"
+                            rows[i+1].style.backgroundColor = "#e6e6e6"
                         }
                     }
                 },
@@ -148,9 +148,6 @@
                     field: 'projectName',
                     title: '项目名称'
                 }, {
-                    field: 'powerLine',
-                    title: '停电线路'
-                }, {
                     field: 'powerScope',
                     title: '停电范围'
                 }
@@ -171,11 +168,13 @@
         });
     //安排计划时间
     function add(ids){
+        jp.loading();
         jp.post("${ctx}/sg/managementCenter/constructionProject/unplanned",{'ids':ids},function(data){
             if(data.success){
                 refresh();
                 // jstreeTime(data.mapList);
                 jstree(data.mapListTree);
+                jp.success("安排计划成功")
             }else{
                 jp.error(data.message);
             }

src/main/webapp/webpage/modules/sg/managementcenter/constructionProject/constructionList.js

@@ -26,7 +26,7 @@ $(document).ready(function() {
                //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
                cache: false,    
                //是否显示分页（*）  
-               pagination: false,
+               pagination: true,
                 //排序方式 
                sortOrder: "asc",  
                //初始化加载第一页，默认第一页
@@ -53,25 +53,6 @@ $(document).ready(function() {
                contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
                contextMenu: '#context-menu',
                onContextMenuItem: function(row, $el){
-                   if($el.data("item") == "edit"){
-                   		edit(row.id);
-                   }else if($el.data("item") == "view"){
-                       view(row.id);
-                   } else if($el.data("item") == "delete"){
-                        jp.confirm('确认要删除该表单记录吗？', function(){
-                       	jp.loading();
-                       	jp.get("${ctx}/sg/managementcenter/project/delete?id="+row.id, function(data){
-                   	  		if(data.success){
-                   	  			$('#projectTable').bootstrapTable('refresh');
-                   	  			jp.success(data.msg);
-                   	  		}else{
-                   	  			jp.error(data.msg);
-                   	  		}
-                   	  	})
-                   	   
-                   	});
-                      
-                   } 
                },
               
                onClickRow: function(row, $el){
@@ -80,10 +61,9 @@ $(document).ready(function() {
 			$("#search-collapse").slideToggle();
 		},
                columns: [{
-		        checkbox: true
-		       
-		    }
-			,{
+                   checkbox: true
+               },
+			{
 		        field: 'projectNumber',
 		        title: '项目定义号',
                 width:160
@@ -110,13 +90,15 @@ $(document).ready(function() {
                    ,{
                        field: 'arrangeTime',
                        title: '月份',
-                       width:110
+                       width:110,
+                       sortName: 'beginBeginDate'
 
                    }
                    ,{
                        field: 'specificTime',
                        title: '具体时间',
-                       width:110
+                       width:120,
+                       sortName: 'endDate'
 
                    }
 		     ]
@@ -148,7 +130,7 @@ $(document).ready(function() {
 		});
 		
 		$('#beginBeginDate').datetimepicker({
-			 format: "YYYY-MM-DD"
+			 format: "YYYY-MM"
 		});
 		$('#endBeginDate').datetimepicker({
 			 format: "YYYY-MM-DD"
@@ -217,7 +199,6 @@ $(document).ready(function() {
             content: "${ctx}/sg/managementCenter/constructionProjectTemporaryController/listPower",
             btn: ['检验','确定','关闭'],
             btn1:function(index,layero){
-                // alert("1");
                 var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
                 iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。s
             },
@@ -276,6 +257,18 @@ $(document).ready(function() {
         jp.openViewDialog('查看项目管理表单', "${ctx}/sg/managementcenter/project/form?id=" + id, '800px', '500px');
  }
 
-
+function deleteAll(){
+    jp.confirm('确认要删除计划表单记录吗？', function(){
+        jp.loading();
+        jp.get("${ctx}/sg/managementCenter/constructionProject/deleteAll?ids=" + getIdSelections(), function(data){
+            if(data.success){
+                $('#projectTable').bootstrapTable('refresh');
+                jp.success(data.msg);
+            }else{
+                jp.error(data.msg);
+            }
+        })
+    })
+}
 
 </script>

src/main/webapp/webpage/modules/sg/managementcenter/constructionProject/constructionList.jsp

@@ -21,10 +21,40 @@
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="constructionProject" class="form form-horizontal well clearfix">
 					<div class="col-xs-12 col-sm-6 col-md-4">
-						<label class="label-item single-overflow pull-left" title="项目定义号：">项目需求名称：</label>
+						<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
 						<form:input path="projectNumber" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectNumber" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div class="form-group">
+							<label class="label-item single-overflow pull-left" title="月份：">&nbsp;月份：</label>
+							<div class="col-xs-12">
+								<div class='input-group date' id='beginBeginDate' >
+									<input type='text'  name="arrangeTime" class="form-control"  />
+									<span class="input-group-addon">
+			                       <span class="glyphicon glyphicon-calendar"></span>
+			                   </span>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div class="form-group">
+							<label class="label-item single-overflow pull-left" title="具体时间：">&nbsp;具体时间：</label>
+							<div class="col-xs-12">
+								<div class='input-group date' id='endDate' >
+									<input type='text'  name="specificTime" class="form-control"  />
+									<span class="input-group-addon">
+			                       <span class="glyphicon glyphicon-calendar"></span>
+			                   </span>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
@@ -36,13 +66,17 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-			<shiro:hasPermission name="sg:managementcenter:project:add">
+			<shiro:hasPermission name="sg:managementCenter:constructionProject:add">
 				<button id="add" class="btn btn-primary" onclick="add()">
 					<i class="glyphicon glyphicon-plus"></i> 安排项目计划
 				</button>
 			</shiro:hasPermission>
-
-		    </div>
+			<shiro:hasPermission name="sg:managementCenter:constructionProject:del">
+				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+					<i class="glyphicon glyphicon-remove"></i> 删除
+				</button>
+			</shiro:hasPermission>
+	 </div>
 		
 	<!-- 表格 -->
 	<table id="projectTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
@@ -50,15 +84,15 @@
     <!-- context menu -->
     <ul id="context-menu" class="dropdown-menu">
     	<%--<shiro:hasPermission name="sg:managementcenter:project:view">--%>
-        <li data-item="view"><a>查看</a></li>
+        <%--<li data-item="view"><a>查看</a></li>--%>
         <%--</shiro:hasPermission>--%>
     	<%--<shiro:hasPermission name="sg:managementcenter:project:edit">--%>
-        <li data-item="edit"><a>编辑</a></li>
-        <%--</shiro:hasPermission>--%>
-        <%--<shiro:hasPermission name="sg:managementcenter:project:del">--%>
-        <li data-item="delete"><a>删除</a></li>
-        <%--</shiro:hasPermission>--%>
-        <li data-item="action1"><a>取消</a></li>
+        <%--<li data-item="edit"><a>编辑</a></li>--%>
+        <%--&lt;%&ndash;</shiro:hasPermission>&ndash;%&gt;--%>
+        <%--&lt;%&ndash;<shiro:hasPermission name="sg:managementcenter:project:del">&ndash;%&gt;--%>
+        <%--<li data-item="delete"><a>删除</a></li>--%>
+        <%--&lt;%&ndash;</shiro:hasPermission>&ndash;%&gt;--%>
+        <%--<li data-item="action1"><a>取消</a></li>--%>
     </ul>  
 	</div>
 	</div>

src/main/webapp/webpage/modules/sg/managementcenter/constructionProject/constructionPowerList.js

@@ -81,7 +81,7 @@ $(document).ready(function() {
                     for (var i =0;i<split.length;i++){
                         if (split[i].htmlStatus=="1"){
                             // this.data.rows[i].setAttribute("style","color: red;");
-                            rows[i+1].style.backgroundColor = "red"
+                            rows[i+1].style.color = "red"
                         }
                     }
                 },
@@ -216,9 +216,11 @@ function save() {
     }
     idPower = idPower.substring(0,idPower.length-1);
     $("#idPower").val(idPower);
+    jp.loading();
     jp.post("${ctx}/sg/managementCenter/constructionProjectTemporaryController/powerSave",$('#inputForm').serialize(),function(data){
         if(data.success){
             refresh();
+            jp.success(data.msg);
         }else{
             jp.error(data.msg);
         }
@@ -235,6 +237,7 @@ function saveSure(){
     }
     idPower = idPower.substring(0,idPower.length-1);
     $("#idPower").val(idPower);
+    jp.loading();
     jp.post("${ctx}/sg/managementCenter/constructionProjectTemporaryController/powerSaveSure",$('#inputForm').serialize(),function(data){
         if(data.success){
             refresh();