diff --git a/src/main/java/com/nis/domain/configuration/RequestInfo.java b/src/main/java/com/nis/domain/configuration/RequestInfo.java index 7bcb0235d..daae1e716 100644 --- a/src/main/java/com/nis/domain/configuration/RequestInfo.java +++ b/src/main/java/com/nis/domain/configuration/RequestInfo.java @@ -39,11 +39,13 @@ public class RequestInfo extends BaseEntity{ private String creatorName; private String editorName; private String auditorName; - private Date beginDate;//开始时间 - private Date endDate;//结束时间 + private Date beginDate;//来函开始时间 + 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{ 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; + } } \ No newline at end of file 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 d21b50a03..84883214d 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/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){ - requestInfoService.requestExamine(requestInfo); + public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + 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){ - requestInfoService.requestExamineNo(requestInfo); + public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ + 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){ - requestInfoService.requestCancelExamine(requestInfo); + public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + 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){ - requestInfoService.delete(requestInfo); + public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ + 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 taskInfos = requestInfoService.showTask(taskInfo); model.addAttribute("taskInfos", taskInfos); } + } diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java index 4ab24fb5e..4394f9dae 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java @@ -23,6 +23,7 @@ public interface RequestInfoDao extends CrudDao { List showTask(TaskInfo taskInfo); + void delete(@Param("id") Long id); } \ No newline at end of file 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 b6e514217..aa64cb5cb 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -61,11 +61,11 @@ AND r.is_audit=${isAudit} - + AND r.request_time between #{beginDate} and #{endDate} - - 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}) order by r.request_time desc @@ -153,11 +153,11 @@ where id = #{id,jdbcType=BIGINT} - + update request_info - - is_valid=#{isValid} + + is_valid=-1 where id = #{id,jdbcType=BIGINT} and is_audit !=1 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 fe2e0f119..3f5f04fe8 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -62,24 +62,37 @@ public class RequestInfoService extends BaseService{ return requestInfoDao.getRequestInfoById(id); } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void requestExamine(RequestInfo requestInfo){ - requestInfo.setIsAudit(1);//审核通过 - requestInfoDao.update(requestInfo); + public void requestExamine(String[] exId){ + RequestInfo requestInfo = new RequestInfo(); + for (int i = 0; i < exId.length; i++) { + requestInfo.setId(Long.valueOf(exId[i])); + requestInfo.setIsAudit(1);//审核通过 + requestInfoDao.update(requestInfo); + } } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void requestExamineNo(RequestInfo requestInfo){ - requestInfo.setIsAudit(2);//审核未通过 - requestInfoDao.update(requestInfo); + public void requestExamineNo(String[] noId){ + RequestInfo requestInfo = new RequestInfo(); + for (int i = 0; i < noId.length; i++) { + requestInfo.setId(Long.valueOf(noId[i])); + 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); + public void requestCancelExamine(String[] cancelId){ + RequestInfo requestInfo = new RequestInfo(); + for (int i = 0; i < cancelId.length; i++) { + requestInfo.setId(Long.valueOf(cancelId[i])); + requestInfo.setIsAudit(3);//取消审核通过 + requestInfoDao.update(requestInfo); + } } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void delete(RequestInfo requestInfo){ - requestInfo.setIsValid(-1); - requestInfoDao.delete(requestInfo);//删除 + public void delete(String[] delId){ + for (int i = 0; i < delId.length; i++) { + requestInfoDao.delete(Long.valueOf(delId[i]));//删除 + } } public List getValidRequestInfo(){ RequestInfo requestInfo=new RequestInfo(); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index eea83a3c6..8b28fd14e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -137,6 +137,7 @@ begin_date=begin date end_date=end date delete=delete special_task=special task +cancel_approved=cancel approved #============laihan end====================== @@ -157,6 +158,17 @@ turning_page=It is turning to the page login_timeout=No login or login timeout,please login again,Thank you! captcha_error=captcha error enter_captcha=Please enter the captcha +input=please input +input_title=please input title +all_states=all states +filter=filter +to=to +reset=reset +info=info +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 ! #==========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 ae12e8bc9..5a883fd32 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -137,6 +137,7 @@ 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 #==========laihan end===================== #==========message begin===================== @@ -156,6 +157,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===================== diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag new file mode 100644 index 000000000..a0fbfd7e5 --- /dev/null +++ b/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"%> + + + + + + + + + + + + + + + +<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%> + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index a0dad7780..5468db2f2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -13,7 +13,7 @@ +

@@ -41,7 +41,7 @@
- 所有状态 + @@ -50,14 +50,14 @@
- + + + + +
- + type="text" value="">
@@ -65,28 +65,27 @@
- +
- +
- - + +
@@ -109,14 +108,14 @@
- +
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
- +
- +
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
- +
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
@@ -147,8 +146,8 @@
- - + +
@@ -170,7 +169,7 @@ - + @@ -187,7 +186,7 @@ - + @@ -215,28 +214,6 @@ @@ -253,6 +230,18 @@ diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index 0e9fbd2f2..44049db97 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/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(""); - window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000); + top.$.jBox.confirm("","",function(v,h,f){ + + if(v=="ok"){ + top.location = "${pageContext.request.contextPath }"; + }else{ + top.location = "${pageContext.request.contextPath }"; + } + },{buttonsFocus:1}); + top.$('.jbox-body .jbox-icon').css('top','55px'); }
${requestInfo.id } ${requestInfo.requestNumber } ${requestInfo.requestOrg }${requestInfo.requestContent } ${requestInfo.taskName } - <%--
- - -
--%>