登陆界面，ui变更-注册-记住我；去除，基本需求信息，导入线路多选变更

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -3,6 +3,8 @@ package com.jeeplus.modules.sg.managementcenter.project.entity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
+import java.util.List;
+
 public class Project extends DataEntity<Project> {
     private static final long serialVersionUID = 1L;
     private String serialNumber;
@@ -62,6 +64,16 @@ public class Project extends DataEntity<Project> {
     private String textRemark;//备注
     private String powerLine;//停电线路
     private String powerScope;//停电范围
+    private List<String> powerScopeList;//停电范围拆分list
+
+    public List<String> getPowerScopeList() {
+        return powerScopeList;
+    }
+
+    public void setPowerScopeList(List<String> powerScopeList) {
+        this.powerScopeList = powerScopeList;
+    }
+
     private String projectType;//项目类型
     private String powerFlagPackage;//是否为停电打包项目
     private String preliminaryJudgment;//证处初步判断

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

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.managementcenter.project.web;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -191,6 +192,15 @@ public class ProjectController extends BaseController {
 	@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Project project, Model model) {
+		String powerScope = project.getPowerScope();
+		if (null != powerScope) {
+			List<String> newList = new ArrayList<>();
+			String[] split = powerScope.split(";");
+			for (int i = 0; i < split.length; i++) {
+				newList.add(split[i]);
+			}
+			project.setPowerScopeList(newList);
+		}
 		model.addAttribute("project", project);
 		if (null != project.getId()){
 			if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
@@ -226,6 +236,12 @@ public class ProjectController extends BaseController {
 		}
 		List<String> users = projectService.findAllUser();
 		List<Project> arrayLists = new ArrayList<Project>();
+		List<String> powerScopeList = project.getPowerScopeList();
+		String b = "";
+		for (String a : powerScopeList) {
+			b += a + ";";
+		}
+		project.setPowerScope(b);
 		arrayLists.add(project);
 		String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
 		if (!"".equals(judgeValue)){

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.jeeplus.common.utils.*;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.oa.entity.OaNotifyMaterial;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -68,6 +69,7 @@ public class LoginController extends BaseController{
 
 	@Autowired
 	private ActTaskService actTaskService;
+
 	
 	
 	/**
@@ -382,6 +384,13 @@ public class LoginController extends BaseController{
            actlist.add(act1);
 		}
 		model.addAttribute("actlist",actlist);
+		//根据人员查询通知
+		OaNotify oaNotify = new OaNotify();
+		oaNotify.setSelf(true);
+		oaNotify.setReadFlag("0");
+		Page<OaNotify> oaPage = oaNotifyService.find(new Page<OaNotify>(request, response), oaNotify);
+		List<OaNotify> list1 = oaPage.getList();
+		request.setAttribute("list1", list1);
 		model.addAttribute("actCount",page.getCount());
 		return "modules/sys/login/sysHome";
 		

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -273,8 +273,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
-						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
-<%--						<form:checkboxes path="powerScope" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
+<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
+						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
 <%--						<form:select  path="powerScope" cssClass="form-control">
 							<form:option value="670"/>
 							<form:option value="67001+"/>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm1.jsp

@@ -249,8 +249,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
-<%--						<form:checkboxes path="powerScope" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
-						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
+						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
+<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
 					</td>
 				</tr>
 				<tr>

src/main/webapp/webpage/modules/sys/login/sysHome.jsp

@@ -20,125 +20,9 @@
 <div id="body-container" class="wrapper wrapper-content">
 	<div class="conter-wrapper home-container">
 		<div class="row home-row">
-			<div class="col-md-4 col-lg-3">
-				<div class="home-stats">
-					<a href="#" class="stat hvr-wobble-horizontal">
-						<div class=" stat-icon">
-							<i class="fa fa-cloud-upload fa-4x text-info "></i>
-						</div>
-						<div class=" stat-label">
-							<div class="label-header">
-								88%
-							</div>
-							<div class="progress-sm progress ng-isolate-scope" value="progressValue" type="info">
-								<div class="progress-bar progress-bar-info" role="progressbar"
-									 aria-valuenow="88" aria-valuemin="0" aria-valuemax="100"  style="width: 88%;">
-								</div>
-							</div>
-							<div class="clearfix stat-detail">
-								<div class="label-body">
-									<i class="fa fa-arrow-circle-o-right pull-right text-muted"></i>服务正常运行时间
-								</div>
-							</div>
-						</div>
-					</a>					<a href="#" class="stat hvr-wobble-horizontal">
-					<div class=" stat-icon">
-						<i class="fa fa-heartbeat fa-4x text-success "></i>
-					</div>
-					<div class=" stat-label">
-						<div class="label-header">
-							94%
-						</div>
-						<div class="progress-sm progress ng-isolate-scope" value="progressValue" type="info">
-							<div class="progress-bar progress-bar-success" role="progressbar"
-								 aria-valuenow="94" aria-valuemin="0" aria-valuemax="100"  style="width: 94%;">
-							</div>
-						</div>
-						<div class="clearfix stat-detail">
-							<div class="label-body">
-								<i class="fa fa-arrow-circle-o-right pull-right text-muted"></i>积极反馈
-							</div>
-						</div>
-					</div>
-				</a>					<a href="#" class="stat hvr-wobble-horizontal">
-					<div class=" stat-icon">
-						<i class="fa fa-flag fa-4x text-danger "></i>
-					</div>
-					<div class=" stat-label">
-						<div class="label-header">
-							88%
-						</div>
-						<div class="progress-sm progress ng-isolate-scope" value="progressValue" type="info">
-							<div class="progress-bar progress-bar-danger" role="progressbar"
-								 aria-valuenow="88" aria-valuemin="0" aria-valuemax="100"  style="width: 88%;">
-							</div>
-						</div>
-						<div class="clearfix stat-detail">
-							<div class="label-body">
-								<i class="fa fa-arrow-circle-o-right pull-right text-muted"></i>机器负载
-							</div>
-						</div>
-					</div>
-				</a>
-				</div>
-			</div>
-			<div class="col-md-4 col-lg-6">
-				<div class="home-charts-middle">
-					<div class="chart-container">
-						<div class="chart-comment clearfix">
-							<div class="text-primary pull-left">
-								<span class="comment-header">55%</span><br />
-								<span class="comment-comment">搜素引擎</span>
-							</div>
-							<div class="text-success pull-left m-l">
-								<span class="comment-header">25%</span><br />
-								<span class="comment-comment">自主访问</span>
-							</div>
-							<div class="text-warning pull-left m-l">
-								<span class="comment-header">20%</span><br />
-								<span class="comment-comment">友情链接</span>
-							</div>
-						</div>
-						<div id="lineChart" style="height:250px"></div>
-					</div>
-				</div>
-			</div>
-			<div class="col-md-4 col-lg-3">
-				<div class="home-charts-right">
-					
-					<div class="bottom-right-chart">
-						<div class="chart-container box clearfix">
-							<div class="row">
-								<div class="col-sm-3 text-left">
-									<div class="padder">
-										<span class="heading">本周访问人数 : </span><br />
-										<big class="text-primary">22068</big>
-									</div>
-								</div>
-								<div class="col-sm-6">
-									<div id="pie"  style="height: 298px;padding-top: 8px;max-height: 298px;position: relative;"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
 		<div class="row home-row">
-			<div class="col-lg-8 col-md-6">
-				<div class="map-container box padder">
-					<!-- <div id="world-map" style="width: 100%; height: 320px"></div> -->
-					<div class="top-right-chart row">
-								
-								<div class="col-sm-12">
-									<span class="heading">销售业绩 </span><br />
-									<div id="cbar" style="height: 298px; padding-top:7px;"></div>
-								</div>
-					</div>
-				</div>
-			</div>
 			<div class="col-lg-4 col-md-6">
-				<div class="todo-container panel panel-danger">
+				<div class="todo-container  panel-danger">
 					<div class="panel-heading">
 						<div class="todo-header text-center">
 							<h4><i class="fa fa-tasks"></i>&nbsp;待办任务</h4>
@@ -151,11 +35,6 @@
 									<c:if test="${ not empty actlist}">
 										<c:forEach items="${actlist}" var="actlist" varStatus="index">
 										<li>
-										<%--<label class="checkbox1" for="option1">--%>
-											<%--<input id="option1" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-											<%--<span>${actlist.taskId}</span>--%>
 										   <a href="${ctx}/act/task/form?taskId=${actlist.taskId}&taskName=${actlist.taskName}&taskDefKey=${actlist.taskDefKey}&procInsId=${actlist.procInsId}&procDefId=${actlist.procDefId}&status=${actlist.status}" style="color: white">${actlist.title}</a>
 									    </li>
 										</c:forEach>
@@ -163,48 +42,35 @@
 									<c:if test="${empty actlist}">
 										<span>暂无待办事项</span>
 									</c:if>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option3">--%>
-											<%--<input id="option3" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">9:00~12:00客户需求分析</span>--%>
-									<%--</li>--%>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option4">--%>
-											<%--<input id="option4" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">12:00和客户电话会议</span>--%>
-									<%--</li>--%>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option5">--%>
-											<%--<input id="option5" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">2:00参加技术论坛</span>--%>
-									<%--</li>--%>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option2">--%>
-											<%--<input id="option2" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">5:00晚会总结进度</span>--%>
-									<%--</li>--%>
 								</ul>
 							</div>
-							<%--<form class="form-horizontal todo-from-bottom">--%>
-								<%--<div class="row">--%>
-									<%--<div class="col-sm-12">--%>
-										<%--<div class="input-group">--%>
-											<%--<input type="text" class="form-control" placeholder="">--%>
-											<%--<span class="input-group-btn">--%>
-										<%--<button class="btn btn-default" type="submit">增加</button>--%>
-									<%--</span>--%>
-										<%--</div>--%>
-									<%--</div>--%>
-								<%--</div>--%>
-							<%--</form>--%>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="col-lg-4 col-md-6">
+				<div class="todo-container  panel-info">
+					<div class="panel-heading">
+						<div class="todo-header text-info">
+							<h4><i class="fa fa-tasks"></i>&nbsp;通知</h4>
+						</div>
+					</div>
+					<div class="panel-body bg-info">
+						<div class="todo-body">
+							<div class="todo-list-wrap">
+								<ul class="todo-list">
+									<c:if test="${ not empty list1}">
+										<c:forEach items="${list1}" var="actlist" varStatus="index">
+											<li>
+												<a href="${ctx}/oa/oaNotify/form?id=${actlist.id}&isSelf=true" style="color: white">${actlist.title}${actlist.type}</a>
+											</li>
+										</c:forEach>
+									</c:if>
+									<c:if test="${empty list1}">
+										<span>暂无通知</span>
+									</c:if>
+								</ul>
+							</div>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -49,11 +49,11 @@
 				<form id="loginForm" role="form" action="${ctx}/login" method="post">
 					<div class="form-content">
 						<div class="form-group">
-							<input type="text" id="username" name="username" class="form-control input-underline input-lg required"  value="admin" placeholder="用户名">
+							<input type="text" id="username" name="username" class="form-control input-underline input-lg required"  value="" placeholder="用户名">
 						</div>
 
 						<div class="form-group">
-							<input type="password" id="password" name="password" value="admin" class="form-control input-underline input-lg required" placeholder="密码">
+							<input type="password" id="password" name="password" value="" class="form-control input-underline input-lg required" placeholder="密码">
 						</div>
 						<c:if test="${isValidateCodeLogin}">
 						<div class="form-group  text-muted">
@@ -61,61 +61,8 @@
 							<sys:validateCode name="validateCode" inputCssStyle="margin-bottom:5px;" buttonCssStyle="color:white"/>
 						</div>
 						</c:if>
-							<ul class="pull-right btn btn-info btn-circle" style="background-color:white;height:45px;width:46px">	
-								<li class="dropdown color-picker" >
-									<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-										<span><i class="fa fa-circle"></i></span>
-									</a>
-									<ul class="dropdown-menu pull-right animated fadeIn" role="menu">
-										<li class="padder-h-xs">
-											<table class="table color-swatches-table text-center no-m-b">
-												<tr>
-													<td class="text-center colorr">
-														<a href="#" data-theme="blue" class="theme-picker">
-															<i class="fa fa-circle blue-base"></i>
-														</a>
-													</td>
-													<td class="text-center colorr">
-														<a href="#" data-theme="green" class="theme-picker">
-															<i class="fa fa-circle green-base"></i>
-														</a>
-													</td>
-													<td class="text-center colorr">
-														<a href="#" data-theme="red" class="theme-picker">
-															<i class="fa fa-circle red-base"></i>
-														</a>
-													</td>
-												</tr>
-												<tr>
-													<td class="text-center colorr">
-														<a href="#" data-theme="purple" class="theme-picker">
-															<i class="fa fa-circle purple-base"></i>
-														</a>
-													</td>
-													<td class="text-center color">
-														<a href="#" data-theme="midnight-blue" class="theme-picker">
-															<i class="fa fa-circle midnight-blue-base"></i>
-														</a>
-													</td>
-													<td class="text-center colorr">
-														<a href="#" data-theme="lynch" class="theme-picker">
-															<i class="fa fa-circle lynch-base"></i>
-														</a>
-													</td>
-												</tr>
-											</table>
-										</li>
-									</ul>
-								</li>
-						</ul>
-						<label class="inline">
-								<input  type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''} class="ace" />
-								<span class="lbl"> 记住我</span>
-						</label>
 					</div>
 					<input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login"  value="登录">
-					&nbsp;
-					<a href="${ctx}/sys/register" class="btn btn-white btn-outline btn-lg btn-rounded progress-login">注册</a>
 				</form>
 			</div>			
 		</div>