融合代码，提交本地

更新：辅助字典移动到basics目录下，
               修订数据类型条件查询无效bug，
               优化无条件分页查询代码，
               配置编码自增，用户不需手动输入（app强特征作用域功能待添加）；
               无上级，改为根节点，

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

@@ -14,10 +14,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.ComplexkeywordCfg;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

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

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 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.ServiceConfigInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.util.Constants;
@@ -378,7 +378,7 @@ public class IpCfgController extends BaseController{
 	 * @exception 
 	 * @since  1.0.0
 	 */
-	protected long getCompileId(BaseCfg cfg){
+	protected long getCompileId(){
 		return 0;
 	}
 }

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

@@ -14,10 +14,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;
 

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

@@ -1,136 +1,146 @@
-package com.nis.web.controller.configuration;
-
-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.RequestInfo;
-import com.nis.util.Constants;
-import com.nis.util.StringUtils;
-import com.nis.web.controller.BaseController;
-import com.nis.web.service.configuration.RequestInfoService;
-
-/**
- * 测试类
- *
- */
-@Controller
-@RequestMapping("${adminPath}/cfg/request")
-public class RequestInfoController extends BaseController{
-	
-	@Autowired
-	private RequestInfoService requestInfoService;
-	
-	
-	/**
-	 *来函列表
-	 */
-	@RequestMapping(value = {"list",""})
-	public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo);
-        model.addAttribute("page", page);
-        return "/cfg/requestList";
-	}
-	/**
-	 * 进入用户添加或修改页面
-	 */
-	@RequestMapping(value={"form"})
-	public String form(RequestInfo requestInfo, Model model) {
-		if(requestInfo.getId()!=null){
-			requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
-			model.addAttribute("requestInfo", requestInfo);
-		}
-		model.addAttribute("requestInfo", requestInfo);
-		return "/cfg/requestForm";
-	}
-
-	/**
-	 * 新增/修改
-	 */
-	@RequestMapping(value = "saveOrUpdate")
-	public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
-		try {
-			if(requestInfo.getId()!=null){
-				// 保存用户信息
-				logger.info(requestInfo.getId()+"修改成功");
-				requestInfoService.saveOrUpdate(requestInfo);
-				addMessage(redirectAttributes, "success");
-			}else{
-				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
-					logger.info(requestInfo.getRequestNumber()+"重复数据");
-					addMessage(model, "error");
-					return form(requestInfo, model);
-				}
-				// 保存用户信息
-				requestInfoService.saveOrUpdate(requestInfo);
-				addMessage(redirectAttributes, "success");
-				logger.info(requestInfo.getId()+"保存成功");
-			}
-		} catch (Exception e) {
-			logger.error(e.getMessage());
-			e.printStackTrace();
-			addMessage(model, "error");
-		}
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
-	}
-	
-	/**
-	 * 验证是否有效
-	 */
-	@ResponseBody
-	@RequestMapping(value = "checkRequestNumber")
-	public String checkRequestNumber(String requestNumber) {
-		if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) {
-			return "true";
-		}
-		return "false";
-	}
-
-    /**
-     * 审核
-     * @param requestInfo
-     * @param model
-     * @return
-     */
-	@RequestMapping(value = "requestExamine")
-    public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
-    	requestInfoService.requestExamine(requestInfo);
-    	addMessage(redirectAttributes, "success");
-    	return "redirect:" + adminPath + "/cfg/request/list?repage";
-    	
-    }
-	/**
-	 * 取消审核
-	 * @param requestInfo
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping(value = "requestCancelExamine")
-	public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.requestCancelExamine(requestInfo);
-		addMessage(redirectAttributes, "success");
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
-		
-	}
-	/**
-	 * 删除
-	 * @param requestInfo
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping(value = "delete")
-	public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.delete(requestInfo);
-		addMessage(redirectAttributes, "success");
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
-		
-	}
-
-}
+package com.nis.web.controller.configuration;
+
+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.RequestInfo;
+import com.nis.domain.configuration.TaskInfo;
+import com.nis.web.controller.BaseController;
+import com.nis.web.service.configuration.RequestInfoService;
+
+@Controller
+@RequestMapping("${adminPath}/cfg/request")
+public class RequestInfoController extends BaseController{
+	
+	@Autowired
+	private RequestInfoService requestInfoService;
+	
+	
+	/**
+	 *来函列表
+	 */
+	@RequestMapping(value = {"list",""})
+	public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo);
+        model.addAttribute("page", page);
+        return "/cfg/requestList";
+	}
+	/**
+	 * 进入用户添加或修改页面
+	 */
+	@RequestMapping(value={"form"})
+	public String form(RequestInfo requestInfo, Model model) {
+		TaskInfo taskInfo = new TaskInfo();
+		taskInfo.setId(requestInfo.getTaskId());
+		showTask(taskInfo,model);
+		if(requestInfo.getId()!=null){
+			requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
+			model.addAttribute("requestInfo", requestInfo);
+		}else{
+			model.addAttribute("requestInfo", requestInfo);
+		}
+		return "/cfg/requestForm";
+	}
+
+	/**
+	 * 新增/修改
+	 */
+	@RequestMapping(value = "saveOrUpdate")
+	public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
+		try {
+			if(requestInfo.getId()!=null){
+				// 保存用户信息
+				logger.info(requestInfo.getId()+"修改成功");
+				requestInfoService.saveOrUpdate(requestInfo);
+				addMessage(redirectAttributes, "success");
+			}else{
+				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
+					logger.info(requestInfo.getRequestNumber()+"重复数据");
+					addMessage(model, "error");
+					return form(requestInfo, model);
+				}
+				// 保存用户信息
+				requestInfoService.saveOrUpdate(requestInfo);
+				addMessage(redirectAttributes, "success");
+				logger.info(requestInfo.getId()+"保存成功");
+			}
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			e.printStackTrace();
+			addMessage(model, "error");
+		}
+		return "redirect:" + adminPath + "/cfg/request/list?repage";
+	}
+	
+	/**
+	 * 验证是否有效
+	 */
+	@ResponseBody
+	@RequestMapping(value = "checkRequestNumber")
+	public String checkRequestNumber(String requestNumber) {
+		if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) {
+			return "true";
+		}
+		return "false";
+	}
+
+    /**
+     * 审核
+     * @param requestInfo
+     * @param model
+     * @return
+     */
+	@RequestMapping(value = "requestExamine")
+    public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+    	requestInfoService.requestExamine(requestInfo);
+    	addMessage(redirectAttributes, "success");
+    	return "redirect:" + adminPath + "/cfg/request/list?repage";
+    	
+    }
+	/**
+	 * 取消审核
+	 * @param requestInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "requestCancelExamine")
+	public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+		requestInfoService.requestCancelExamine(requestInfo);
+		addMessage(redirectAttributes, "success");
+		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		
+	}
+	/**
+	 * 删除
+	 * @param requestInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "delete")
+	public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+		requestInfoService.delete(requestInfo);
+		addMessage(redirectAttributes, "success");
+		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		
+	}
+
+	/**
+	 * 查询专项任务
+	 * @param taskInfo
+	 * @param model
+	 */
+	public void showTask(TaskInfo taskInfo ,Model model){
+		List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
+		model.addAttribute("taskInfos", taskInfos);
+	}
+}

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

@@ -14,10 +14,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;