Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/domain/configuration/RequestInfo.java

@@ -39,11 +39,13 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
     private String creatorName;
     private String editorName;
     private String auditorName;
-    private Date beginDate;//开始时间
+    private Date beginDate;//来函开始时间
-    private Date endDate;//结束时间
+    private Date endDate;//来函结束时间
     private String timeType;//时间类型
     private String taskName;//专项任务
-    
+    private String seltype;//选中类型
+    private Date dobeginDate;//操作开始时间
+    private Date doendDate;//操作结束时间
 
 	public Long getTaskId() {
 		return taskId;
@@ -212,5 +214,29 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
 	public void setTaskName(String taskName) {
 		this.taskName = taskName;
 	}
+
+	public String getSeltype() {
+		return seltype;
+	}
+
+	public void setSeltype(String seltype) {
+		this.seltype = seltype;
+	}
+
+	public Date getDobeginDate() {
+		return dobeginDate;
+	}
+
+	public void setDobeginDate(Date dobeginDate) {
+		this.dobeginDate = dobeginDate;
+	}
+
+	public Date getDoendDate() {
+		return doendDate;
+	}
+
+	public void setDoendDate(Date doendDate) {
+		this.doendDate = doendDate;
+	}
     
 }

src/main/java/com/nis/domain/configuration/TaskInfo.java

@@ -30,6 +30,16 @@ public class TaskInfo extends BaseEntity<TaskInfo> {
 	private Integer auditorId;
 
 	private Date auditTime;
+	
+	//自定义 创建人员 修改人员 审核人员
+    private String creatorName;
+    private String editorName;
+    private String auditorName;
+    private Date beginDate;//来函开始时间
+    private Date endDate;//来函结束时间
+    private String seltype;//选中类型
+    private Date dobeginDate;//操作开始时间
+    private Date doendDate;//操作结束时间
 
 	public String getTaskName() {
 		return taskName;
@@ -127,5 +137,69 @@ public class TaskInfo extends BaseEntity<TaskInfo> {
 		this.auditTime = auditTime;
 	}
 
+	public String getCreatorName() {
+		return creatorName;
+	}
+
+	public void setCreatorName(String creatorName) {
+		this.creatorName = creatorName;
+	}
+
+	public String getEditorName() {
+		return editorName;
+	}
+
+	public void setEditorName(String editorName) {
+		this.editorName = editorName;
+	}
+
+	public String getAuditorName() {
+		return auditorName;
+	}
+
+	public void setAuditorName(String auditorName) {
+		this.auditorName = auditorName;
+	}
+
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getSeltype() {
+		return seltype;
+	}
+
+	public void setSeltype(String seltype) {
+		this.seltype = seltype;
+	}
+
+	public Date getDobeginDate() {
+		return dobeginDate;
+	}
+
+	public void setDobeginDate(Date dobeginDate) {
+		this.dobeginDate = dobeginDate;
+	}
+
+	public Date getDoendDate() {
+		return doendDate;
+	}
+
+	public void setDoendDate(Date doendDate) {
+		this.doendDate = doendDate;
+	}
+
 	
 }

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

@@ -0,0 +1,150 @@
+package com.nis.web.controller.basics;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.nis.domain.Page;
+import com.nis.domain.configuration.TaskInfo;
+import com.nis.web.controller.BaseController;
+import com.nis.web.service.basics.TaskInfoService;
+
+@Controller
+@RequestMapping("${adminPath}/basics/taskInfo")
+public class TaskInfoController extends BaseController{
+	
+	@Autowired
+	private TaskInfoService taskInfoService;
+	
+	
+	/**
+	 *来函列表
+	 */
+	@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);
+        model.addAttribute("page", page);
+        return "/basics/taskInfoList";
+	}
+	/**
+	 * 进入用户添加或修改页面
+	 */
+	@RequestMapping(value={"form"})
+	public String form(TaskInfo taskInfo, Model model) {
+		if(taskInfo.getId()!=null){
+			taskInfo = taskInfoService.getTaskInfoById(taskInfo.getId());
+			model.addAttribute("taskInfo", taskInfo);
+		}else{
+			model.addAttribute("taskInfo", taskInfo);
+		}
+		return "/basics/taskInfoForm";
+	}
+
+	/**
+	 * 新增/修改
+	 */
+	@RequestMapping(value = "saveOrUpdate")
+	public String saveOrUpdate(TaskInfo taskInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
+		try {
+			if(taskInfo.getId()!=null){
+				// 保存用户信息
+				logger.info(taskInfo.getId()+"修改成功");
+				taskInfoService.saveOrUpdate(taskInfo);
+				addMessage(redirectAttributes, "success");
+			}else{
+				if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
+					logger.info(taskInfo.getTaskName()+"重复数据");
+					addMessage(model, "error");
+					return form(taskInfo, model);
+				}
+				// 保存用户信息
+				taskInfoService.saveOrUpdate(taskInfo);
+				addMessage(redirectAttributes, "success");
+				logger.info(taskInfo.getId()+"保存成功");
+			}
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			e.printStackTrace();
+			addMessage(model, "error");
+		}
+		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+	}
+	
+	/**
+	 * 验证是否有效
+	 */
+	@ResponseBody
+	@RequestMapping(value = "checkTaskName")
+	public String checkTaskName(String taskName) {
+		if (taskName !=null && taskInfoService.getTaskInfoByTaskName(taskName) == null) {
+			return "true";
+		}
+		return "false";
+	}
+
+    /**
+     * 审核通过
+     * @param taskInfo
+     * @param model
+     * @return
+     */
+	@RequestMapping(value = "taskExamine")
+    public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
+		String[] exId = ids.split(",");
+    	taskInfoService.taskExamine(exId);
+    	addMessage(redirectAttributes, "success");
+    	return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+    	
+    }
+	/**
+	 * 审核未通过
+	 * @param taskInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "taskExamineNo")
+	public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
+		String[] noId = ids.split(",");
+		taskInfoService.taskExamineNo(noId);
+		addMessage(redirectAttributes, "success");
+		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		
+	}
+	/**
+	 * 取消审核
+	 * @param taskInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "taskCancelExamine")
+	public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
+		String[] canclelId = ids.split(",");
+		taskInfoService.taskCancelExamine(canclelId);
+		addMessage(redirectAttributes, "success");
+		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		
+	}
+	/**
+	 * 删除
+	 * @param taskInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "delete")
+	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
+		String[] delId = ids.split(",");
+		taskInfoService.delete(delId);
+		addMessage(redirectAttributes, "success");
+		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		
+	}
+
+}

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

@@ -44,7 +44,7 @@ public class ComplexStringCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						cfg.setTableName(tableName);
-						Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(request, response), cfg);
+						Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(request, response,"r"), cfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", cfg.getAction());
 						model.addAttribute("tableName", tableName);

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

@@ -5,7 +5,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -13,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 
@@ -40,17 +39,11 @@ public class NumCfgController extends BaseController{
 				model.addAttribute("serviceId", serviceId);
 				ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 				if(serviceConfigInfo!=null){
-						Page<NumBoundaryCfg> searchPage=new Page<NumBoundaryCfg>(request, response, 1);
+						Page<NumBoundaryCfg> searchPage=new Page<NumBoundaryCfg>(request, response, "r");
-						if(pageNo!=null) searchPage.setPageNo(pageNo);
-						if(pageSize!=null) searchPage.setPageSize(pageSize);
-						if(cfg.getPage()!=null){
-							if(!StringUtils.isBlank(cfg.getPage().getOrderBy()));
-							searchPage.setOrderBy(cfg.getPage().getOrderBy());
-						}
 						Page<NumBoundaryCfg> page = numCfgService.findPage(searchPage, cfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", cfg.getAction());
-						List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+						List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 						model.addAttribute("requestInfos", requestInfos);
 						List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 						model.addAttribute("fls", fls);

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

@@ -101,8 +101,9 @@ public class RequestInfoController extends BaseController{
      * @return
      */
 	@RequestMapping(value = "requestExamine")
-    public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+    public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
-    	requestInfoService.requestExamine(requestInfo);
+		String[] exId = ids.split(",");
+    	requestInfoService.requestExamine(exId);
     	addMessage(redirectAttributes, "success");
     	return "redirect:" + adminPath + "/cfg/request/list?repage";
     	
@@ -114,8 +115,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestExamineNo")
-	public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+	public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.requestExamineNo(requestInfo);
+		String[] noId = ids.split(",");
+		requestInfoService.requestExamineNo(noId);
 		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
@@ -127,8 +129,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestCancelExamine")
-	public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+	public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.requestCancelExamine(requestInfo);
+		String[] canclelId = ids.split(",");
+		requestInfoService.requestCancelExamine(canclelId);
 		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
@@ -140,8 +143,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "delete")
-	public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.delete(requestInfo);
+		String[] delId = ids.split(",");
+		requestInfoService.delete(delId);
 		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
@@ -156,4 +160,5 @@ public class RequestInfoController extends BaseController{
 		List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
 		model.addAttribute("taskInfos", taskInfos);
 	}
+	
 }

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

