0000019: 基本配置-专项管理-状态变更

1、专项状态变更”审核未通过“后，修改专项信息，保存后，专项信息状态变更为”未审核“；
2、删除提示时间过短修改
0000018: 来函管理-状态变更
1、来函状态变更”审核未通过“后，修改来函信息，保存后，来函信息状态变更为”未审核“；
2、删除提示时间过短修改
0000016: 基本配置-专项管理
1、专项管理新增：专项信息新增后，专项信息表字段is_valid=0,is_audit=0；
2、专项信息列表默认按创建时间倒序显示
0000017: 来函管理
1、来函管理新增：来函信息新增后，来函信息表字段is_valid=0,is_audit=0；
2、来函信息列表，默认按创建时间倒序显示。

src/main/java/com/nis/web/controller/basics/TaskInfoController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -37,6 +38,7 @@ public class TaskInfoController extends BaseController{
 	/**
 	 * 进入用户添加或修改页面
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value={"form"})
 	public String form(TaskInfo taskInfo, Model model) {
 		if(taskInfo.getId()!=null){
@@ -51,6 +53,7 @@ public class TaskInfoController extends BaseController{
 	/**
 	 * 新增/修改
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(TaskInfo taskInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
 		try {
@@ -96,6 +99,7 @@ public class TaskInfoController extends BaseController{
      * @param model
      * @return
      */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "taskExamine")
     public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
@@ -110,6 +114,7 @@ public class TaskInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "taskExamineNo")
 	public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
@@ -124,6 +129,7 @@ public class TaskInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "taskCancelExamine")
 	public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
@@ -138,6 +144,7 @@ public class TaskInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "delete")
 	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");

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

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -38,6 +39,7 @@ public class RequestInfoController extends BaseController{
 	/**
 	 * 进入用户添加或修改页面
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value={"form"})
 	public String form(RequestInfo requestInfo, Model model) {
 		TaskInfo taskInfo = new TaskInfo();
@@ -55,6 +57,7 @@ public class RequestInfoController extends BaseController{
 	/**
 	 * 新增/修改
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
 		try {
@@ -100,6 +103,7 @@ public class RequestInfoController extends BaseController{
      * @param model
      * @return
      */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "requestExamine")
     public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
@@ -114,6 +118,7 @@ public class RequestInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "requestExamineNo")
 	public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
@@ -128,6 +133,7 @@ public class RequestInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "requestCancelExamine")
 	public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
@@ -142,6 +148,7 @@ public class RequestInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "delete")
 	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -47,7 +47,7 @@
 	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
+	where r.is_valid!=-1 and r.is_audit !=3
 	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
 				<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
@@ -68,7 +68,7 @@
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
 			AND r.edit_time between #{dobeginDate} and #{doendDate}
 	</if>
-	order by r.request_time desc
+	order by r.create_time desc
   </select>
   <!-- 根据来函号查询 -->
   <select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -102,7 +102,7 @@
 	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
+	where r.is_valid!=-1 and r.is_audit !=3
     and r.id = #{id,jdbcType=BIGINT}
   </select>
   <!-- 新增 -->

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -25,7 +25,7 @@
     select 
     <include refid="Base_Column_List" />
     from task_info t
-    where is_valid=1 and is_audit !=3
+    where is_valid!=-1 and is_audit !=3
     <if test="id!=null">
    		AND id = #{id,jdbcType=BIGINT}
     </if>
@@ -50,7 +50,7 @@
 	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
+	where r.is_valid!=-1 and r.is_audit !=3
 	<if test="taskName != null and taskName != ''">
 			AND r.task_name like 
 				<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
@@ -64,7 +64,7 @@
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
 			AND r.edit_time between #{dobeginDate} and #{doendDate}
 	</if> 
-	order by r.task_time desc
+	order by r.create_time desc
   </select>
   <!-- 根据来函号查询 -->
   <select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">

src/main/java/com/nis/web/service/basics/TaskInfoService.java

@@ -36,12 +36,13 @@ public class TaskInfoService extends BaseService{
 	public void saveOrUpdate(TaskInfo taskInfo) {
 		if (StringUtil.isEmpty(taskInfo.getId())) {
 			//设置默认参数值
-			taskInfo.setIsValid(1);//有效
+			taskInfo.setIsValid(0);//无效
 			taskInfo.setIsAudit(0);//未审核
 			taskInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员
 			taskInfo.setCreateTime(new Date());//创建时间
 			taskInfoDao.insert(taskInfo);
 		}else{
+			taskInfo.setIsAudit(0);//修改后状态为未审核
 			taskInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员
 			taskInfo.setEditTime(new Date());//修改时间
 			taskInfoDao.update(taskInfo);

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -40,12 +40,13 @@ public class RequestInfoService extends BaseService{
 	public void saveOrUpdate(RequestInfo requestInfo) {
 		if (StringUtil.isEmpty(requestInfo.getId())) {
 			//设置默认参数值
-			requestInfo.setIsValid(1);//有效
+			requestInfo.setIsValid(0);//无效
 			requestInfo.setIsAudit(0);//未审核
 			requestInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员
 			requestInfo.setCreateTime(new Date());//创建时间
 			requestInfoDao.insert(requestInfo);
 		}else{
+			requestInfo.setIsAudit(0);//修改后状态为未审核
 			requestInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员
 			requestInfo.setEditTime(new Date());//修改时间
 			requestInfoDao.update(requestInfo);

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -5,9 +5,9 @@
 <%@ attribute name="label" type="java.lang.String" required="false"%>
 <c:choose>
 	<c:when test="${label eq 'delete'}">
-		<button class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
+		<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
 			<i class="fa fa-trash"> <spring:message code="delete"/></i>
-		</button>
+		</a>
 	</c:when>
 
 	<c:when test="${label eq 'approved'}">

src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp

@@ -9,13 +9,14 @@
 <body>
 
 <div class="page-content">
+	<shiro:hasPermission name="basics:taskInfo:edit">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>
-	
+	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="special_task"></spring:message>
 		<small><spring:message code="date_list"/></small>
@@ -65,7 +66,7 @@
 									</div>
 
 									<div class="pull-right">
-									
+									<shiro:hasPermission name="basics:taskInfo:edit"> 
                                         <button type="button" class="btn btn-default" onclick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
@@ -82,6 +83,7 @@
 												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
+                                        </shiro:hasPermission>
                                         <a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -9,13 +9,14 @@
 <body>
 
 <div class="page-content">
+	<shiro:hasPermission name="cfg:requestInfo:edit">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/request/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>
-	
+	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="requestInfo"></spring:message>
 		<small><spring:message code="date_list"/></small>
@@ -71,7 +72,7 @@
 									</div>
 
 									<div class="pull-right">
-									
+									<shiro:hasPermission name="cfg:requestInfo:edit">
                                         <button type="button" class="btn btn-default" onclick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
@@ -88,7 +89,7 @@
 												<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
-                        
+                        			</shiro:hasPermission>
                                         <a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>