修改专项任务和来函权限按钮展示以及列表展示权限用户下的数据

修改特定服务bug

src/main/java/com/nis/web/controller/basics/TaskInfoController.java

@@ -31,7 +31,7 @@ public class TaskInfoController extends BaseController{
 	 */
 	@RequestMapping(value = {"list",""})
 	public String list(TaskInfo taskInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<TaskInfo> page = taskInfoService.findTaskInfo(new Page<TaskInfo>(request, response), taskInfo);
+		Page<TaskInfo> page = taskInfoService.findTaskInfo(new Page<TaskInfo>(request, response,"r"), taskInfo);
         model.addAttribute("page", page);
         return "/basics/taskInfoList";
 	}
@@ -76,7 +76,7 @@ public class TaskInfoController extends BaseController{
 		} catch (Exception e) {
 			logger.error(e.getMessage());
 			e.printStackTrace();
-			addMessage(model, "save_failed");
+			addMessage(redirectAttributes, "save_failed");
 		}
 		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
 	}

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -32,7 +32,7 @@ public class RequestInfoController extends BaseController{
 	 */
 	@RequestMapping(value = {"list",""})
 	public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo);
+		Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response,"r"), requestInfo);
         model.addAttribute("page", page);
         return "/cfg/requestList";
 	}

src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java