@@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 
@@ -44,11 +44,11 @@ public class StringCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						stringCfg.setTableName(tableName);
-						Page<BaseStringCfg> page = stringCfgService.findPage(new Page<BaseStringCfg>(request,response), stringCfg);
+						Page<BaseStringCfg> page = stringCfgService.findPage(new Page<BaseStringCfg>(request,response,"r"), stringCfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", stringCfg.getAction());
 						model.addAttribute("tableName", tableName);
-						List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+						List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 						model.addAttribute("requestInfos", requestInfos);
 						List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 						model.addAttribute("fls", fls);

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

@@ -39,12 +39,30 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
   </sql>
-  <sql id="ComplexkeywordCfg_Column_List_with_id_alias" >
+  <!-- <sql id="ComplexkeywordCfg_Column_List_with_id_alias" >
     r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.DISTRICT as district, r.KEYWORDS as keywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
     r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
     r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  </sql> -->
+  <sql id="ComplexkeywordCfg_Column_List_with_id_alias" >
+  	<choose>
+  		<when test="page !=null and page.alias != null and page.alias != ''">
+  		${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc,${page.alias}.DISTRICT as district, ${page.alias}.KEYWORDS as keywords, ${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
+	    ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
+	    ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
+	    ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,
+	    ${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</when>
+  		<otherwise>
+  		r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.DISTRICT as district, r.KEYWORDS as keywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
+	    r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
+	    r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
+	    r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
+	    r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</otherwise>
+  	</choose>
   </sql>
   <sql id="ComplexkeywordCfg_Column_List" >
     CFG_DESC,DISTRICT,KEYWORDS, ACTION,IS_VALID,IS_AUDIT,
@@ -149,14 +167,7 @@
   </select>
   <select id="findList" resultMap="ComplexStringMapWithUser">
 		select 
-		<!--<choose>
+		<include refid="ComplexkeywordCfg_Column_List_with_id_alias"/>	
-			 <when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when> 
-			<otherwise>-->
-				<include refid="ComplexkeywordCfg_Column_List_with_id_alias"/>	
-			<!-- </otherwise>
-		</choose> -->
 		<trim prefix="," prefixOverrides=",">
 			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
 			,ri.request_title as requestName
@@ -167,88 +178,168 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 			</if>
-			<if test="cfgId != null">
+			<choose>
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		  		<when test="page !=null and page.alias != null and page.alias != ''">
-    		</if>
+		  			<if test="cfgId != null">
-	    	<if test="cfgDesc != null">
+		    			AND ${page.alias}.CFG_ID=#{cfgId,jdbcType=BIGINT}
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+		    		</if>
-	    	</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
-	    	<if test="district != null">
+			    		AND ${page.alias}.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-    			AND r.DISTRICT like concat(concat('%',#{district,jdbcType=VARCHAR}),'%')
+			    	</if>
-    		</if>
+			    	<if test="district != null and district != ''">
-	    	<if test="keywords != null">
+		    			AND ${page.alias}.DISTRICT like concat(concat('%',#{district,jdbcType=VARCHAR}),'%')
-    			AND r.KEYWORDS like concat(concat('%',#{keywords,jdbcType=VARCHAR}),'%')
+		    		</if>
-    		</if>
+			    	<if test="keywords != null and keywords != ''">
-	    	<if test="action != null">
+		    			AND ${page.alias}.KEYWORDS like concat(concat('%',#{keywords,jdbcType=VARCHAR}),'%')
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
+		    		</if>
-	    	</if>
+			    	<if test="action != null">
-	    	<if test="isValid != null">
+			    		AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER}
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isValid != null">
-	    	<if test="isValid == null">
+			    		AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    		AND r.IS_VALID != -1
+			    	</if>
-	    	</if>
+			    	<if test="isValid == null">
-	    	<if test="isAudit != null">
+			    		AND ${page.alias}.IS_VALID != -1
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isAudit != null">
-	    	<if test="creatorName != null">
+			    		AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="creatorName != null and creatorName != ''">
-	    	<if test="createTime != null">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="createTime != null and createTime != ''">
-	    	<if test="editorName != null">
+			    		AND ${page.alias}.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="editorName != null and editorName != ''">
-	    	<if test="editTime != null">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="editTime != null and editTime != ''">
-	    	<if test="auditorName != null">
+			    		AND ${page.alias}.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="auditorName != null and auditorName != ''">
-	    	<if test="auditTime != null">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
-	    	<if test="serviceId != null">
+			    		AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="serviceId != null">
-	    	<if test="requestId != null">
+			    		AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="requestId != null">
-	    	<if test="compileId != null">
+			    		AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="compileId != null">
-	    	<if test="isAreaEffective != null">
+			    		AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER}
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isAreaEffective != null">
-	    	<if test="classify != null">
+			    		AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="classify != null and classify != ''">
-	    	<if test="attribute != null">
+			    		AND ${page.alias}.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="attribute != null and attribute != ''">
-	    	<if test="lable != null">
+			    		AND ${page.alias}.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="lable != null and lable != ''">
-	    	<if test="exprType != null">
+			    		AND ${page.alias}.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="exprType != null">
-	    	<if test="matchMethod != null">
+		    			AND ${page.alias}.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
-	    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="matchMethod != null">
-	    	<if test="isHexbin != null">
+			    		AND ${page.alias}.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
-	    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isHexbin != null">
-	    	<if test="areaEffectiveIds != null">
+			    		AND ${page.alias}.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND ${page.alias}.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</when>
+		  		<otherwise>
+		  			<if test="cfgId != null">
+		    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="district != null and district != ''">
+		    			AND r.DISTRICT like concat(concat('%',#{district,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="keywords != null and keywords != ''">
+		    			AND r.KEYWORDS like concat(concat('%',#{keywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="action != null">
+			    		AND r.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND r.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null and creatorName != ''">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and auditorName != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</otherwise>
+		  	</choose>
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -298,13 +389,13 @@
     update ${tableName}
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null" >
+      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
-      <if test="district != null">
+      <if test="district != null and district != ''">
     	district = #{district,jdbcType=VARCHAR},
       </if>
-      <if test="keywords != null">
+      <if test="keywords != null and keywords != ''">
     	keywords = #{keywords,jdbcType=VARCHAR},
       </if>
       <if test="action != null" >
@@ -319,19 +410,19 @@
       <if test="creatorId != null" >
         creator_id = #{creatorId,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null and createTime != ''" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="editorId != null" >
         editor_id = #{editorId,jdbcType=INTEGER},
       </if>
-      <if test="editTime != null" >
+      <if test="editTime != null and editTime != ''" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
       <if test="auditorId != null" >
         auditor_id = #{auditorId,jdbcType=INTEGER},
       </if>
-      <if test="auditTime != null" >
+      <if test="auditTime != null and auditTime != ''" >
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
       <if test="serviceId != null" >
@@ -346,13 +437,13 @@
       <if test="isAreaEffective != null" >
         is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
       </if>
-      <if test="classify != null" >
+      <if test="classify != null and classify != ''" >
         classify = #{classify,jdbcType=VARCHAR},
       </if>
-      <if test="attribute != null" >
+      <if test="attribute != null and attribute != ''" >
         attribute = #{attribute,jdbcType=VARCHAR},
       </if>
-      <if test="lable != null" >
+      <if test="lable != null and lable != ''" >
         lable = #{lable,jdbcType=VARCHAR},
       </if>
       <if test="exprType != null">
@@ -364,7 +455,7 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
-      <if test="areaEffectiveIds != null" >
+      <if test="areaEffectiveIds != null and areaEffectiveIds != ''" >
         area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
       </if>
       </trim>

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

@@ -273,8 +273,8 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}

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

@@ -39,12 +39,30 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
   </sql>
-  <sql id="NumCfg_Column_List_with_id_alias" >
+  <!-- <sql id="NumCfg_Column_List_with_id_alias" >
     r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.LOW_BOUNADRY as lowBounadry,r.UP_BOUNADRY as upBounadry, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
     r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
     r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  </sql> -->
+  <sql id="NumCfg_Column_List_with_id_alias" >
+	  <choose>
+	  		<when test="page !=null and page.alias != null and page.alias != ''">
+	  		${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.LOW_BOUNADRY as lowBounadry,${page.alias}.UP_BOUNADRY as upBounadry, ${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
+		    ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
+		    ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
+		    ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,
+		    ${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+	  		</when>
+	  		<otherwise>
+	  		r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.LOW_BOUNADRY as lowBounadry,r.UP_BOUNADRY as upBounadry, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
+		    r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
+		    r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
+		    r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
+		    r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+	  		</otherwise>
+	  </choose>
   </sql>
   <sql id="NumCfg_Column_List" >
     CFG_DESC, LOW_BOUNADRY,UP_BOUNADRY, ACTION,IS_VALID,IS_AUDIT,
@@ -170,88 +188,169 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 			</if>
-			<if test="cfgId != null">
+			<choose>
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		  		<when test="page !=null and page.alias != null and page.alias != ''">
-    		</if>
+		  			<if test="cfgId != null">
-	    	<if test="cfgDesc != null">
+		    			AND ${page.alias}.CFG_ID=#{cfgId,jdbcType=BIGINT}
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+		    		</if>
-	    	</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
-	    	<if test="lowBounadry != null">
+			    		AND ${page.alias}.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-    			AND r.LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
+			    	</if>
-    		</if>
+			    	<if test="lowBounadry != null">
-	    	<if test="upBounadry != null">
+		    			AND ${page.alias}.LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
-    			AND r.UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
+		    		</if>
-    		</if>
+			    	<if test="upBounadry != null">
-	    	<if test="action != null">
+		    			AND ${page.alias}.UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
+		    		</if>
-	    	</if>
+			    	<if test="action != null">
-	    	<if test="isValid != null">
+			    		AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER}
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isValid != null">
-	    	<if test="isValid == null">
+			    		AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    		AND r.IS_VALID != -1
+			    	</if>
-	    	</if>
+			    	<if test="isValid == null">
-	    	<if test="isAudit != null">
+			    		AND ${page.alias}.IS_VALID != -1
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isAudit != null">
-	    	<if test="creatorName != null">
+			    		AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="creatorName != null">
-	    	<if test="createTime != null">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="createTime != null and createTime != ''">
-	    	<if test="editorName != null">
+			    		AND ${page.alias}.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="editorName != null and editorName != ''">
-	    	<if test="editTime != null">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="editTime != null and editTime != ''">
-	    	<if test="auditorName != null">
+			    		AND ${page.alias}.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="auditorName != null and editTime != ''">
-	    	<if test="auditTime != null">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
-	    	<if test="serviceId != null">
+			    		AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="serviceId != null">
-	    	<if test="requestId != null">
+			    		AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="requestId != null">
-	    	<if test="compileId != null">
+			    		AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="compileId != null">
-	    	<if test="isAreaEffective != null">
+			    		AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER}
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isAreaEffective != null">
-	    	<if test="classify != null">
+			    		AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="classify != null and classify != ''">
-	    	<if test="attribute != null">
+			    		AND ${page.alias}.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="attribute != null and attribute != ''">
-	    	<if test="lable != null">
+			    		AND ${page.alias}.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="lable != null and lable != ''">
-	    	<if test="exprType != null">
+			    		AND ${page.alias}.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="exprType != null">
-	    	<if test="matchMethod != null">
+		    			AND ${page.alias}.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
-	    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="matchMethod != null">
-	    	<if test="isHexbin != null">
+			    		AND ${page.alias}.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
-	    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isHexbin != null">
-	    	<if test="areaEffectiveIds != null">
+			    		AND ${page.alias}.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND ${page.alias}.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</when>
+		  		<otherwise>
+		  			<if test="cfgId != null">
+		    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="lowBounadry != null">
+		    			AND r.LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="upBounadry != null">
+		    			AND r.UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="action != null">
+			    		AND r.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND r.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and editTime != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</otherwise>
+		  	</choose>
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -301,7 +400,7 @@
     update num_boundary_cfg
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null" >
+      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
       <if test="lowBounadry != null">
@@ -322,19 +421,19 @@
       <if test="creatorId != null" >
         creator_id = #{creatorId,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null and createTime != ''" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="editorId != null" >
         editor_id = #{editorId,jdbcType=INTEGER},
       </if>
-      <if test="editTime != null" >
+      <if test="editTime != null and editTime != ''" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
       <if test="auditorId != null" >
         auditor_id = #{auditorId,jdbcType=INTEGER},
       </if>
-      <if test="auditTime != null" >
+      <if test="auditTime != null and auditTime != ''" >
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
       <if test="serviceId != null" >
@@ -349,13 +448,13 @@
       <if test="isAreaEffective != null" >
         is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
       </if>
-      <if test="classify != null" >
+      <if test="classify != null and classify != ''" >
         classify = #{classify,jdbcType=VARCHAR},
       </if>
-      <if test="attribute != null" >
+      <if test="attribute != null and classify != ''" >
         attribute = #{attribute,jdbcType=VARCHAR},
       </if>
-      <if test="lable != null" >
+      <if test="lable != null and lable != ''" >
         lable = #{lable,jdbcType=VARCHAR},
       </if>
       <if test="exprType != null">
@@ -367,7 +466,7 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
-      <if test="areaEffectiveIds != null" >
+      <if test="areaEffectiveIds != null and areaEffectiveIds != ''" >
         area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
       </if>
       </trim>

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

@@ -23,6 +23,7 @@ public interface RequestInfoDao  extends CrudDao {
 
 	List<TaskInfo> showTask(TaskInfo taskInfo);
 
+	void delete(@Param("id") Long id);
 
 
 }

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

@@ -61,11 +61,11 @@
 	<if test="isAudit != null">
 			AND r.is_audit=${isAudit}
 	</if>
-	<if test=" timeType == 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+	<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
 			AND r.request_time between #{beginDate} and #{endDate}
  	</if>
-	<if test="timeType == 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
+			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
 	</if> 
 	order by r.request_time desc
   </select>
@@ -153,11 +153,11 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
   <!--删除  -->
-  <update id="delete" parameterType="com.nis.domain.configuration.RequestInfo">
+  <update id="delete" parameterType="long">
      update request_info
     <set>
-	    <if test="isValid != null and id != null">
+	    <if test="id != null and id != ''">
-	    	is_valid=#{isValid}
+	    	is_valid=-1
 	    </if>
     </set>
     where id = #{id,jdbcType=BIGINT} and is_audit !=1

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

@@ -61,12 +61,29 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
   </sql>
-  <sql id="BaseStringCfg_Column_List_with_id_alias" >
+  <!-- <sql id="BaseStringCfg_Column_List_with_id_alias" >
     r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
     r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
     r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  </sql> -->
+  <sql id="BaseStringCfg_Column_List_with_id_alias" >
+  	<choose>
+  		<when test="page !=null and page.alias != null and page.alias != ''">
+  			${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.CFG_KEYWORDS as cfgKeywords,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
+    ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
+    ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
+    ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</when>
+  		<otherwise>
+  			 r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
+    r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
+    r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
+    r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
+    r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</otherwise>
+  	</choose>
   </sql>
   <sql id="BaseStringCfg_Column_List" >
     CFG_DESC, CFG_KEYWORDS, ACTION,IS_VALID,IS_AUDIT,
@@ -166,16 +183,10 @@
     	</if>
     </trim>
   </select>
+  
   <select id="findList" resultMap="BaseStringMapWithUser">
 		select 
-		<!--<choose>
+		<include refid="BaseStringCfg_Column_List_with_id_alias"/>	
-			 <when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when> 
-			<otherwise>-->
-				<include refid="BaseStringCfg_Column_List_with_id_alias"/>	
-			<!-- </otherwise>
-		</choose> -->
 		<trim prefix="," prefixOverrides=",">
 			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
 			,ri.request_title as requestName
@@ -186,85 +197,162 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 			</if>
-			<if test="cfgId != null">
+			<choose>
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		  		<when test="page !=null and page.alias != null and page.alias != ''">
-    		</if>
+		  			<if test="cfgId != null">
-	    	<if test="cfgDesc != null">
+		    			AND ${page.alias}.CFG_ID=#{cfgId,jdbcType=BIGINT}
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+		    		</if>
-	    	</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
-	    	<if test="cfgKeywords != null">
+			    		AND ${page.alias}.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-    			AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
+			    	</if>
-    		</if>
+			    	<if test="cfgKeywords != null and cfgKeywords != ''">
-	    	<if test="action != null">
+		    			AND ${page.alias}.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
+		    		</if>
-	    	</if>
+			    	<if test="action != null">
-	    	<if test="isValid != null">
+			    		AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER}
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isValid != null">
-	    	<if test="isValid == null">
+			    		AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    		AND r.IS_VALID != -1
+			    	</if>
-	    	</if>
+			    	<if test="isValid == null">
-	    	<if test="isAudit != null">
+			    		AND ${page.alias}.IS_VALID != -1
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isAudit != null">
-	    	<if test="creatorName != null">
+			    		AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="creatorName != null and creatorName != ''">
-	    	<if test="createTime != null">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="createTime != null and createTime != ''">
-	    	<if test="editorName != null">
+			    		AND ${page.alias}.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="editorName != null and editorName != ''">
-	    	<if test="editTime != null">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="editTime != null and editTime != ''">
-	    	<if test="auditorName != null">
+			    		AND ${page.alias}.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="auditorName != null and auditorName != ''">
-	    	<if test="auditTime != null">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
-	    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
-	    	<if test="serviceId != null">
+			    		AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="serviceId != null">
-	    	<if test="requestId != null">
+			    		AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="requestId != null">
-	    	<if test="compileId != null">
+			    		AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="compileId != null">
-	    	<if test="isAreaEffective != null">
+			    		AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER}
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isAreaEffective != null">
-	    	<if test="classify != null">
+			    		AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="classify != null and classify != ''">
-	    	<if test="attribute != null">
+			    		AND ${page.alias}.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="attribute != null and attribute != ''">
-	    	<if test="lable != null">
+			    		AND ${page.alias}.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="lable != null and lable != ''">
-	    	<if test="exprType != null">
+			    		AND ${page.alias}.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="exprType != null">
-	    	<if test="matchMethod != null">
+		    			AND ${page.alias}.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
-	    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="matchMethod != null">
-	    	<if test="isHexbin != null">
+			    		AND ${page.alias}.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
-	    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
-	    	</if>
+			    	<if test="isHexbin != null">
-	    	<if test="areaEffectiveIds != null">
+			    		AND ${page.alias}.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
-	    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND ${page.alias}.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</when>
+		  		<otherwise>
+		  			<if test="cfgId != null">
+		    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="cfgKeywords != null and cfgKeywords != ''">
+		    			AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="action != null">
+			    		AND r.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND r.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null and creatorName != ''">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and auditorName != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</otherwise>
+		  	</choose>
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -314,10 +402,10 @@
     update ${tableName}
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null" >
+      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
-      <if test="cfgKeywords != null">
+      <if test="cfgKeywords != null and cfgKeywords != ''">
     	cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR},
       </if>
       <if test="action != null" >
@@ -338,13 +426,13 @@
       <if test="editorId != null" >
         editor_id = #{editorId,jdbcType=INTEGER},
       </if>
-      <if test="editTime != null" >
+      <if test="editTime != null and editTime != ''" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
       <if test="auditorId != null" >
         auditor_id = #{auditorId,jdbcType=INTEGER},
       </if>
-      <if test="auditTime != null" >
+      <if test="auditTime != null and auditTime != ''" >
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
       <if test="serviceId != null" >
@@ -359,13 +447,13 @@
       <if test="isAreaEffective != null" >
         is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
       </if>
-      <if test="classify != null" >
+      <if test="classify != null and classify != ''" >
         classify = #{classify,jdbcType=VARCHAR},
       </if>
-      <if test="attribute != null" >
+      <if test="attribute != null and attribute != ''" >
         attribute = #{attribute,jdbcType=VARCHAR},
       </if>
-      <if test="lable != null" >
+      <if test="lable != null and lable != ''" >
         lable = #{lable,jdbcType=VARCHAR},
       </if>
       <if test="exprType != null">
@@ -377,7 +465,7 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
-      <if test="areaEffectiveIds != null" >
+      <if test="areaEffectiveIds != null and areaEffectiveIds != ''" >
         area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
       </if>
       </trim>

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

@@ -1,8 +1,20 @@
 package com.nis.web.dao.configuration;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.configuration.TaskInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 @MyBatisDao
 public interface TaskInfoDao extends CrudDao<TaskInfo>{
+	List<TaskInfo> findTaskInfo(TaskInfo requestInfo);
+	
+	TaskInfo getTaskInfoByTaskName(@Param("taskName") String taskName);
+	
+	TaskInfo getTaskInfoById(@Param("id") Long id);
+	
+	void delete(@Param("id") Long id);
+
 }

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

@@ -30,10 +30,55 @@
     </if>
   </select>
   
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!-- 查询列表 -->
-    delete from task_info
+  <select id="findTaskInfo" resultMap="BaseResultMap">
+	select
+		r.id AS id,
+		r.task_name AS taskName,
+		r.task_org AS taskOrg,
+		r.task_time AS taskTime,
+		r.is_valid AS isValid,
+		r.is_audit AS isAudit,
+		s.name AS creatorName,
+		r.create_time AS createTime,
+		u.name AS editorName,
+		r.edit_time AS editTime,
+		e.name AS currentName,
+		r.audit_time AS auditTime
+	from task_info r
+	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
+	<if test="taskName != null and taskName != ''">
+			AND r.task_name like 
+				<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
+	</if>
+	<if test="isAudit != null">
+			AND r.is_audit=${isAudit}
+	</if>
+	<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+			AND r.task_time between #{beginDate} and #{endDate}
+ 	</if>
+	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
+			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
+	</if> 
+	order by r.task_time desc
+  </select>
+  <!-- 根据来函号查询 -->
+  <select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from task_info
+    where task_name = #{taskName,jdbcType=VARCHAR}
+  </select>
+  <!-- 根据来id查询 -->
+  <select id="getTaskInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List"/>
+    from task_info
     where id = #{id,jdbcType=BIGINT}
-  </delete>
+  </select>
   <insert id="insert" parameterType="com.nis.domain.configuration.TaskInfo">
     insert into task_info (id, task_name, task_org, 
       task_time, task_desc, is_valid, 
@@ -46,92 +91,8 @@
       #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, #{auditorId,jdbcType=INTEGER}, 
       #{auditTime,jdbcType=DATE})
   </insert>
-  <insert id="insertSelective" parameterType="com.nis.domain.configuration.TaskInfo">
+
-    insert into task_info
+  <update id="update" parameterType="com.nis.domain.configuration.TaskInfo">
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="taskName != null">
-        task_name,
-      </if>
-      <if test="taskOrg != null">
-        task_org,
-      </if>
-      <if test="taskTime != null">
-        task_time,
-      </if>
-      <if test="taskDesc != null">
-        task_desc,
-      </if>
-      <if test="isValid != null">
-        is_valid,
-      </if>
-      <if test="isAudit != null">
-        is_audit,
-      </if>
-      <if test="creatorId != null">
-        creator_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="editorId != null">
-        editor_id,
-      </if>
-      <if test="editTime != null">
-        edit_time,
-      </if>
-      <if test="auditorId != null">
-        auditor_id,
-      </if>
-      <if test="auditTime != null">
-        audit_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="taskName != null">
-        #{taskName,jdbcType=VARCHAR},
-      </if>
-      <if test="taskOrg != null">
-        #{taskOrg,jdbcType=VARCHAR},
-      </if>
-      <if test="taskTime != null">
-        #{taskTime,jdbcType=DATE},
-      </if>
-      <if test="taskDesc != null">
-        #{taskDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="isValid != null">
-        #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null">
-        #{isAudit,jdbcType=INTEGER},
-      </if>
-      <if test="creatorId != null">
-        #{creatorId,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=DATE},
-      </if>
-      <if test="editorId != null">
-        #{editorId,jdbcType=INTEGER},
-      </if>
-      <if test="editTime != null">
-        #{editTime,jdbcType=DATE},
-      </if>
-      <if test="auditorId != null">
-        #{auditorId,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null">
-        #{auditTime,jdbcType=DATE},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.nis.domain.configuration.TaskInfo">
     update task_info
     <set>
       <if test="taskName != null">
@@ -173,20 +134,14 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.TaskInfo">
+    <!--删除  -->
-    update task_info
+  <update id="delete" parameterType="long">
-    set task_name = #{taskName,jdbcType=VARCHAR},
+     update task_info
-      task_org = #{taskOrg,jdbcType=VARCHAR},
+    <set>
-      task_time = #{taskTime,jdbcType=DATE},
+	    <if test="id != null and id != ''">
-      task_desc = #{taskDesc,jdbcType=VARCHAR},
+	    	is_valid=-1
-      is_valid = #{isValid,jdbcType=INTEGER},
+	    </if>
-      is_audit = #{isAudit,jdbcType=INTEGER},
+    </set>
-      creator_id = #{creatorId,jdbcType=INTEGER},
+    where id = #{id,jdbcType=BIGINT} and is_audit !=1
-      create_time = #{createTime,jdbcType=DATE},
-      editor_id = #{editorId,jdbcType=INTEGER},
-      edit_time = #{editTime,jdbcType=DATE},
-      auditor_id = #{auditorId,jdbcType=INTEGER},
-      audit_time = #{auditTime,jdbcType=DATE}
-    where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

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

@@ -0,0 +1,99 @@
+package com.nis.web.service.basics;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.nis.domain.Page;
+import com.nis.domain.configuration.TaskInfo;
+import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.configuration.TaskInfoDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+@Service
+@Transactional(readOnly=true)
+public class TaskInfoService extends BaseService{
+
+	@Autowired
+	private TaskInfoDao taskInfoDao;
+	
+	public Page<TaskInfo> findTaskInfo(Page<TaskInfo> page, TaskInfo taskInfo) {
+		// 设置分页参数
+		taskInfo.setPage(page);
+		// 执行分页查询
+		page.setList(taskInfoDao.findTaskInfo(taskInfo));
+		return page;
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void saveOrUpdate(TaskInfo taskInfo) {
+		if (StringUtil.isEmpty(taskInfo.getId())) {
+			//设置默认参数值
+			taskInfo.setIsValid(1);//有效
+			taskInfo.setIsAudit(0);//未审核
+			taskInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员
+			taskInfo.setCreateTime(new Date());//创建时间
+			taskInfoDao.insert(taskInfo);
+		}else{
+			taskInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员
+			taskInfo.setEditTime(new Date());//修改时间
+			taskInfoDao.update(taskInfo);
+		}
+		
+	}
+
+	public TaskInfo getTaskInfoByTaskName(String taskName) {
+		
+		return taskInfoDao.getTaskInfoByTaskName(taskName);
+	}
+	public TaskInfo getTaskInfoById(Long id) {
+		
+		return taskInfoDao.getTaskInfoById(id);
+	}
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void taskExamine(String[] exId){
+		TaskInfo taskInfo = new TaskInfo();
+		for (int i = 0; i < exId.length; i++) {
+			taskInfo.setId(Long.valueOf(exId[i]));
+			taskInfo.setIsAudit(1);//审核通过
+			taskInfo.setAuditTime(new Date());
+			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
+			taskInfoDao.update(taskInfo);
+		}
+	}
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void taskExamineNo(String[] noId){
+		TaskInfo taskInfo = new TaskInfo();
+		for (int i = 0; i < noId.length; i++) {
+			taskInfo.setId(Long.valueOf(noId[i]));
+			taskInfo.setIsAudit(2);//审核未通过
+			taskInfo.setAuditTime(new Date());
+			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
+			taskInfoDao.update(taskInfo);
+		}
+	}
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void taskCancelExamine(String[] cancelId){
+		TaskInfo taskInfo = new TaskInfo();
+		for (int i = 0; i < cancelId.length; i++) {
+			taskInfo.setId(Long.valueOf(cancelId[i]));
+			taskInfo.setIsAudit(3);//取消审核通过
+			taskInfo.setAuditTime(new Date());
+			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
+			taskInfoDao.update(taskInfo);
+		}
+	}
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void delete(String[] delId){
+		for (int i = 0; i < delId.length; i++) {
+			taskInfoDao.delete(Long.valueOf(delId[i]));//删除
+		}
+	}
+}

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

@@ -62,24 +62,43 @@ public class RequestInfoService extends BaseService{
 		return requestInfoDao.getRequestInfoById(id);
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void requestExamine(RequestInfo requestInfo){
+	public void requestExamine(String[] exId){
-		requestInfo.setIsAudit(1);//审核通过
+		RequestInfo requestInfo = new RequestInfo();
-		requestInfoDao.update(requestInfo);
+		for (int i = 0; i < exId.length; i++) {
+			requestInfo.setId(Long.valueOf(exId[i]));
+			requestInfo.setIsAudit(1);//审核通过
+			requestInfo.setAuditTime(new Date());
+			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
+			requestInfoDao.update(requestInfo);
+		}
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void requestExamineNo(RequestInfo requestInfo){
+	public void requestExamineNo(String[] noId){
-		requestInfo.setIsAudit(2);//审核未通过
+		RequestInfo requestInfo = new RequestInfo();
-		requestInfoDao.update(requestInfo);
+		for (int i = 0; i < noId.length; i++) {
+			requestInfo.setId(Long.valueOf(noId[i]));
+			requestInfo.setIsAudit(2);//审核未通过
+			requestInfo.setAuditTime(new Date());
+			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
+			requestInfoDao.update(requestInfo);
+		}
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void requestCancelExamine(RequestInfo requestInfo){
+	public void requestCancelExamine(String[] cancelId){
-		requestInfo.setIsAudit(3);//取消审核通过
+		RequestInfo requestInfo = new RequestInfo();
-		int update = requestInfoDao.update(requestInfo);
+		for (int i = 0; i < cancelId.length; i++) {
+			requestInfo.setId(Long.valueOf(cancelId[i]));
+			requestInfo.setIsAudit(3);//取消审核通过
+			requestInfo.setAuditTime(new Date());
+			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
+			requestInfoDao.update(requestInfo);
+		}
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void delete(RequestInfo requestInfo){
+	public void delete(String[] delId){
-		requestInfo.setIsValid(-1);
+		for (int i = 0; i < delId.length; i++) {
-		requestInfoDao.delete(requestInfo);//删除
+			requestInfoDao.delete(Long.valueOf(delId[i]));//删除
+		}
 	}
 	public List<RequestInfo> getValidRequestInfo(){
 		RequestInfo requestInfo=new RequestInfo();

src/main/resources/messages/message_zh_CN.properties

@@ -26,21 +26,21 @@ configuration_manage=\u914d\u7f6e\u7ba1\u7406
 text_enhance_manage=\u6587\u672c\u589e\u5f3a\u7ba1\u63a7
 text_enhance_monitor=\u6587\u672c\u589e\u5f3a\u76d1\u6d4b
 plaintext_manage=\u660e\u6587\u5185\u5bb9\u7ba1\u63a7
-monitor_white=\u7ba1\u63a7\u767d\u540d\u5355
-ip_monitor_white=IP\u7ba1\u63a7\u767d\u540d\u5355
-monitor_grey=\u7ba1\u63a7\u7070\u540d\u5355
 social_app_grey=\u793e\u4ea4\u5e94\u7528\u7070\u540d\u5355
-encryption_monitor=\u52a0\u5bc6\u5185\u5bb9\u7ba1\u63a7
+encryption_control=\u52a0\u5bc6\u5185\u5bb9\u7ba1\u63a7
-specific_agreement_monitor=\u7279\u5b9a\u534f\u8bae\u7ba1\u63a7
+control_white=\u7ba1\u63a7\u767d\u540d\u5355
-social_app_monitor=\u793e\u4ea4\u5e94\u7528\u7ba1\u63a7
+ip_control_white=IP\u7ba1\u63a7\u767d\u540d\u5355
-online_media_monitor=\u5728\u7ebf\u5a92\u4f53\u7ba1\u63a7
+control_grey=\u7ba1\u63a7\u7070\u540d\u5355
-sip_ip_monitor=SIP\u534f\u8baeIP\u7ba1\u63a7
+specific_agreement_control=\u7279\u5b9a\u534f\u8bae\u7ba1\u63a7
-domain_monitor_white=\u57df\u540d\u7ba1\u63a7\u767d\u540d\u5355
+social_app_control=\u793e\u4ea4\u5e94\u7528\u7ba1\u63a7
-ip_address_monitor=IP\u5730\u5740\u7ba1\u63a7
+online_media_control=\u5728\u7ebf\u5a92\u4f53\u7ba1\u63a7
-ip_monitor=IP\u7ba1\u63a7
+sip_ip_control=SIP\u534f\u8baeIP\u7ba1\u63a7
-ip_port_monitor=IP+\u7aef\u53e3\u7ba1\u63a7
+ip_control=IP\u7ba1\u63a7
-domain_monitor=\u57df\u540d\u7ba1\u63a7
+domain_control_white=\u57df\u540d\u7ba1\u63a7\u767d\u540d\u5355
-dns_monitor=DNS\u7ba1\u63a7
+ip_port_control=IP+\u7aef\u53e3\u7ba1\u63a7
+ip_address_control=IP\u5730\u5740\u7ba1\u63a7
+domain_control=\u57df\u540d\u7ba1\u63a7
+dns_control=DNS\u7ba1\u63a7
 basic_configuration=\u57fa\u672c\u914d\u7f6e
 letter_from=\u6765\u51fd\u5355\u4f4d
 classification=\u5206\u7c7b\u6027\u8d28
@@ -55,38 +55,38 @@ protect_list=\u4fdd\u62a4\u540d\u5355
 effect_range=\u751f\u6548\u8303\u56f4
 agreement_ip_configuration=\u534f\u8baeIP\u914d\u7f6e
 ip_spoofing_configuration=\u6b3a\u9a97IP\u914d\u7f6e
-website_monitor=\u7f51\u7ad9\u7ba1\u63a7
+website_control=\u7f51\u7ad9\u7ba1\u63a7
-host_monitor=HOST\u7ba1\u63a7
+host_control=HOST\u7ba1\u63a7
-url_monitor=URL\u7ba1\u63a7
+url_control=URL\u7ba1\u63a7
-website_keyword_monitor=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
+website_keyword_control=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
-mail_monitor=\u90ae\u4ef6\u7ba1\u63a7
+mail_control=\u90ae\u4ef6\u7ba1\u63a7
-recipient_monitor=\u6536\u4ef6\u4eba\u7ba1\u63a7
+recipient_control=\u6536\u4ef6\u4eba\u7ba1\u63a7
-sender_monitor=\u53d1\u4ef6\u4eba\u7ba1\u63a7
+sender_control=\u53d1\u4ef6\u4eba\u7ba1\u63a7
-theme_monitor=\u4e3b\u9898\u7ba1\u63a7
+theme_control=\u4e3b\u9898\u7ba1\u63a7
-mail_keyword_monitor=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
+mail_keyword_control=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
-mail_attachment_name_monitor=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u7ba1\u63a7
+mail_attachment_name_control=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u7ba1\u63a7
-mail_attachment_content_monitor=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
+mail_attachment_content_control=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
-file_transfer_monitor=\u6587\u4ef6\u4f20\u8f93\u7ba1\u63a7
+file_transfer_control=\u6587\u4ef6\u4f20\u8f93\u7ba1\u63a7
-ftp_address_monitor=FTP\u5730\u5740\u7ba1\u63a7
+ftp_address_control=FTP\u5730\u5740\u7ba1\u63a7
-ftp_name_monitor=FTP\u6587\u4ef6\u540d\u7ba1\u63a7
+ftp_name_control=FTP\u6587\u4ef6\u540d\u7ba1\u63a7
-ftp_content_monitor=FTP \u6587\u4ef6\u5185\u5bb9\u7ba1\u63a7
+ftp_content_control=FTP \u6587\u4ef6\u5185\u5bb9\u7ba1\u63a7
 http_app_feature=\u793e\u4ea4\u5e94\u7528HTTP\u7279\u5f81
 ssl_app_feature=\u793e\u4ea4\u5e94\u7528SSL\u7279\u5f81
-tunnel_protocol_monitor=\u96a7\u9053\u534f\u8bae\u7ba1\u63a7
+tunnel_protocol_control=\u96a7\u9053\u534f\u8bae\u7ba1\u63a7
-l2tp_ip_monitor=L2TP\u534f\u8baeIP\u7ba1\u63a7
+l2tp_ip_control=L2TP\u534f\u8baeIP\u7ba1\u63a7
-pptp_ip_monitor=pptp\u534f\u8baeIP\u7ba1\u63a7
+pptp_ip_control=pptp\u534f\u8baeIP\u7ba1\u63a7
-openvpn_monitor=OpenVPN\u7ba1\u63a7
+openvpn_control=OpenVPN\u7ba1\u63a7
-ssh_monitor=SSH\u7ba1\u63a7
+ssh_control=SSH\u7ba1\u63a7
-ssl_monitor=SSL\u7ba1\u63a7
+ssl_control=SSL\u7ba1\u63a7
-ssl_feature_monitor=SSL\u8bc1\u4e66\u7279\u5f81\u7ba1\u63a7
+ssl_feature_control=SSL\u8bc1\u4e66\u7279\u5f81\u7ba1\u63a7
-ssl_sni_monitor=SSL\uff08SNI\uff09\u7ba1\u63a7
+ssl_sni_control=SSL\uff08SNI\uff09\u7ba1\u63a7
-ssl_address_monitor=SSL\u5730\u5740\u7ba1\u63a7
+ssl_address_control=SSL\u5730\u5740\u7ba1\u63a7
 https_website_content_replace=HTTPS\u7f51\u7ad9\u5185\u5bb9\u66ff\u6362
-https_website_monitor=HTTPS\u7f51\u7ad9\u7ba1\u63a7
+https_website_control=HTTPS\u7f51\u7ad9\u7ba1\u63a7
-rtp_ip_monitor=RTP\u534f\u8baeIP\u7ba1\u63a7
+rtp_ip_control=RTP\u534f\u8baeIP\u7ba1\u63a7
-mms_ip_monitor=MMS\u534f\u8baeIP\u7ba1\u63a7
+mms_ip_control=MMS\u534f\u8baeIP\u7ba1\u63a7
-rtsp_ip_monitor=RTSP\u534f\u8baeIP\u7ba1\u63a7
+rtsp_ip_control=RTSP\u534f\u8baeIP\u7ba1\u63a7
-rtmp_ip_monitor=RTMP\u534f\u8baeIP\u7ba1\u63a7
+rtmp_ip_control=RTMP\u534f\u8baeIP\u7ba1\u63a7
 examine_manage=\u5ba1\u6838\u7ba1\u7406
 audit_manage=\u5ba1\u8ba1\u7ba1\u7406
 log_search=\u65e5\u5fd7\u68c0\u7d22
@@ -137,6 +137,10 @@ begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
 special_task=\u4e13\u9879\u4efb\u52a1
+cancel_approved=\u914d\u7f6e\u53d6\u6d88
+task_name=\u4e13\u9879\u540d\u79f0
+task_org=\u62a5\u9001\u5355\u4f4d
+task_time=\u62a5\u9001\u65f6\u95f4
 #==========laihan end=====================
 
 #==========message begin=====================
@@ -156,6 +160,17 @@ turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762
 login_timeout=\u672a\u767b\u5f55\u6216\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55,\u8c22\u8c22!
 captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
 enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801
+input=\u8bf7\u8f93\u5165
+input_title=\u8bf7\u8f93\u5165\u6807\u9898
+all_states=\u6240\u6709\u72b6\u6001
+filter=\u7b5b\u9009
+to=\u5230
+reset=\u91cd\u7f6e
+info=\u63d0\u793a
+has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
+hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
+check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
+one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/webapp/WEB-INF/include/form/basicInfo.jsp

@@ -5,7 +5,7 @@
 <div class="row">
    <div class="col-md-6">
        <div class="form-group">
-           <label class="control-label col-md-3"><spring:message code="letter"/></label>
+           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
            <div class="col-md-6">
                <select name="requestId" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
                	<c:forEach items="${requestInfos}" var="requestInfo">

src/main/webapp/WEB-INF/include/form/complexInfo.jsp

@@ -4,36 +4,39 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
+            <div for="cfgDesc"></div>
         </div>
     </div>
     
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="match_area"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <input class="form-control" type="text" name="district" value="${_cfg.district}">
             </div>
+            <div for="district"></div>
         </div>
     </div>
 </div>
 <div class="row">
 	<div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="key_word"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
             </div>
+            <div for="keywords"></div>
         </div>
     </div>
 
 	<%-- <div class="col-md-6">
 	    <div class="form-group ">
 	            <label class="control-label col-md-3">管控类型</label>
-	            <div class="col-md-8">
+	            <div class="col-md-6">
             	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
             	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
             	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
@@ -48,8 +51,8 @@
     </div> --%>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
@@ -62,14 +65,15 @@
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
+            <div for="isAreaEffective"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
@@ -81,12 +85,13 @@
             		><spring:message code="null"/>
             	</label>
             </div>
+            <div for="isAreaEffective"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="match_method"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
 					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
@@ -94,14 +99,15 @@
 					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
 				</select>
             </div>
+            <div for="matchMethod"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
 					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
@@ -113,7 +119,7 @@
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
         </div>

src/main/webapp/WEB-INF/include/form/ipInfo.jsp

@@ -4,7 +4,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
@@ -13,7 +13,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="ip_type"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
             <div class="col-md-6">
             	 <select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
@@ -28,7 +28,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="client_ip"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
             </div>
@@ -37,7 +37,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="client_address_mask"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_address_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
             </div>
@@ -48,7 +48,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="client_port"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
             </div>
@@ -57,7 +57,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="client_port_mask"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
             </div>
@@ -68,7 +68,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="server_ip"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
             </div>
@@ -77,7 +77,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="server_address_mask"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_address_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
             </div>
@@ -88,7 +88,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="server_port"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
             </div>
@@ -97,7 +97,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="server_port_mask"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
             </div>
@@ -108,7 +108,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="direction"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
             <div class="col-md-6">
             	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
@@ -121,7 +121,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="protocol"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
             <div class="col-md-6">
             	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
@@ -163,7 +163,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
             <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"

src/main/webapp/WEB-INF/include/form/stringInfo.jsp

@@ -4,42 +4,45 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
+            <div for="cfgDesc"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="key_word"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <input class="form-control" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
             </div>
+            <div for="cfgKeywords"></div>
         </div>
     </div>
 </div>
 <div class="row">
 	<div class="col-md-6">
 	    <div class="form-group ">
-	            <label class="control-label col-md-3"><spring:message code="block_type"/></label>
+	        <label class="control-label col-md-3"><font color="red">*</font><spring:message code="block_type"/></label>
-	            <div class="col-md-8">
+	        <div class="col-md-6">
-            	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
+            	<select name="action" class="selectpicker select2 form-control" readonly="readonly">
             	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> ><spring:message code="block"/></option>                       
             	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>                     
             	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> ><spring:message code="block_white_list"/></option>            
             	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> ><spring:message code="monitor_white_list"/></option>          
             	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> ><spring:message code="block_monitor_white_list"/></option>
             	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> ><spring:message code="grey_list"/></option>                   
-            	 </select>
+            	</select>
                  <%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
-            	</div>
+            </div>
+            <div for="action"></div>
 	    </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
@@ -52,14 +55,15 @@
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
+            <div for="isAreaEffective"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
@@ -71,12 +75,13 @@
             		><spring:message code="null"/>
             	</label>
             </div>
+            <div for="exprType"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="match_method"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
 					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
 					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
@@ -84,28 +89,32 @@
 					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
 				</select>
             </div>
+            <div for="matchMethod"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
 					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
 					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
 				</select>
             </div>
+            <div for="isHexbin"></div>
         </div>
+        
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
+            <div for="areaEffectiveIds"></div>
         </div>
     </div>
 </div>

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -0,0 +1,136 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+<%@ attribute name="label" type="java.lang.String" required="false"%>
+<c:choose>
+	<c:when test="${label eq 'delete'}">
+		<button class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-trash"> <spring:message code="delete"/></i>
+		</button>
+	</c:when>
+
+	<c:when test="${label eq 'approved'}">
+		<a href="javascript:void(0);" onclick="passOpt('${url}')"><i class="fa fa-check"></i> <spring:message code="approved"/></a>
+	</c:when>
+	<c:when test="${label eq 'unapproved'}">
+		<a href="javascript:void(0);" onclick="noPassOpt('${url}')"><i class="fa fa-remove"></i> <spring:message code="unapproved"/></a>
+	</c:when>
+	<c:when test="${label eq 'cancelPass'}">
+		<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
+	</c:when>
+</c:choose>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
+<script type="text/javascript">
+$(document).ready(function() {
+    $('#${id} thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+    	  $('#${id} tbody tr td input.i-checks').iCheck('check');
+    	});
+
+    $('#${id} thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+    	  $('#${id} tbody tr td input.i-checks').iCheck('uncheck');
+    	});
+});
+//删除
+function del(url){
+	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//通过
+function passOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//未通过
+function noPassOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//配置取消
+function cancelPassOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			doAll(checkboxes,url);
+			}else{
+				top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
+				return;
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+	function doAll(checkboxes,url){
+		// var url = $(this).attr('data-url');
+		  var str="";
+		  var ids="";
+		  checkboxes.each(function(){
+		    if(true == $(this).is(':checked')){
+		      str+=$(this).attr("id")+",";
+		    }
+		  });
+		  if(str.substr(str.length-1)== ','){
+		    ids = str.substr(0,str.length-1);
+		  }
+		  if(ids == ""){
+			  //top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+			  top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+			return;
+		  }
+			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
+				
+				if(v=="ok"){
+					window.location = url+"?ids="+ids;
+					//$("#searchForm").submit();
+				}
+			},{buttonsFocus:1});
+			top.$('.jbox-body .jbox-icon').css('top','55px');
+
+	}
+	//验证选择的配置，是否有审核通过的
+	function validatePass(checkboxes){
+		var flag = false;
+		$(checkboxes).filter(":checked").each(function(){
+			if($(this).val()==1){
+				flag = true;
+				return;
+			}		 	
+		});
+		return flag;
+	}
+</script>

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

@@ -0,0 +1,113 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>专项任务</title>
+
+</head>
+<body>
+
+<div class="page-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+				<div class="portlet-title">
+					<div class="caption">
+						<i class="fa fa-gift"></i><c:if test="${not empty taskInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty taskInfo.id}"><spring:message code="add"/></c:if></div>
+				</div>
+				
+				<div class="portlet-body form">
+					<!-- BEGIN FORM-->
+					<form:form action="${ctx}/basics/taskInfo/saveOrUpdate" modelAttribute="taskInfo" class="form-horizontal" id="inputForm" method="post" >
+					<sys:message content="${message}"/>
+					<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>
+								<div class="col-md-4">
+									<input type="text" class="form-control" 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>
+								<div class="col-md-4">
+									<input type="text" class="form-control" 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>
+								<div class="col-md-4">
+									<input id="taskTime" name="taskTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
+									value="<fmt:formatDate value="${taskInfo.taskTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+								</div>
+							</div>
+							<div class="form-group last">
+								<label class="col-md-3 control-label"><th><spring:message code="desc"/>:</label>
+								<div class="col-md-4">
+									<input type="text" class="form-control" name="taskDesc" value="${taskInfo.taskDesc}">
+								</div>
+							</div>
+						</div>
+						<div class="form-actions">
+							<div class="row">
+								<div class="col-md-offset-3 col-md-9">
+									<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
+									<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
+								</div>
+							</div>
+						</div>
+					</form:form>
+					<!-- END FORM-->
+				</div>
+				
+			</div>
+		</div>
+	</div>
+</div>
+<style>
+	.input-medium {
+    width: 200px !important;
+}
+	.Wdate {
+	border: #c2cad8 1px solid;
+    height: 34px;
+}
+	
+</style>
+<script type="text/javascript">
+		 $(document).ready(function() {
+	 		
+			$("#inputForm").validate({
+				rules: {
+					taskName: {
+						required: true,
+					},
+					taskOrg: {
+						required: true,
+					},
+					taskTime: {
+						required: true,
+					},
+					
+				},
+				messages: {
+					taskName: {
+						required: '<spring:message code="required"/>',
+					},
+					taskOrg: {
+						required: '<spring:message code="required"/>',
+					},
+					taskTime: {
+						required: '<spring:message code="required"/>',
+					},
+				},
+				submitHandler: function(form){
+					//loading('onloading...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+			});
+		});  
+	</script>
+</body>
+</html>

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

@@ -0,0 +1,267 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>专项任务</title>
+
+</head>
+
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		<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>
+	
+	<h3 class="page-title">
+		<spring:message code="special_task"></spring:message>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+	
+				<div class="portlet-body">
+
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="taskInfo" action="${ctx}/basics/taskInfo/list" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+									
+									<div class="pull-left">
+										<form:select path="isAudit" class="selectpicker select2 input-small" >
+											<form:option value=""><spring:message code="all_states"/></form:option>
+											<form:option value="0"><spring:message code="created"></spring:message></form:option>
+											<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										</form:select>
+									</div>
+									
+									<div class="pull-left">	
+										<div class="input-group">
+                                            <div class="input-group-btn">
+												<input id="taskName" name="taskName" class="form-control input-medium" placeholder=<spring:message code="input_title"/> type="text" value="${taskInfo.taskName }">
+                                            </div>
+                                            
+                                            <div class="input-group-btn">
+                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
+                                            </div>
+                                            
+                                        </div>
+	                               </div>
+	                                
+	                               <div class="pull-left">
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+									
+                                        <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> -->
+                                        <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>
+                                                <i class="fa fa-angle-down"></i>
+                                            </button>
+                                            <ul class="dropdown-menu pull-right">
+                                                <li><sys:delRow url="${ctx}/basics/taskInfo/taskExamine" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/taskInfo/taskExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
+                                            </ul>
+                                        </div>
+                                    </div>
+							
+								
+							</div>
+							<!-- /搜索内容与操作按钮栏-->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-6">
+											<div class="pull-left">
+												<label><spring:message code="task_time"/>：</label>
+											</div>
+											<div class="pull-left">
+												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
+												value="<fmt:formatDate value="${taskInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											</div>
+											<div class="pull-left">
+												<label><spring:message code="to"/></label>
+											</div>
+											<div class="pull-left">
+												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${taskInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											</div>
+											
+									</div>
+							
+									<div class="col-md-6">
+										<div class="pull-left">
+											<label><spring:message code="operate_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${taskInfo.dobeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label><spring:message code="to"/></label>
+										</div>
+										<div class="pull-left">
+											<input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${taskInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+										</div>
+									</div>
+								</div>
+								
+								<h5 class="page-header"></h5>
+								<div class="row">
+									
+									<div class="pull-left">
+										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										<button type="button" class="btn btn-default" onclick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									</div>
+							
+								</div>
+							</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
+						
+						</form:form>
+
+					</div>
+
+					<!-- <div class="table-responsive"> -->
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th><spring:message code="seq"></spring:message></th>
+									<th><spring:message code="task_name"></spring:message></th>
+									<th><spring:message code="task_org"></spring:message></th>
+									<th><spring:message code="task_time"></spring:message></th>
+									<th><spring:message code="state"></spring:message></th>
+									<th><spring:message code="operator"></spring:message></th>
+									<th><spring:message code="operate_time"></spring:message></th>
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="taskInfo">
+								<tr>
+									<td><input type="checkbox" class="i-checks" id="${taskInfo.id}" value="${taskInfo.isAudit}"></td>
+									<td>${taskInfo.id }</td>
+									<td>${taskInfo.taskName }</td>
+									<td>${taskInfo.taskOrg }</td>
+									<td><fmt:formatDate value="${taskInfo.taskTime }" pattern="yyyy-MM-dd"/></td>
+									<td>
+										<c:choose>
+											<c:when test="${taskInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${taskInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td>${taskInfo.creatorName }</td>
+									<td>
+									<!-- 编辑时间为空则显示创建时间 -->
+									<c:choose>
+										<c:when test="${empty taskInfo.editTime}">
+											<fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/>
+										</c:when>
+										<c:otherwise>
+											<fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/>
+										</c:otherwise>
+									</c:choose>
+									</td>
+								</tr>
+							</c:forEach>
+					
+							</tbody>
+						</table>
+						<div class="page">${page}</div>	
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+
+<script>
+ 	$(document).ready(function() {
+ 		
+		if("${taskInfo.taskName}"){
+			$("#intype").val("${taskInfo.taskName}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/>"+$("#seltype").find("option:selected").text());
+		}
+ 		//筛选功能初始化
+ 		filterActionInit();
+ 		
+		$("#isAudit").change(function(){
+			page();
+		});
+		
+		$("#taskName").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='task_name'/>");
+		//全选及取消
+		$("#checkAll").change(function(){
+			if($("#checkAll").prop("checked")){
+				$("input.i-checks").prop("checked",true);
+			}else{
+				$("input.i-checks").prop("checked",false);
+			}
+		});
+		
+ 	});
+ 	
+ 	
+ 	function resetx(){
+//  		$("#searchForm").reset();
+ 		$(':input','#searchForm')
+ 		.not(':button,:submit,:reset,:hidden')
+ 		.val('')
+ 		.removeAttr('checked')
+ 		.removeAttr('selected');
+ 	}
+ 	
+ 	
+	//查询
+ 	function page(n,s){
+		
+		$("#pageNo").val(n);
+		$("#pageSize").val(s);
+		$("#searchForm").attr("action","${ctx}/basics/taskInfo/list");
+		$("#searchForm").submit();
+		return false;
+	}
+	//编辑
+	function edit(){
+		var cked = $('tbody tr td input.i-checks:checkbox:checked');
+		if(cked.val()==1){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+		}
+		if(cked.length==1){
+			window.location = "${ctx}/basics/taskInfo/form?id="+cked.attr("id");
+		}else{
+			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+			return;
+		}
+	}
+
+</script>
+
+</body>
+</html>

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

@@ -28,6 +28,62 @@ $(function(){
 	$("#cancel").on("click",function(){
 		window.history.back();
 	});
+	$("#cfgFrom").validate({
+		rules: {
+			'cfgDesc':{
+				required:true
+			},
+			'keywords':{
+				required:true
+			},
+			'district':{
+				required:true
+			},
+			'isAreaEffective':{
+				required:true
+			},
+			'exprType':{
+				required:true
+			},
+			'matchMethod':{
+				required:true
+			},
+			'requestId': {
+				required: true,
+			}
+		},
+		messages: {
+			'cfgDesc':{
+				required:'<spring:message code="required"/>'
+			},
+			'keywords':{
+				required:'<spring:message code="required"/>'
+			},
+			'district':{
+				required:'<spring:message code="required"/>'
+			},
+			'isAreaEffective':{
+				required:'<spring:message code="required"/>'
+			},
+			'exprType':{
+				required:'<spring:message code="required"/>'
+			},
+			'matchMethod':{
+				required:'<spring:message code="required"/>'
+			},
+			'requestId': {
+				required: '<spring:message code="required"/>'
+			}
+		},
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			//loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
 });
 </script>
 </head>

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

@@ -21,8 +21,22 @@
 </c:choose>
 <script>
  	$(document).ready(function() {
-		
+ 		//筛选功能初始化
-		
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#keywords").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
  	});
 	//查询
  	function page(n,s){
@@ -37,7 +51,7 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
+		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
@@ -46,59 +60,165 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
+		<small><spring:message code="date_list"/></small>
 	</h3>
-
+	<h5 class="page-header"></h5>
 	<div class="row">
 		<div class="col-md-12">
-			<div class="portlet box blue">
+			<div class="portlet">
-				<div class="portlet-title">
-					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
-					</div>
-					<div class="tools">
-						<!-- <a href="javascript:;" class="collapse" data-original-title=""
-							title=""> </a> <a href="#portlet-config" data-toggle="modal"
-							class="config" data-original-title="" title=""> </a> <a
-							href="javascript:;" class="reload" data-original-title=""
-							title=""> </a> <a href="javascript:;" class="remove"
-							data-original-title="" title=""> </a> -->
-					</div>
-				</div>
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list" method="post" class="form-search">
+							<input id="cfgName" name="cfgName" type="hidden" value="${cfgName}"/>
+							<input id="action" name="action" type="hidden" value="${action}"/>
+							<input id="serviceId" name="serviceId" type="hidden" value="${serviceId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
+								<div class="pull-left">
-									<form:option value=""><spring:message code="select"/></form:option>
+									<c:set var="state"><spring:message code='state'/></c:set>
-									<form:option value="0"><spring:message code="created"></spring:message></form:option>
+									<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
-									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
-									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
-									<form:option value="3"><spring:message code="cancel"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
-								</form:select>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-								<spring:message code="request_number"/> :
+										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
+									</form:select>
-									<form:option value=""><spring:message code="select"/></form:option>
+								</div>
-									<c:forEach items="${requestInfos}" var="requestInfo" >
+								<div class="pull-left">
-										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									</c:forEach>
+									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
-								</form:select>
+										<c:forEach items="${requestInfos}" var="requestInfo" >
-								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
+											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="flI18n"><spring:message code='type'/></c:set>
+									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${fls}" var="fl" >
+											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${xzs}" var="xz" >
+											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="labelI18n"><spring:message code='label'/></c:set>
+									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${lables}" var="lable" >
+											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
-								</button>
+								</button> --%>
-								<spring:message code="sort"/> : 
+								<div class="pull-left">
-								<select name="orderBy" class="selectpicker select2">
+								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
-									<option value=""><spring:message code="select"/></option>
+									<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
-									<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
+										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
-									<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
+										<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
-									<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
+										<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
-									<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
+										<option value="${page.alias}.edit_time desc" <c:if test="${fn:contains(page.orderBy , 'edit_time desc') }">selected</c:if> ><spring:message code="editTime_desc"/></option>
-									<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
+										<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
-									<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
+										<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
-								</select>
+									</select>
+								</div>
+								<div class="pull-left">
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 </div>
 							</div>
+							<!-- 搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-6">
+											<div class="pull-left col-md-2">
+												<label><spring:message code="config_time"/>：</label>
+											</div>
+											<div class="pull-left">
+												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											<div class="pull-left">
+												<label>到</label>
+											</div>
+											<div class="pull-left">
+												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											
+									</div>
+							
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="edit_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="audit_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="key_word"/>：</label>
+										</div>
+										<div class="pull-left">
+											<form:input path="keywords" class="form-control input-small"/>
+										</div>
+									</div>
+								</div>
+								<h5 class="page-header"></h5>
+								<div class="row">
+									
+									<div class="pull-left">
+										<button type="button" class="btn blue" onclick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									</div>
+							
+								</div>
+							</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
 					<div class="table-responsive">
@@ -130,9 +250,9 @@
 								</tr>
 							</thead>
 							<tbody>
-								<c:forEach items="${page.list }" var="cfg">
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td>${cfg.cfgId }</td>
+									<td>${status.index+1 }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.district }</td>
 									<td>${cfg.keywords }</td>

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

@@ -85,12 +85,15 @@ $(function(){
 			},
 			srcIp: {
 				required: true,
+				checkIp: true
 			},
 			srcIpMask: {
 				required: true,
 			},
 			srcPort: {
 				required: true,
+				max: 65535,
+				min: 0
 			},
 			srcPortMask: {
 				required: true,
@@ -103,6 +106,8 @@ $(function(){
 			},
 			dstPort: {
 				required: true,
+				max: 65535,
+				min: 0
 			},
 			dstPortMask: {
 				required: true,
@@ -137,6 +142,8 @@ $(function(){
 			},
 			srcPort: {
 				required: '<spring:message code="required"/>',
+				max: '范围0-65535!',
+				min: '范围0-65535!'
 			},
 			srcPortMask: {
 				required: '<spring:message code="required"/>',
@@ -149,6 +156,8 @@ $(function(){
 			},
 			dstPort: {
 				required: '<spring:message code="required"/>',
+				max: '范围0-65535!',
+				min: '范围0-65535!'
 			},
 			dstPortMask: {
 				required: '<spring:message code="required"/>',
@@ -175,6 +184,23 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
+	
+	$.validator.addMethod(
+		"checkIp", 
+		function(value, element, params) {
+			var checkIp;
+			if ($("[name=ipType]").val() == 4) {
+				//checkIp = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+				checkIp = /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/;
+			//} else if ($("[name=ipType]").val() == 6) {
+			//	checkIp = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/;
+			} else {
+				checkIp = /\S+/;
+			}
+			return this.optional(element) || (checkIp.test(value) && (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256));
+		}, 
+		"请输入正确的IP!"
+	);
 });
 </script>
 </head>

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

@@ -26,13 +26,14 @@
 		$("#isAudit").change(function(){
 			page();
 		});
-		//rest
+		//reset
 		$("#resetBtn").on("click",function(){
 			$("select.selectpicker").each(function(){
 				$(this).selectpicker('val',$(this).find('option:first').val());
 				$(this).find("option").attr("selected",false);
 				$(this).find("option:first").attr("selected",true);
 			});
+			$(".Wdate").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
 	});
@@ -61,7 +62,7 @@
 		<spring:message code="${cfgName}"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
-
+	<h5 class="page-header"></h5>
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet">

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

@@ -13,7 +13,7 @@
 		<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"></spring:message><spring:message code="requestInfo"></spring:message></button>
+			<spring:message code="add"/></button>
 	</div>
 	
 	<h3 class="page-title">
@@ -41,7 +41,7 @@
 									
 									<div class="pull-left">
 										<form:select path="isAudit" class="selectpicker select2 input-small" >
-											<form:option value="">所有状态</form:option>
+											<form:option value=""><spring:message code="all_states"/></form:option>
 											<form:option value="0"><spring:message code="created"></spring:message></form:option>
 											<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										</form:select>
@@ -50,14 +50,14 @@
 									<div class="pull-left">	
 										<div class="input-group">
                                             <div class="input-group-btn">
-                                                <select id="seltype" class="selectpicker select2 input-small" >
+                                                <form:select path="seltype" class="selectpicker select2 input-small" >
-													<option value="requestTitle"><spring:message code="title"></spring:message></option>
+													<form:option value="requestTitle"><spring:message code="title"></spring:message></form:option>
-													<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
+													<form:option value="requestNumber"><spring:message code="request_number"></spring:message></form:option>
-													<option value="requestContent"><spring:message code="content"></spring:message></option>
+													<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
-												</select>
+												</form:select>
                                             </div>
                                             
-                                            <input id="intype" class="form-control input-medium" placeholder="请输入标题" type="text">
+                                            <input id="intype" class="form-control input-medium" type="text" value="">
                                             
                                             <div class="input-group-btn">
                                               	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
@@ -65,28 +65,27 @@
                                             
                                         </div>
 	                               </div>
-	                               
+	                                
 	                               <div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
 									<div class="pull-right">
 									
-                                        <button type="button" class="btn btn-default">
+                                        <button type="button" class="btn btn-default" onclick="edit()">
-                                            <i class="fa fa-edit"></i> 编辑</button>
+                                            <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
-                                        <button type="button" class="btn btn-default">
+                                            <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
-                                            <i class="fa fa-trash"></i> 删除</button>
                                       <!--   <button type="button" class="btn btn-default">
                                             <i class="fa fa-download"></i> 导出</button> -->
                                         <div class="btn-group">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                                <i class="fa fa-wrench"></i> 审核
+                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
                                                 <i class="fa fa-angle-down"></i>
                                             </button>
                                             <ul class="dropdown-menu pull-right">
-                                                <li><a href="javascript:void(0);" onclick="passOpt()"><i class="fa fa-check"></i> 通过</a></li>
+                                                <li><sys:delRow url="${ctx}/cfg/request/requestExamine" id="contentTable" label="approved"></sys:delRow></li>
-												<li><a href="javascript:void(0);" onclick="noPassOpt()"><i class="fa fa-remove"></i> 未通过</a></li>
+												<li><sys:delRow url="${ctx}/cfg/request/requestExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><a href="javascript:void(0);" onclick="cancelPassOpt()"><i class="fa fa-undo"></i> 配置取消</a></li>            
+												<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
                         
@@ -109,14 +108,14 @@
 								
 									<div class="col-md-6">
 											<div class="pull-left">
-												<label>来函时间：</label>
+												<label><spring:message code="request_time"/>：</label>
 											</div>
 											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
 												value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 											</div>
 											<div class="pull-left">
-												<label>到</label>
+												<label><spring:message code="to"/></label>
 											</div>
 											<div class="pull-left">
 												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -127,18 +126,18 @@
 							
 									<div class="col-md-6">
 										<div class="pull-left">
-											<label>操作时间：</label>
+											<label><spring:message code="operate_time"/>：</label>
 										</div>
 										<div class="pull-left">
-											<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${requestInfo.dobeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 										</div>
 										<div class="pull-left">
-											<label>到</label>
+											<label><spring:message code="to"/></label>
 										</div>
 										<div class="pull-left">
-											<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											<input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${requestInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 										</div>
 									</div>
 								</div>
@@ -147,8 +146,8 @@
 								<div class="row">
 									
 									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button" class="btn btn-default" onclick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 									</div>
 							
 								</div>
@@ -170,7 +169,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed">
 							<thead>
 								<tr>
-									<th><input type="checkbox" class="ckboxs"></th>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th><spring:message code="seq"></spring:message></th>
 									<th><spring:message code="request_number"></spring:message></th>
 									<th><spring:message code="request_organization"></spring:message></th>
@@ -181,13 +180,13 @@
 									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
 									<th><spring:message code="special_task"></spring:message></th>
-									<th><spring:message code="operation"></spring:message></th>
+<%-- 									<th><spring:message code="operation"></spring:message></th> --%>
 								</tr>
 							</thead>
 							<tbody>
 							<c:forEach items="${page.list}" var="requestInfo">
 								<tr>
-									<td><input type="checkbox" class="ckbox"></td>
+									<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
 									<td>${requestInfo.id }</td>
 									<td>${requestInfo.requestNumber }</td>
 									<td>${requestInfo.requestOrg }</td>
@@ -214,30 +213,6 @@
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
-									<td>
-										<%-- <div class="btn-group btn-xs">
-									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
-									      <ul class="dropdown-menu btn-xs">
-								      <!-- 审核未通过可修改 -->
-								        	<c:choose>
-									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
-									        	</c:when>
-									        	<c:when test="${requestInfo.isAudit ne '2'}">
-											        <li><a href="${ctx}/cfg/request/requestExamineNo?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="unapproved"></spring:message></a></li>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:when>
-									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:otherwise>
-								        	</c:choose>
-									      </ul>
-									    </div> --%>
-									</td>
 								</tr>
 							</c:forEach>
 					
@@ -252,7 +227,18 @@
 
 <script>
  	$(document).ready(function() {
- 		
+ 	    
+		if("${requestInfo.requestTitle}"){
+			$("#intype").val("${requestInfo.requestTitle}");
+		}
+		if("${requestInfo.requestNumber}"){
+			$("#intype").val("${requestInfo.requestNumber}");
+		}
+		if("${requestInfo.requestContent}"){
+			$("#intype").val("${requestInfo.requestContent}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
  		//筛选功能初始化
  		filterActionInit();
  		
@@ -261,28 +247,57 @@
 		});
 		
 		$("#seltype").change(function(){
-			$("#intype").attr("placeholder","请输入"+$(this).find("option:selected").text());
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
 		});
+		//全选及取消
+		$("#checkAll").change(function(){
+			if($("#checkAll").prop("checked")){
+				$("input.i-checks").prop("checked",true);
+			}else{
+				$("input.i-checks").prop("checked",false);
+			}
+		});
+		
+	
 		
  	});
  	
  	
- 	function reset(){
+ 	function resetx(){
- 		$("#searchForm").reset();
+//  		$("#searchForm").reset();
+ 		$(':input','#searchForm')
+ 		.not(':button,:submit,:reset,:hidden')
+ 		.val('')
+ 		.removeAttr('checked')
+ 		.removeAttr('selected');
  	}
  	
  	
 	//查询
  	function page(n,s){
  		$("#intype").attr("name",$("#seltype").val());
-
+		
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
 		$("#searchForm").attr("action","${ctx}/cfg/request/list");
 		$("#searchForm").submit();
 		return false;
 	}
-	 
+	//编辑
+	function edit(){
+		var cked = $('tbody tr td input.i-checks:checkbox:checked');
+		if(cked.val()==1){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+		}
+		if(cked.length==1){
+			window.location = "${ctx}/cfg/request/form?id="+cked.attr("id");
+		}else{
+			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+			return;
+		}
+	}
+
 </script>
 
 </body>

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

@@ -21,6 +21,65 @@
 </c:choose>
 <script type="text/javascript">
 $(function(){
+	$("#cfgFrom").validate({
+		rules: {
+			'cfgDesc':{
+				required:true
+			},
+			'cfgKeywords':{
+				required:true
+			},
+			'action':{
+				required:true
+			},
+			'isAreaEffective':{
+				required:true
+			},
+			'exprType':{
+				required:true
+			},
+			'matchMethod':{
+				required:true
+			},
+			'isHexbin':{
+				required:true
+			},
+			'requestId': {
+				required: true,
+			}
+		},
+		messages: {
+			'cfgDesc':{
+				required:'<spring:message code="required"/>'
+			},
+			'cfgKeywords':{
+				required:'<spring:message code="required"/>'
+			},
+			'action':{
+				required:'<spring:message code="required"/>'
+			},
+			'isAreaEffective':{
+				required:'<spring:message code="required"/>'
+			},
+			'exprType':{
+				required:'<spring:message code="required"/>'
+			},
+			'matchMethod':{
+				required:'<spring:message code="required"/>'
+			},
+			'isHexbin':{
+				required:'<spring:message code="required"/>'
+			}
+		},
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			//loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
 	$("#save").on("click",function(){
 		$("#cfgFrom").attr("action","${ctx}/cfg/string/saveOrUpdateCfg");
 		$("#save").submit();

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

@@ -21,8 +21,22 @@
 </c:choose>
 <script>
  	$(document).ready(function() {
-		
+ 		//筛选功能初始化
-		
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$("#cfgKeywords").attr("value",'');
+			$(".Wdate").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
  	});
 	//查询
  	function page(n,s){
@@ -37,68 +51,174 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
+		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
 		</c:if>
 	</div>
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
+		<small><spring:message code="date_list"/></small>
 	</h3>
-
+	<h5 class="page-header"></h5>
 	<div class="row">
 		<div class="col-md-12">
-			<div class="portlet box blue">
+			<div class="portlet">
-				<div class="portlet-title">
-					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
-					</div>
-					<div class="tools">
-						<!-- <a href="javascript:;" class="collapse" data-original-title=""
-							title=""> </a> <a href="#portlet-config" data-toggle="modal"
-							class="config" data-original-title="" title=""> </a> <a
-							href="javascript:;" class="reload" data-original-title=""
-							title=""> </a> <a href="javascript:;" class="remove"
-							data-original-title="" title=""> </a> -->
-					</div>
-				</div>
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/list" method="post" class="form-search">
+							<input id="cfgName" name="cfgName" type="hidden" value="${cfgName}"/>
+							<input id="action" name="action" type="hidden" value="${action}"/>
+							<input id="serviceId" name="serviceId" type="hidden" value="${serviceId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
+								<div class="pull-left">
-									<form:option value=""></form:option>
+									<c:set var="state"><spring:message code='state'/></c:set>
-									<form:option value="0"><spring:message code="created"></spring:message></form:option>
+									<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
-									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
-									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
-									<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
-								</form:select>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-								<spring:message code="request_number"/> :
+										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
+									</form:select>
-									<form:option value=""><spring:message code="select"/></form:option>
+								</div>
-									<c:forEach items="${requestInfos}" var="requestInfo" >
+								<div class="pull-left">
-										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									</c:forEach>
+									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
-								</form:select>
+										<c:forEach items="${requestInfos}" var="requestInfo" >
-								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
+											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="flI18n"><spring:message code='type'/></c:set>
+									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${fls}" var="fl" >
+											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${xzs}" var="xz" >
+											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="labelI18n"><spring:message code='label'/></c:set>
+									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${lables}" var="lable" >
+											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
-								</button>
+								</button> --%>
-								<spring:message code="sort"/> : 
+								<div class="pull-left">
-								<select name="orderBy" class="selectpicker select2">
+								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
-									<option value=""><spring:message code="select"/></option>
+									<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
-									<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
+										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
-									<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
+										<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
-									<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
+										<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
-									<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
+										<option value="${page.alias}.edit_time desc" <c:if test="${fn:contains(page.orderBy , 'edit_time desc') }">selected</c:if> ><spring:message code="editTime_desc"/></option>
-									<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
+										<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
-									<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
+										<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
-								</select>
+									</select>
+								</div>
+								<div class="pull-left">
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 </div>
 							</div>
+							<!-- 搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-6">
+											<div class="pull-left col-md-2">
+												<label><spring:message code="config_time"/>：</label>
+											</div>
+											<div class="pull-left">
+												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											<div class="pull-left">
+												<label>到</label>
+											</div>
+											<div class="pull-left">
+												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											
+									</div>
+							
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="edit_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="audit_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="key_word"/>：</label>
+										</div>
+										<div class="pull-left">
+											<form:input path="cfgKeywords" class="form-control input-small"/>
+										</div>
+									</div>
+								</div>
+								<h5 class="page-header"></h5>
+								<div class="row">
+									
+									<div class="pull-left">
+										<button type="button" class="btn blue" onclick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									</div>
+							
+								</div>
+							</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
 					<div class="table-responsive">

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

@@ -139,8 +139,15 @@
                 
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
         		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			alertx("<spring:message code='login_timeout'/>");
+        			top.$.jBox.confirm("<spring:message code='login_timeout'/>","<spring:message code='info'/>",function(v,h,f){
-        			window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
+    				
+    				if(v=="ok"){
+    					top.location = "${pageContext.request.contextPath }";
+    				}else{
+    					top.location = "${pageContext.request.contextPath }";
+        				}
+    			},{buttonsFocus:1});
+    			top.$('.jbox-body .jbox-icon').css('top','55px');
         		}