diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java index ca89c515f..5cb20defc 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -31,7 +31,7 @@ public class TaskInfoController extends BaseController{ */ @RequestMapping(value = {"list",""}) public String list(TaskInfo taskInfo, HttpServletRequest request, HttpServletResponse response, Model model) { - Page page = taskInfoService.findTaskInfo(new Page(request, response), taskInfo); + Page page = taskInfoService.findTaskInfo(new Page(request, response,"r"), taskInfo); model.addAttribute("page", page); return "/basics/taskInfoList"; } @@ -76,7 +76,7 @@ public class TaskInfoController extends BaseController{ } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model, "save_failed"); + addMessage(redirectAttributes, "save_failed"); } return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index 0fb3745cf..c80d0e997 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -32,7 +32,7 @@ public class RequestInfoController extends BaseController{ */ @RequestMapping(value = {"list",""}) public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) { - Page page = requestInfoService.findRequestInfo(new Page(request, response), requestInfo); + Page page = requestInfoService.findRequestInfo(new Page(request, response,"r"), requestInfo); model.addAttribute("page", page); return "/cfg/requestList"; } diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index f09ed7941..ed725f25a 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -53,9 +53,9 @@ public class SpecificServiceCfgController extends BaseController { Model model) { String searchType = null; String searchContent = null; - if(specificServiceCfg.getSpecServiceId()!=null){ - searchType = "specServiceId"; - searchContent = specificServiceCfg.getSpecServiceId().toString(); + if(specificServiceCfg.getSpecServiceCode()!=null){ + searchType = "specServiceCode"; + searchContent = specificServiceCfg.getSpecServiceCode().toString(); } if(!StringUtils.isBlank(specificServiceCfg.getSpecServiceName())){ searchType = "specServiceName"; diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 1ecb56c0a..cbffe0705 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -47,32 +47,34 @@ left join sys_user u on r.editor_id=u.id left join sys_user e on r.auditor_id=e.id left join task_info t on r.task_id=t.id - where r.is_valid!=-1 and r.is_audit !=3 - + + AND r.request_title like - CONCAT('%',#{requestTitle}, '%') - - - AND r.request_content like - CONCAT('%',#{requestContent},'%') - - - AND r.request_number like - CONCAT('%',#{requestNumber},'%') - - - AND r.is_audit=${isAudit} - - - AND r.is_valid=${isValid} - - - AND r.request_time between #{beginDate} and #{endDate} - - - AND r.edit_time between #{dobeginDate} and #{doendDate} - - + CONCAT('%',#{requestTitle}, '%') + + + AND r.request_content like + CONCAT('%',#{requestContent},'%') + + + AND r.request_number like + CONCAT('%',#{requestNumber},'%') + + + AND r.is_audit=${isAudit} + + + AND r.is_valid=${isValid} + + + AND r.request_time between #{beginDate} and #{endDate} + + + AND r.edit_time between #{dobeginDate} and #{doendDate} + + + ${sqlMap.dsf} + ORDER BY ${page.orderBy} diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index e64cd5a6b..19a14b3ee 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -51,20 +51,28 @@ 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 - + + + AND ${page.where} + + AND r.task_name like - CONCAT('%',#{taskName}, '%') - - - AND r.is_audit=${isAudit} - - - AND r.task_time between #{beginDate} and #{endDate} - - - AND r.edit_time between #{dobeginDate} and #{doendDate} - + CONCAT('%',#{taskName}, '%') + + + AND r.is_audit=${isAudit} + + + AND r.task_time between #{beginDate} and #{endDate} + + + AND r.edit_time between #{dobeginDate} and #{doendDate} + + + + ${sqlMap.dsf} + + ORDER BY ${page.orderBy} diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index e9cff258c..c62e0b229 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -101,7 +101,7 @@ AND spec_service_id =#{specificServiceCfg.specServiceId} - AND spec_service_id =#{specificServiceCfg.specServiceCode} + AND spec_service_code =#{specificServiceCfg.specServiceCode} AND spec_service_name like '%${specificServiceCfg.specServiceName}%' diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java index 31e7b969b..6846b0f6b 100644 --- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java +++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java @@ -25,6 +25,7 @@ public class TaskInfoService extends BaseService{ private TaskInfoDao taskInfoDao; public Page findTaskInfo(Page page, TaskInfo taskInfo) { + taskInfo.getSqlMap().put("dsf", configScopeFilter(taskInfo.getCurrentUser(),"r")); // 设置分页参数 taskInfo.setPage(page); // 执行分页查询 diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java index a772db616..42279a193 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -29,6 +29,7 @@ public class RequestInfoService extends BaseService{ private TaskInfoDao taskInfoDao; public Page findRequestInfo(Page page, RequestInfo requestInfo) { + requestInfo.getSqlMap().put("dsf", configScopeFilter(requestInfo.getCurrentUser(),"r")); // 设置分页参数 requestInfo.setPage(page); // 执行分页查询 diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 26ee673d6..d6f6cdc97 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -162,7 +162,7 @@ ssl_certificate_control=SSL Cert Control ssl_certificate_monitor=SSL Cert Monit response_header_control=Response Header Control ip_website_text_control=IP+Website Keyowrd Control -request_task=Request And Task +request_task=Request and Task realtime_report=Realtime Report #==========menu end===================== @@ -381,7 +381,7 @@ area_effect_id=Area Effective ip_type=IP Type #==========guankongbaimingdan end===================== #==========tedingfuwu begin===================== -protocol_id=Protocol ID +protocol_code=Protocol No protocol_name=Protocol Name group_id=Configuration Group ID input_protocol_id=Please enter protocol ID @@ -392,6 +392,7 @@ min_value=The minimum value should not be less than #==========tedingfuwu end===================== #==========xitongguanli begin====================== +login=Login owner_company=\u5F52\u5C5E\u516C\u53F8 company=\u516C\u53F8 owner_group=\u5F52\u5C5E\u90E8\u95E8 diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index ff552b65e..f85e145e7 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -381,7 +381,7 @@ area_effect_id=\u533A\u57DF\u751F\u6548id ip_type=IP\u7C7B\u578B #==========guankongbaimingdan end===================== #==========tedingfuwu begin===================== -protocol_id=\u534F\u8BAEID +protocol_code=\u534F\u8BAE\u53F7 protocol_name=\u534F\u8BAE\u540D\u79F0 group_id=maat\u7AEF\u914D\u7F6E\u5206\u7EC4ID input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID @@ -392,6 +392,7 @@ min_value=\u6700\u5C0F\u503C\u4E0D\u5F97\u5C0F\u4E8E #==========tedingfuwu end===================== #==========xitongguanli begin====================== +login=\u767B\u5F55 owner_company=\u5F52\u5C5E\u516C\u53F8 company=\u516C\u53F8 owner_group=\u5F52\u5C5E\u90E8\u95E8 diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp index 0a014dcd4..fe57afe01 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp @@ -9,10 +9,6 @@
- -

@@ -30,21 +26,21 @@
- +
- +
- +
- +
- +
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
@@ -84,46 +80,13 @@ diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 1e7d9d16a..3df098c95 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -9,14 +9,34 @@
+ + + + + + + + + + + + + + + + + + + + +

@@ -66,11 +86,14 @@
+ + +
+ href="javascript:;"> diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index 127f75f0d..b2fc5e784 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -23,19 +23,19 @@
- +
- +
- +
" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> @@ -48,7 +48,7 @@
- +
@@ -86,7 +86,7 @@ $("#inputForm").validate({ submitHandler: function(form){ - //loading('onloading...'); + loading('onloading...'); form.submit(); }, errorContainer: "#messageBox", diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 31061e1c7..1dac7bbbe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -9,13 +9,34 @@
+ + + + + + + + + + + + + + + + + + + - +
+

@@ -73,22 +94,26 @@
+ -
- -
    -
    • -
    • -
    • -
-
+ + +
+ +
    +
    • +
    • +
    • +
+
+ href="javascript:;"> diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index 44049db97..2954e4a83 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -42,7 +42,7 @@ logo
- + @@ -80,7 +80,6 @@

- ERROR:  

diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index 6562abf20..296038c60 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -160,12 +160,10 @@
- +