From 16f86ace648e219f6b76cc066852be50c97bcaf6 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 7 Mar 2018 14:30:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=A2=9E=E5=8A=A0=E6=9C=AA=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/RequestInfoController.java | 15 ++++++++++++++- .../service/configuration/RequestInfoService.java | 5 +++++ .../resources/messages/message_zh_CN.properties | 2 +- src/main/webapp/WEB-INF/views/cfg/requestList.jsp | 8 +++++++- 4 files changed, 27 insertions(+), 3 deletions(-) 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 7a945c4a8..d21b50a03 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -95,7 +95,7 @@ public class RequestInfoController extends BaseController{ } /** - * 审核 + * 审核通过 * @param requestInfo * @param model * @return @@ -107,6 +107,19 @@ public class RequestInfoController extends BaseController{ return "redirect:" + adminPath + "/cfg/request/list?repage"; } + /** + * 审核未通过 + * @param requestInfo + * @param model + * @return + */ + @RequestMapping(value = "requestExamineNo") + public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ + requestInfoService.requestExamineNo(requestInfo); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/cfg/request/list?repage"; + + } /** * 取消审核 * @param requestInfo 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 01d98d236..fe2e0f119 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -67,6 +67,11 @@ public class RequestInfoService extends BaseService{ requestInfoDao.update(requestInfo); } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void requestExamineNo(RequestInfo requestInfo){ + requestInfo.setIsAudit(2);//审核未通过 + requestInfoDao.update(requestInfo); + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) public void requestCancelExamine(RequestInfo requestInfo){ requestInfo.setIsAudit(3);//取消审核通过 int update = requestInfoDao.update(requestInfo); diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index e113d11de..4d94a35a6 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -115,7 +115,7 @@ state=\u72b6\u6001 created=\u672a\u5ba1\u6838 examine=\u5ba1\u6838 unapproved=\u672a\u901a\u8fc7 -approved=\u5df2\u901a\u8fc7 +approved=\u901a\u8fc7 title=\u6807\u9898 request_time=\u6765\u51fd\u65f6\u95f4 operate_time=\u64cd\u4f5c\u65f6\u95f4 diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 93310dae3..2b10bc8cd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -122,8 +122,14 @@
  • ', this.href)">
    •  + +
  • ', this.href)">
    • +
  • ', this.href)">
    • +
  • ', this.href)">
    • +
  • ', this.href)">
    • +     -
  • ', this.href)">
    • +
  • ', this.href)">
  • ', this.href)">
  • ', this.href)">
    •  From e4dadc9c6e0c844a5419e06f8f1d38525f9ae6c5 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 7 Mar 2018 15:54:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=8B=E5=88=86=E7=B1=BB=E6=80=A7=E8=B4=A8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 10 ++++---- .../messages/message_zh_CN.properties | 9 +++---- .../WEB-INF/views/basics/serviceDictForm.jsp | 20 ++++++++-------- .../WEB-INF/views/basics/serviceDictInfo.jsp | 18 +++++++------- .../WEB-INF/views/basics/serviceDictList.jsp | 24 +++++++++---------- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 1579ccb35..b47072900 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -97,14 +97,14 @@ service_dict_id=servicedictid item_type=itemtype item_code=itemcode item_value=itemvalue -desc=desc +desc=description parent_id=parentid -is_leaf=isleaf -is_valid=isvalid -creator_id=creatorid +is_leaf=whether subnode +is_valid=whether valid create_time=createtime -editor_id=editorid edit_time=edittime +superior_config=superior configuration +config_content=configuration content #============yewu end====================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4d94a35a6..ea4251d96 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -95,16 +95,17 @@ system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406 #==========yewu zidian begin===================== service_dict_id=\u5b57\u5178ID item_type=\u6570\u636e\u7c7b\u578b -item_code=\u7f16\u7801 +item_code=\u914d\u7f6e\u7f16\u7801 item_value=\u7f16\u7801\u5bf9\u5e94\u503c desc=\u63cf\u8ff0\u4fe1\u606f parent_id=\u7236ID is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9 is_valid=\u6709\u6548\u6807\u5fd7 -creator_id=\u521b\u5efa\u4eba\u5458 create_time=\u914d\u7f6e\u65f6\u95f4 -editor_id=\u4fee\u6539\u4eba\u5458 edit_time=\u4fee\u6539\u65f6\u95f4 +superior_config=\u4e0a\u7ea7\u914d\u7f6e +config_content=\u914d\u7f6e\u5185\u5bb9 + #==========yewu zidian end===================== #==========laihan begin===================== @@ -131,7 +132,7 @@ begin_date=\u5f00\u59cb\u65f6\u95f4 end_date=\u7ed3\u675f\u65f6\u95f4 delete=\u5220\u9664 special_task=\u4e13\u9879\u4efb\u52a1 -#==========yewu zidian end===================== +#==========laihan end===================== #==========message begin===================== required=\u4e0d\u80fd\u4e3a\u7a7a! diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 4fbbb35d4..c9319dd98 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -141,13 +141,13 @@

    - 配置管理 +

    @@ -155,7 +155,7 @@
    - 配置${not empty serviceDictInfo.serviceDictId?'修改':'添加'}查看
    + ${not empty serviceDictInfo.serviceDictId?'修改':'添加'}
    @@ -106,6 +107,9 @@ + + + @@ -133,8 +137,6 @@ } }); - - // 如果在框架或在对话框中，则弹出提示并跳转到首页 if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ alert('未登录或登录超时。请重新登录，谢谢！'); From c48bdc9afe6c4eec782f34f1ee657d44fb68bfd0 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 7 Mar 2018 16:23:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=8B=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/basics/sysDictForm.jsp | 20 ++++++++-------- .../WEB-INF/views/basics/sysDictList.jsp | 24 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 617b1d100..f76a7d3a9 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -141,13 +141,13 @@

    - 配置管理 +

    @@ -155,7 +155,7 @@
    - 配置${not empty sysDictInfo.sysDictId?'修改':'添加'}查看
    + ${not empty sysDictInfo.sysDictId?'修改':'添加'}