From b3d3ea551970dbde4007100510725d94d56892b2 Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Tue, 13 Mar 2018 17:53:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD-=E5=BC=B9=E6=A1=86=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/jquery-jbox/2.3/Skins/Bootstrap/jbox.min.css | 2 +- src/main/webapp/static/global/scripts/jeesite.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/Skins/Bootstrap/jbox.min.css b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/Skins/Bootstrap/jbox.min.css index 0247965bd..751cded88 100644 --- a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/Skins/Bootstrap/jbox.min.css +++ b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/Skins/Bootstrap/jbox.min.css @@ -1,4 +1,4 @@ -@charset "utf-8";*:focus{outline:0}.jbox-fade{background-color:#ccc}.jbox-drag{border:1px dashed #376ea5}div.jbox{padding:0;border:0;font-size:12px}div.jbox .jbox-border{background:none repeat scroll 0 0 #999;filter:alpha(opacity=20);-moz-opacity:.2;opacity:.2}div.jbox .jbox-container{background-color:#fff;border:1px solid #999}div.jbox .jbox-title-panel{background:#fff;border-bottom:1px solid #ccc;padding:8px 10px}div.jbox .jbox-title{font-weight:bold;color:#333;font-size:16px;line-height:27px;padding-top:0}div.jbox .jbox-title-icon{background:url(images/jbox-title-icon.gif) no-repeat scroll 3px 5px transparent}div.jbox .jbox-close,div.jbox .jbox-close-hover{background:url(images/jbox-close.gif) no-repeat scroll 0 0 transparent;margin:7px}div.jbox .jbox-close-hover{background-position:-16px 0}div.jbox .jbox-content{min-height:24px;line-height:18px;color:#444}div.jbox .jbox-content-loading{background-color:#e6e6e6}div.jbox .jbox-content-loading-image{background:url(images/jbox-content-loading.gif) no-repeat bottom center}div.jbox .jbox-button-panel{border-top:1px solid #ccc;background-color:#eee}div.jbox .jbox-bottom-text{text-indent:10px;color:#444}div.jbox .jbox-button{background:url(images/jbox-button1.png) repeat-x transparent;border:#aaa 1px solid;color:#888;border-radius:3px 3px 3px 3px;margin:1px 7px 0 0;height:20px;cursor:default}div.jbox .jbox-button-hover{background-position:0 -20px;color:#666}div.jbox .jbox-button-active{background-position:0 -40px}div.jbox-warning .jbox .jbox-button-panel{background-color:#fff}div.jbox .jbox-tip-color{background-color:#376ea5;border-color:#376ea5;border-radius:3px 3px 3px 3px;color:#fff}div.jbox span.jbox-icon{background:url(images/jbox-icons.png) no-repeat scroll 0 0 transparent;_background:url(images/jbox-icons-ie6.gif) no-repeat scroll 0 0 transparent}div.jbox span.jbox-icon-info{background-position:0 0}div.jbox span.jbox-icon-question{background-position:-36px 0}div.jbox span.jbox-icon-success{background-position:-72px 0}div.jbox span.jbox-icon-warning{background-position:-108px 0} +@charset "utf-8";*:focus{outline:0}.jbox-fade{background-color:#000}.jbox-drag{border:1px dashed #376ea5}div.jbox{padding:0;border:0;font-size:12px}div.jbox .jbox-border{background:none repeat scroll 0 0 #999;filter:alpha(opacity=20);-moz-opacity:.2;opacity:.2}div.jbox .jbox-container{background-color:#fff;border:1px solid #999}div.jbox .jbox-title-panel{background:#fff;border-bottom:1px solid #ccc;padding:8px 10px}div.jbox .jbox-title{font-weight:bold;color:#333;font-size:16px;line-height:27px;padding-top:0}div.jbox .jbox-title-icon{background:url(images/jbox-title-icon.gif) no-repeat scroll 3px 5px transparent}div.jbox .jbox-close,div.jbox .jbox-close-hover{background:url(images/jbox-close.gif) no-repeat scroll 0 0 transparent;margin:7px}div.jbox .jbox-close-hover{background-position:-16px 0}div.jbox .jbox-content{min-height:24px;line-height:18px;color:#444}div.jbox .jbox-content-loading{background-color:#e6e6e6}div.jbox .jbox-content-loading-image{background:url(images/jbox-content-loading.gif) no-repeat bottom center}div.jbox .jbox-button-panel{border-top:1px solid #ccc;background-color:#eee}div.jbox .jbox-bottom-text{text-indent:10px;color:#444}div.jbox .jbox-button{background:url(images/jbox-button1.png) repeat-x transparent;border:#aaa 1px solid;color:#888;border-radius:3px 3px 3px 3px;margin:1px 7px 0 0;height:20px;cursor:default}div.jbox .jbox-button-hover{background-position:0 -20px;color:#666}div.jbox .jbox-button-active{background-position:0 -40px}div.jbox-warning .jbox .jbox-button-panel{background-color:#fff}div.jbox .jbox-tip-color{background-color:#376ea5;border-color:#376ea5;border-radius:3px 3px 3px 3px;color:#fff}div.jbox span.jbox-icon{background:url(images/jbox-icons.png) no-repeat scroll 0 0 transparent;_background:url(images/jbox-icons-ie6.gif) no-repeat scroll 0 0 transparent}div.jbox span.jbox-icon-info{background-position:0 0}div.jbox span.jbox-icon-question{background-position:-36px 0}div.jbox span.jbox-icon-success{background-position:-72px 0}div.jbox span.jbox-icon-warning{background-position:-108px 0} div.jbox span.jbox-icon-error{background-position:-144px 0}div.jbox span.jbox-icon-none{display:none;overflow:hidden}div.jbox span.jbox-icon-loading{background:url(images/jbox-loading1.gif) no-repeat scroll 0 0 transparent} .jbox-container *{ diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index 64c798d47..edbd203f4 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -347,7 +347,7 @@ function customColumnClick(){ var submit = function(v,h,f) { var abVisCols = [true]; - $(".customColumnList input[type='checkbox']").each(function(){ + top.$(".customColumnList input[type='checkbox']").each(function(){ abVisCols[$(this).val()] = $(this).prop("checked"); }); @@ -376,7 +376,7 @@ function customColumnClick(){ }) html +=""; - $.jBox(html,{title:"Custom Columns",submit:submit}); + top.$.jBox(html,{title:" Custom Columns",showIcon:false,opacity:0.3,submit:submit}); } From aa8568adbef064af8facbace92ab11860f7950f8 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 14 Mar 2018 13:36:50 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=EF=BC=8C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=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 --- .../controller/basics/TaskInfoController.java | 16 ++++++++-------- .../configuration/RequestInfoController.java | 16 ++++++++-------- src/main/webapp/WEB-INF/tags/sys/message.tag | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) 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 0837f8185..6b30fd483 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -58,22 +58,22 @@ public class TaskInfoController extends BaseController{ // 保存用户信息 logger.info(taskInfo.getId()+"修改成功"); taskInfoService.saveOrUpdate(taskInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); }else{ if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ logger.info(taskInfo.getTaskName()+"重复数据"); - addMessage(model, "error"); + addMessage(model, "save_failed"); return form(taskInfo, model); } // 保存用户信息 taskInfoService.saveOrUpdate(taskInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); logger.info(taskInfo.getId()+"保存成功"); } } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model, "error"); + addMessage(model, "save_failed"); } return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -100,7 +100,7 @@ public class TaskInfoController extends BaseController{ public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); taskInfoService.taskExamine(exId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -114,7 +114,7 @@ public class TaskInfoController extends BaseController{ public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); taskInfoService.taskExamineNo(noId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -128,7 +128,7 @@ public class TaskInfoController extends BaseController{ public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); taskInfoService.taskCancelExamine(canclelId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -142,7 +142,7 @@ public class TaskInfoController extends BaseController{ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); taskInfoService.delete(delId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "delete_success"); 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 84883214d..c20c7c975 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -62,22 +62,22 @@ public class RequestInfoController extends BaseController{ // 保存用户信息 logger.info(requestInfo.getId()+"修改成功"); requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ logger.info(requestInfo.getRequestNumber()+"重复数据"); - addMessage(model, "error"); + addMessage(model, "save_failed"); return form(requestInfo, model); } // 保存用户信息 requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); logger.info(requestInfo.getId()+"保存成功"); } } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model, "error"); + addMessage(model, "save_failed"); } return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -104,7 +104,7 @@ public class RequestInfoController extends BaseController{ public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); requestInfoService.requestExamine(exId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -118,7 +118,7 @@ public class RequestInfoController extends BaseController{ public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); requestInfoService.requestExamineNo(noId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -132,7 +132,7 @@ public class RequestInfoController extends BaseController{ public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); requestInfoService.requestCancelExamine(canclelId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -146,7 +146,7 @@ public class RequestInfoController extends BaseController{ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); requestInfoService.delete(delId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "delete_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag index 29af115b5..3e6d03cb1 100644 --- a/src/main/webapp/WEB-INF/tags/sys/message.tag +++ b/src/main/webapp/WEB-INF/tags/sys/message.tag @@ -5,6 +5,6 @@ -
${content}
- +
+ \ No newline at end of file From 52ae5c0c43bd982a950974d870e8a15b52bc4be5 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 14 Mar 2018 13:47:43 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmapper.xml=E4=B8=ADexpr?= =?UTF-8?q?=5Ftype=E5=AD=97=E6=AE=B5=E5=B8=A6=E7=9A=84=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=20ServiceConfigInfo=E6=B7=BB=E5=8A=A0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20IP,=E5=AD=97=E7=AC=A6=E4=B8=B2,=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E5=9C=A8=E6=9B=B4=E6=96=B0=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/ComplexStringCfgController.java | 8 ++++---- .../controller/configuration/IpCfgController.java | 4 ++-- .../controller/configuration/NumCfgController.java | 4 ++-- .../configuration/StringCfgController.java | 8 ++++---- .../com/nis/web/dao/configuration/NumCfgDao.xml | 2 +- .../com/nis/web/dao/configuration/StringCfgDao.xml | 4 ++-- .../dao/systemService/ServiceConfigInfoDao.java | 3 +++ .../web/dao/systemService/ServiceConfigInfoDao.xml | 14 ++++++++++++++ .../systemService/ServiceConfigInfoService.java | 5 +++++ 9 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index 85d816c50..b0d980bfc 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -186,8 +186,8 @@ public class ComplexStringCfgController extends BaseController{ }else if(!StringUtils.isBlank(cfg.getTableName())){ int serviceId=cfg.getServiceId(); long compileId=getCompileId(cfg); - cfg.setCreatorId(cfg.getCurrentUser().getId()); - cfg.setCreateTime(new Date()); +// cfg.setCreatorId(cfg.getCurrentUser().getId()); +// cfg.setCreateTime(new Date()); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setCompileId(compileId); @@ -211,8 +211,8 @@ public class ComplexStringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ long compileId=getCompileId(cfg); cfg.setTableName(tableName); - cfg.setCreatorId(cfg.getCurrentUser().getId()); - cfg.setCreateTime(new Date()); +// cfg.setCreatorId(cfg.getCurrentUser().getId()); +// cfg.setCreateTime(new Date()); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 4ff3d08be..7747fa609 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -262,8 +262,8 @@ public class IpCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ long compileId=getCompileId(); ipCfg.setTableName(tableName); - ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); - ipCfg.setCreateTime(new Date()); +// ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); +// ipCfg.setCreateTime(new Date()); ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 5aa2a68fb..f064d3d71 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -144,8 +144,8 @@ public class NumCfgController extends BaseController{ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ long compileId=getCompileId(cfg); - cfg.setCreatorId(cfg.getCurrentUser().getId()); - cfg.setCreateTime(new Date()); +// cfg.setCreatorId(cfg.getCurrentUser().getId()); +// cfg.setCreateTime(new Date()); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index 2430efdc8..c1da0c564 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -186,8 +186,8 @@ public class StringCfgController extends BaseController{ }else if(!StringUtils.isBlank(stringCfg.getTableName())){ int serviceId=stringCfg.getServiceId(); long compileId=getCompileId(stringCfg); - stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); - stringCfg.setCreateTime(new Date()); +// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); +// stringCfg.setCreateTime(new Date()); stringCfg.setIsValid(Constants.VALID_NO); stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.setCompileId(compileId); @@ -211,8 +211,8 @@ public class StringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ long compileId=getCompileId(stringCfg); stringCfg.setTableName(tableName); - stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); - stringCfg.setCreateTime(new Date()); +// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); +// stringCfg.setCreateTime(new Date()); stringCfg.setIsValid(Constants.VALID_NO); stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml index f32932669..d59d28801 100644 --- a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml @@ -22,7 +22,7 @@ - + diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index f9fc17fe4..a818ea17d 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -22,7 +22,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java index 6d84a74b5..8b86b0a79 100644 --- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java @@ -1,5 +1,7 @@ package com.nis.web.dao.systemService; +import java.util.List; + import org.apache.ibatis.annotations.Param; import com.nis.domain.ServiceConfigInfo; @@ -8,4 +10,5 @@ import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface ServiceConfigInfoDao extends CrudDao{ public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId); + public List findList(@Param("service_id")int serviceId); } diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml index eaebed82d..52b8d4137 100644 --- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml @@ -26,6 +26,20 @@ where service_id=#{service_id} and is_valid=1 + insert into service_config_info ( diff --git a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java index 58611bf69..a40c7728c 100644 --- a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java +++ b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java @@ -1,5 +1,7 @@ package com.nis.web.service.systemService; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,4 +15,7 @@ public class ServiceConfigInfoService { public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){ return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId); } + public List findList(int serviceId){ + return serviceConfigInfoDao.findList(serviceId); + } } From 08a7fb9f81378493c84722223c06046e78a6519b Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Wed, 14 Mar 2018 13:58:36 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- src/main/resources/messages/message_zh_CN.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4b28c1942..28df3e32b 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -64,7 +64,7 @@ website_keyword_control=website keyword control mail_control=mail control recipient_control=recipient control sender_control=sender control -theme_control=theme control +subject_control=subject control mail_keyword_control=mail keyword control mail_attachment_name_control=mail attachment name control mail_attachment_content_control=mail attachment content control diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 4b28c1942..28df3e32b 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -64,7 +64,7 @@ website_keyword_control=website keyword control mail_control=mail control recipient_control=recipient control sender_control=sender control -theme_control=theme control +subject_control=subject control mail_keyword_control=mail keyword control mail_attachment_name_control=mail attachment name control mail_attachment_content_control=mail attachment content control diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 435b04547..65c370e6f 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -62,7 +62,7 @@ website_keyword_control=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 mail_control=\u90ae\u4ef6\u7ba1\u63a7 recipient_control=\u6536\u4ef6\u4eba\u7ba1\u63a7 sender_control=\u53d1\u4ef6\u4eba\u7ba1\u63a7 -theme_control=\u4e3b\u9898\u7ba1\u63a7 +subject_control=\u4e3b\u9898\u7ba1\u63a7 mail_keyword_control=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 mail_attachment_name_control=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u7ba1\u63a7 mail_attachment_content_control=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 From 1d6595cdbce6d9e98bff0f7290291350ce92e30f Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 09:36:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?1=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BA=BA=E5=91=98=E5=8F=8A=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=8F=8A=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=89=E6=95=88=E7=8A=B6=E6=80=81=202?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/dao/configuration/RequestInfoDao.xml | 1 + .../java/com/nis/web/dao/configuration/TaskInfoDao.xml | 2 +- .../java/com/nis/web/service/basics/TaskInfoService.java | 2 ++ .../nis/web/service/configuration/RequestInfoService.java | 2 ++ src/main/resources/messages/message_en.properties | 1 + src/main/resources/messages/message_zh_CN.properties | 1 + src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp | 8 ++++++++ src/main/webapp/WEB-INF/views/cfg/requestList.jsp | 7 +++++-- 8 files changed, 21 insertions(+), 3 deletions(-) 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 aa64cb5cb..c9e0cc0f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -39,6 +39,7 @@ u.name AS editorName, r.edit_time AS editTime, e.name AS currentName, + e.name AS auditorName, r.audit_time AS auditTime, t.task_name AS taskName from request_info r 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 3e373d774..e20b2db91 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -43,7 +43,7 @@ r.create_time AS createTime, u.name AS editorName, r.edit_time AS editTime, - e.name AS currentName, + e.name AS auditorName, r.audit_time AS auditTime from task_info r left join sys_user s on r.creator_id=s.id 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 e4ebe5fb0..bf5cc2b99 100644 --- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java +++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java @@ -63,6 +63,7 @@ public class TaskInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { taskInfo.setId(Long.valueOf(exId[i])); taskInfo.setIsAudit(1);//审核通过 + taskInfo.setIsValid(1);//审核通过 taskInfo.setAuditTime(new Date()); taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 taskInfoDao.update(taskInfo); @@ -85,6 +86,7 @@ public class TaskInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { taskInfo.setId(Long.valueOf(cancelId[i])); taskInfo.setIsAudit(3);//取消审核通过 + taskInfo.setIsValid(0); taskInfo.setAuditTime(new Date()); taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 taskInfoDao.update(taskInfo); 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 f74bc07c5..abeb0c464 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,7 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { requestInfo.setId(Long.valueOf(exId[i])); requestInfo.setIsAudit(1);//审核通过 + requestInfo.setIsValid(1);//审核通过有效 requestInfo.setAuditTime(new Date()); requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); @@ -89,6 +90,7 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { requestInfo.setId(Long.valueOf(cancelId[i])); requestInfo.setIsAudit(3);//取消审核通过 + requestInfo.setIsValid(0);//取消审核通过无效 requestInfo.setAuditTime(new Date()); requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 28df3e32b..bcc6a4bd4 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -172,6 +172,7 @@ has_approved=It has been approved and can not be operated on ! hasnot_approved=It has not been approved and can not be operated on ! check_one=choose one please ! one_more=please choose at least one ! +custom_columns=custom columns #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 65c370e6f..da1c36715 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -171,6 +171,7 @@ has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\ 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! +custom_columns=\u81ea\u5b9a\u4e49\u5217\u5b57\u6bb5 #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index df9a34953..86c1e4d67 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -82,6 +82,10 @@
    • + href="javascript:;"> + + @@ -158,6 +162,8 @@ + + @@ -187,6 +193,8 @@ + ${taskInfo.auditorName } + diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 4e40a5256..cb2ac99f5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -90,7 +90,7 @@ + data-container="body" data-placement="top" data-original-title= href="javascript:;"> @@ -180,7 +180,8 @@ -<%-- --%> + + @@ -213,6 +214,8 @@ ${requestInfo.requestTitle } ${requestInfo.requestContent } ${requestInfo.taskName } + ${requestInfo.auditorName } + From 0ff05e00ffc4d0af3c5a51046b6018f88ad1a4af Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 12:17:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=B6=E6=98=BE=E7=A4=BA=E6=97=A0?= =?UTF-8?q?=E6=95=88=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/configuration/RequestInfoDao.xml | 45 ++++++++++++++----- .../nis/web/dao/configuration/TaskInfoDao.xml | 5 ++- 2 files changed, 38 insertions(+), 12 deletions(-) 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 c9e0cc0f8..3baa562e4 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -79,10 +79,31 @@ @@ -99,31 +120,32 @@ editor_id, edit_time, auditor_id, - audit_time + audit_time, + task_id ) values (#{requestNumber,jdbcType=VARCHAR}, #{requestOrg,jdbcType=VARCHAR}, #{requestTime,jdbcType=DATE}, #{requestTitle,jdbcType=VARCHAR}, #{requestContent,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=DATE}, #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, - #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}) + #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}, #{taskId,jdbcType=BIGINT}) update request_info - + request_number = #{requestNumber,jdbcType=VARCHAR}, - + request_org = #{requestOrg,jdbcType=VARCHAR}, request_time = #{requestTime,jdbcType=DATE}, - + request_title = #{requestTitle,jdbcType=VARCHAR}, - + request_content = #{requestContent,jdbcType=VARCHAR}, @@ -150,6 +172,9 @@ audit_time = #{auditTime,jdbcType=DATE}, + + task_id = #{taskId}, + where id = #{id,jdbcType=BIGINT} 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 e20b2db91..d3e936cd4 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -24,9 +24,10 @@ From 47287d58a7b80cfcb32129d4d264f5e6daf72a24 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 15:26:49 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E8=AF=AD=E8=A8=80=E8=AE=BE=E7=BD=AE=E5=88=87=E6=8D=A2?= =?UTF-8?q?jbox=E4=B8=AD=E8=8B=B1=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-jbox/2.3/jquery.jBox-2.3.src.js | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js index 944c32280..0e98b4144 100644 --- a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js +++ b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js @@ -591,16 +591,32 @@ width: 350, height: 'auto', bottomText: '', - buttons: { '确定': 'ok' }, + buttons: { 'ok': 'ok' }, buttonsFocus: 0, loaded: function (h) { }, submit: function (v, h, f) { return true; }, closed: function () { } }; - $.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } }; + //国际化切换 + var type=navigator.appName; + if(type=="Netscape"){ + var lang = navigator.language;//获取浏览器语言配置支持非IE + }else{ + var lang = navigator.userLanguage;//支持IE + } + var lang = lang.toLowerCase(); + if(lang.indexOf("zh")!=-1) { + + $.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } }; + $.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' }; + }else{ + $.jBox.stateDefaults = { content: '', buttons: { 'ok': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } }; + $.jBox.languageDefaults = { close: 'close', ok: 'ok', yes: 'yes', no: 'no', cancel: 'cancel' }; + } + + $.jBox.tipDefaults = { content: '', icon: 'info', top: '40%', width: 'auto', height: 'auto', opacity: 0, timeout: 3000, closed: function () { } }; $.jBox.messagerDefaults = { content: '', title: 'jBox', icon: 'none', width: 350, height: 'auto', timeout: 3000, showType: 'slide', showSpeed: 600, border: 0, buttons: {}, buttonsFocus: 0, loaded: function () { }, submit: function (v, h, f) { return true; }, closed: function () { } }; - $.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' }; $.jBox.setDefaults = function (configs) { $.jBox.defaults = $.extend({}, $.jBox.defaults, configs.defaults); From 93d7f3a9170268659333fd5324d239aeecfdc9fe Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 18:29:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/configuration/RequestInfoDao.xml | 4 +- .../nis/web/dao/configuration/TaskInfoDao.xml | 2 +- .../messages/message_zh_CN.properties | 2 +- .../WEB-INF/views/basics/taskInfoList.jsp | 22 ++++------ .../webapp/WEB-INF/views/cfg/requestForm.jsp | 10 ----- .../webapp/WEB-INF/views/cfg/requestList.jsp | 43 ++++++++++--------- 6 files changed, 35 insertions(+), 48 deletions(-) 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 3baa562e4..71979abec 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -66,8 +66,8 @@ AND r.request_time between #{beginDate} and #{endDate} - AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate}) - + AND r.edit_time between #{dobeginDate} and #{doendDate} + order by r.request_time desc 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 d3e936cd4..683e8561a 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -62,7 +62,7 @@ AND r.task_time between #{beginDate} and #{endDate} - AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate}) + AND r.edit_time between #{dobeginDate} and #{doendDate} order by r.task_time desc diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index da1c36715..1eca25fed 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -106,7 +106,7 @@ desc=\u63cf\u8ff0\u4fe1\u606f parent_id=\u7236ID is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9 is_valid=\u6709\u6548\u6807\u5fd7 -create_time=\u914d\u7f6e\u65f6\u95f4 +create_time=\u521b\u5efa\u65f6\u95f4 edit_time=\u4fee\u6539\u65f6\u95f4 superior_config=\u4e0a\u7ea7\u914d\u7f6e config_content=\u914d\u7f6e\u5185\u5bb9 diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 86c1e4d67..ccd49bb4d 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -116,7 +116,7 @@
    - +
    - - + + + + @@ -182,17 +184,9 @@ ${taskInfo.creatorName } - - - - - - - - - - - + + ${taskInfo.editorName } + ${taskInfo.auditorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index e256c9d34..aebed9bba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -81,16 +81,6 @@
    -