@@ -53,9 +53,9 @@ public class SpecificServiceCfgController extends BaseController {
 			Model model) {
 		String searchType = null;
 		String searchContent = null;
-		if(specificServiceCfg.getSpecServiceId()!=null){
+		if(specificServiceCfg.getSpecServiceCode()!=null){
-			searchType = "specServiceId";
+			searchType = "specServiceCode";
-			searchContent = specificServiceCfg.getSpecServiceId().toString();
+			searchContent = specificServiceCfg.getSpecServiceCode().toString();
 		}
 		if(!StringUtils.isBlank(specificServiceCfg.getSpecServiceName())){
 			searchType = "specServiceName";

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -47,7 +47,7 @@
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
 	left join task_info t on r.task_id=t.id
-	where r.is_valid!=-1 and r.is_audit !=3
+	<trim prefix="WHERE" prefixOverrides="AND |OR ">
     	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
 			<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
@@ -72,7 +72,9 @@
 		<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
 				AND r.edit_time between #{dobeginDate} and #{doendDate}
 		</if>
-	
+		<!-- 数据范围过滤 -->
+				${sqlMap.dsf}
+    </trim>
 	<choose>
 		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 			ORDER BY ${page.orderBy}

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -51,7 +51,10 @@
 	left join sys_user s on r.creator_id=s.id
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
-	where r.is_valid!=-1 and r.is_audit !=3
+	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+    	<if test="page !=null and page.where != null and page.where != ''">
+			 AND ${page.where}
+		</if>
  		<if test="taskName != null and taskName != ''">
 			AND r.task_name like 
 			<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
@@ -65,6 +68,11 @@
 		<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
 				AND r.edit_time between #{dobeginDate} and #{doendDate}
 		</if> 
+    	
+    	<!-- 数据范围过滤 -->
+		${sqlMap.dsf}
+    </trim>
+		
 	<choose>
 		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 			ORDER BY ${page.orderBy}

src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml

@@ -101,7 +101,7 @@
   AND spec_service_id =#{specificServiceCfg.specServiceId}
   </if>
    <if test="specificServiceCfg.specServiceCode != null">
-  AND spec_service_id =#{specificServiceCfg.specServiceCode}
+  AND spec_service_code =#{specificServiceCfg.specServiceCode}
   </if>
   <if test="specificServiceCfg.specServiceName != null and specificServiceCfg.specServiceName != '' ">
   AND spec_service_name like '%${specificServiceCfg.specServiceName}%'

src/main/java/com/nis/web/service/basics/TaskInfoService.java

@@ -25,6 +25,7 @@ public class TaskInfoService extends BaseService{
 	private TaskInfoDao taskInfoDao;
 	
 	public Page<TaskInfo> findTaskInfo(Page<TaskInfo> page, TaskInfo taskInfo) {
+		taskInfo.getSqlMap().put("dsf", configScopeFilter(taskInfo.getCurrentUser(),"r"));
 		// 设置分页参数
 		taskInfo.setPage(page);
 		// 执行分页查询

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -29,6 +29,7 @@ public class RequestInfoService extends BaseService{
 	private TaskInfoDao taskInfoDao;
 	
 	public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
+		requestInfo.getSqlMap().put("dsf", configScopeFilter(requestInfo.getCurrentUser(),"r"));
 		// 设置分页参数
 		requestInfo.setPage(page);
 		// 执行分页查询

src/main/resources/messages/message_en.properties

@@ -162,7 +162,7 @@ ssl_certificate_control=SSL Cert Control
 ssl_certificate_monitor=SSL Cert Monit
 response_header_control=Response Header Control
 ip_website_text_control=IP+Website Keyowrd Control
-request_task=Request And Task
+request_task=Request and Task
 realtime_report=Realtime Report
 #==========menu end=====================
 
@@ -381,7 +381,7 @@ area_effect_id=Area Effective
 ip_type=IP Type
 #==========guankongbaimingdan end=====================
 #==========tedingfuwu begin=====================
-protocol_id=Protocol ID
+protocol_code=Protocol No
 protocol_name=Protocol Name
 group_id=Configuration Group ID
 input_protocol_id=Please enter protocol ID
@@ -392,6 +392,7 @@ min_value=The minimum value should not be less than
 #==========tedingfuwu end=====================
 
 #==========xitongguanli begin======================
+login=Login
 owner_company=\u5F52\u5C5E\u516C\u53F8
 company=\u516C\u53F8
 owner_group=\u5F52\u5C5E\u90E8\u95E8

src/main/resources/messages/message_zh_CN.properties

@@ -381,7 +381,7 @@ area_effect_id=\u533A\u57DF\u751F\u6548id
 ip_type=IP\u7C7B\u578B
 #==========guankongbaimingdan end=====================
 #==========tedingfuwu begin=====================
-protocol_id=\u534F\u8BAEID
+protocol_code=\u534F\u8BAE\u53F7
 protocol_name=\u534F\u8BAE\u540D\u79F0
 group_id=maat\u7AEF\u914D\u7F6E\u5206\u7EC4ID
 input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID
@@ -392,6 +392,7 @@ min_value=\u6700\u5C0F\u503C\u4E0D\u5F97\u5C0F\u4E8E
 #==========tedingfuwu end=====================
 
 #==========xitongguanli begin======================
+login=\u767B\u5F55
 owner_company=\u5F52\u5C5E\u516C\u53F8
 company=\u516C\u53F8
 owner_group=\u5F52\u5C5E\u90E8\u95E8

src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp

@@ -9,10 +9,6 @@
 
 <div class="page-content">
 	<div class="row">
-	
-	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
-	</div>
 	<h3 class="page-title">
 		<spring:message code="special_task"/>
 	</h3>
@@ -30,21 +26,21 @@
 					<input type="hidden"  name="id" value="${taskInfo.id}"/>
 						<div class="form-body">
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="task_name"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_name"></spring:message>:</label>
 								<div class="col-md-4">
-									<input type="text" class="form-control" name="taskName" value="${taskInfo.taskName}">
+									<input type="text" class="form-control required" name="taskName" value="${taskInfo.taskName}">
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="task_org"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_org"></spring:message>:</label>
 								<div class="col-md-4">
-									<input type="text" class="form-control" name="taskOrg" value="${taskInfo.taskOrg}">
+									<input type="text" class="form-control required" name="taskOrg" value="${taskInfo.taskOrg}">
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="task_time"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_time"></spring:message>:</label>
 								<div class="col-md-4">
-									<input id="taskTime" name="taskTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
+									<input id="taskTime" name="taskTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate required"
 									value="<fmt:formatDate value="${taskInfo.taskTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 								</div>
 							</div>
@@ -85,41 +81,8 @@
 		 $(document).ready(function() {
 	 		
 			 $("#inputForm").validate({
-				rules: {
-					taskName: {
-						required: true,
-						maxlength:64,
-					},
-					taskOrg: {
-						required: true,
-						maxlength:128,
-					},
-					taskTime: {
-						required: true,
-					},
-					taskDesc: {
-						maxlength:512,
-					},
-					
-				},
-				messages: {
-					taskName: {
-						required: '<spring:message code="required"/>',
-						maxlength: '<spring:message code="maxlength_64"/>',
-					},
-					taskOrg: {
-						required: '<spring:message code="required"/>',
-						maxlength: '<spring:message code="maxlength_128"/>',
-					},
-					taskTime: {
-						required: '<spring:message code="required"/>',
-					},
-					taskDesc: {
-						maxlength: '<spring:message code="maxlength_512"/>',
-					},
-				},
 					submitHandler: function(form){
-					//loading('onloading...');
+						loading('onloading...');
 						form.submit();
 					},
 					errorContainer: "#messageBox",

src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp

@@ -9,14 +9,34 @@
 <body>
 
 <div class="page-content">
+	<c:set var ="isOptator" value="false"></c:set>
+	<c:set var ="isConfirmor" value="false"></c:set>
+	<c:set var ="isAuditor" value="false"></c:set>
+	<c:forEach items="${fns:getUser().userRoleList}" var="role">
+		<c:if test="${role.id ==28}">
+			<c:set var ="isAuditor" value="true"></c:set>
+		</c:if>
+		<c:if test="${role.id ==27}">
+			<c:set var ="isConfirmor" value="true"></c:set>
+		</c:if>
+		<c:if test="${role.id ==26}">
+			<c:set var ="isOptator" value="true"></c:set>
+		</c:if>
+		<c:if test="${role.id ==1}">
+			<c:set var ="isOptator" value="true"></c:set>
+			<c:set var ="isConfirmor" value="true"></c:set>
+			<c:set var ="isAuditor" value="true"></c:set>
+		</c:if>	
+	</c:forEach>
 	<shiro:hasPermission name="basics:taskInfo:edit">
+	<c:if test="${isOptator }">
 	<div class="theme-panel hidden-xs hidden-sm">
-	<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/taskInfo/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>
+	</c:if>
 	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="special_task"></spring:message>
@@ -66,11 +86,14 @@
 
 									<div class="pull-right">
 									<shiro:hasPermission name="basics:taskInfo:edit"> 
+										<c:if test="${isOptator }">
                                         <button type="button" class="btn btn-default" onclick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
                                       <!--   <button type="button" class="btn btn-default">
                                             <i class="fa fa-download"></i> 导出</button> -->
+                                         </c:if>
+                                         <c:if test="${isConfirmor }">
                                         <div class="btn-group">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                                 <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -82,6 +105,7 @@
 												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
+                                        </c:if>
                                         </shiro:hasPermission>
                                         <a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">

src/main/webapp/WEB-INF/views/cfg/requestForm.jsp

@@ -23,19 +23,19 @@
 					<input type="hidden"  name="id" value="${requestInfo.id}"/>
 						<div class="form-body">
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="request_number"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_number"></spring:message>:</label>
 								<div class="col-md-4">
 									<input type="text" class="form-control required" maxlength="64" name="requestNumber" value="${requestInfo.requestNumber}">
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="request_organization"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_organization"></spring:message>:</label>
 								<div class="col-md-4">
 									<input type="text" class="form-control required" maxlength="128" name="requestOrg" value="${requestInfo.requestOrg}">
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="request_time"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_time"></spring:message>:</label>
 								<div class="col-md-4">
 									<input id="requestTime" name="requestTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate required"
 									value="<fmt:formatDate value="${requestInfo.requestTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
@@ -48,7 +48,7 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="content"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="content"></spring:message>:</label>
 								<div class="col-md-4">
 									<input type="text" class="form-control required" name="requestContent" maxlength="4000" value="${requestInfo.requestContent}">
 								</div>
@@ -86,7 +86,7 @@
 	 		
 			$("#inputForm").validate({
 				submitHandler: function(form){
-					//loading('onloading...');
+					loading('onloading...');
 					form.submit();
 				},
 				errorContainer: "#messageBox",

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -9,13 +9,34 @@
 <body>
 
 <div class="page-content">
+	<c:set var ="isOptator" value="false"></c:set>
+	<c:set var ="isConfirmor" value="false"></c:set>
+	<c:set var ="isAuditor" value="false"></c:set>
+	<c:forEach items="${fns:getUser().userRoleList}" var="role">
+		<c:if test="${role.id ==28}">
+			<c:set var ="isAuditor" value="true"></c:set>
+		</c:if>
+		<c:if test="${role.id ==27}">
+			<c:set var ="isConfirmor" value="true"></c:set>
+		</c:if>
+		<c:if test="${role.id ==26}">
+			<c:set var ="isOptator" value="true"></c:set>
+		</c:if>
+		<c:if test="${role.id ==1}">
+			<c:set var ="isOptator" value="true"></c:set>
+			<c:set var ="isConfirmor" value="true"></c:set>
+			<c:set var ="isAuditor" value="true"></c:set>
+		</c:if>	
+	</c:forEach>
 	<shiro:hasPermission name="cfg:requestInfo:edit">
+	<c:if test="${isOptator }">
 		<div class="theme-panel hidden-xs hidden-sm">
 			<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/request/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 		</div>
+	</c:if>
 	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="requestInfo"></spring:message>
@@ -73,11 +94,14 @@
 
 									<div class="pull-right">
 									<shiro:hasPermission name="cfg:requestInfo:edit">
+                                        <c:if test="${isOptator }">
                                         <button type="button" class="btn btn-default" onClick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
                                       <!--   <button type="button" class="btn btn-default">
                                             <i class="fa fa-download"></i> 导出</button> -->
+                                        </c:if>
+                                        <c:if test="${isConfirmor }">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -89,6 +113,7 @@
 													<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
 	                                            </ul>
 	                                        </div>
+                                        </c:if>	
                         			</shiro:hasPermission>
                                         <a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">

src/main/webapp/WEB-INF/views/login.jsp

@@ -42,7 +42,7 @@
         		<img src="${pageContext.request.contextPath}/static/pages/img/logo.png" alt="logo" />
             </div>
             <div class="page-body">
-                <div class="login-head"> Login </div>
+                <div class="login-head"> <spring:message code='login'/> </div>
                 <div class="login-body">
                     <div class="pull-left login-avatar-block">
                         <img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div>
@@ -67,7 +67,7 @@
 					    </li> --%>
                         
                         <div class="form-actions">
-                            <button type="submit" class="btn red uppercase">Login</button>
+                            <button type="submit" class="btn red uppercase"><spring:message code='login'/></button>
                         </div>
                     </form>
                 </div>
@@ -80,7 +80,6 @@
             
             <p>
 				<div id="messageBox" class="alert alert-danger ${empty message ? 'hide' : ''}">
-					<span class="label label-danger">ERROR:&nbsp;&nbsp;</span>
 					<label id="loginError" class="error"><spring:message code="${message}"></spring:message></label>
 				</div>
 			</p>

src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp

@@ -160,12 +160,10 @@
 										<div class="input-group">
                                            <div class="input-group-btn">
                                                 <select id="seltype"  class="selectpicker select2 input-middle" >
-													<option value="specServiceCode"><spring:message code="protocol_code"/></option>
 													<option value="specServiceName"><spring:message code="protocol_name"/></option>
-													<option value="groupId"><spring:message code="group_id"/></option>
 												</select>
                                             </div>
-                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_code'/>" type="text" onchange="casec()" maxlength="60">
+                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_code'/>" type="text" onchange="casec()" maxlength="60">
                                     
                                             
                                         </div>