待办事项流程处理会跳到待办事项页面

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -575,7 +575,9 @@ public class OaNotifyController extends BaseController {
 
         if (StringUtils.isNotBlank(oaNotify.getHome()) && "home".equals(oaNotify.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
-        }else {
+        }else if (StringUtils.isNotBlank(oaNotify.getHome()) && "notifyList".equals(oaNotify.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}else {
             return "redirect:" + Global.getAdminPath() + "/oa/oaNotify/list?repage";
         }
     }

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -74,14 +74,14 @@ public class ProjectReportRecordController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 报告归档列表页面
 	 */
 	@RequiresPermissions("projectcontentinfo:projectReportRecord:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(ProjectReportRecord projectReportRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<ProjectReportRecord> page = projectReportRecordService.findPage(new Page<ProjectReportRecord>(request, response), projectReportRecord); 
+		Page<ProjectReportRecord> page = projectReportRecordService.findPage(new Page<ProjectReportRecord>(request, response), projectReportRecord);
 		model.addAttribute("page", page);
 		return "modules/projectcontentinfo/projectReportRecordList";
 	}
@@ -325,6 +325,8 @@ public class ProjectReportRecordController extends BaseController {
 		}
 		if (StringUtils.isNotBlank(projectReportRecord.getHome()) && projectReportRecord.getHome().equals("home")){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(projectReportRecord.getHome()) && "notifyList".equals(projectReportRecord.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
 		}else {
 			RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
 			if(StringUtils.isNotBlank(projectReportRecord.getCondition())){
@@ -464,7 +466,7 @@ public class ProjectReportRecordController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectReportRecord/?repage";
     }
-	
+
 	/**
 	 * 下载导入报告归档数据模板
 	 */
@@ -473,7 +475,7 @@ public class ProjectReportRecordController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "报告归档数据导入模板.xlsx";
-    		List<ProjectReportRecord> list = Lists.newArrayList(); 
+    		List<ProjectReportRecord> list = Lists.newArrayList();
     		new ExportExcel("报告归档数据", ProjectReportRecord.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -481,8 +483,8 @@ public class ProjectReportRecordController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectReportRecord/?repage";
     }
-	
-	
-	
 
-}
+
+
+
+}

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -97,7 +97,7 @@ public class ProjectRecordsController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 项目列表页面
 	 */
@@ -332,7 +332,7 @@ public class ProjectRecordsController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/project/projectRecords/?repage";
 	}
-	
+
 	/**
 	 * 批量删除项目
 	 */
@@ -346,7 +346,7 @@ public class ProjectRecordsController extends BaseController {
 		addMessage(redirectAttributes, "删除项目成功");
 		return "redirect:"+Global.getAdminPath()+"/project/projectRecords/?repage";
 	}
-	
+
 	/**
 	 * 导出excel文件
 	 */
@@ -372,7 +372,7 @@ public class ProjectRecordsController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "项目数据导入模板.xlsx";
-    		List<ProjectRecords> list = Lists.newArrayList(); 
+    		List<ProjectRecords> list = Lists.newArrayList();
     		new ExportExcel("项目数据", ProjectRecords.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -380,9 +380,9 @@ public class ProjectRecordsController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/project/projectRecords/?repage";
     }
-	
-	
-	
+
+
+
 	@RequestMapping("getContractInfo")
 	@ResponseBody
 	public WorkContractInfo queryContractInfo(WorkContractInfo  contractInfo){
@@ -571,7 +571,9 @@ public class ProjectRecordsController extends BaseController {
 
         if (StringUtils.isNotBlank(home) && "home".equals(home)){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
-        }else {
+        }else if (StringUtils.isNotBlank(home) && "notifyList".equals(home)){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}else {
             return "redirect:" + Global.getAdminPath() + "/project/projectRecords/?repage";
         }
 	}
@@ -732,4 +734,4 @@ public class ProjectRecordsController extends BaseController {
 	}
 
 
-}
+}

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1662,6 +1662,8 @@ public class RuralProjectMessageController extends BaseController {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             if(null != ruralProjectRecords){
                 if("1".equals(ruralProjectRecords.getProjectType())){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -759,6 +759,8 @@ public class RuralProjectMessageNewController extends BaseController {
         }
         if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && projectcontentinfo.getHome().equals("home")){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && "notifyList".equals(projectcontentinfo.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             if("1".equals(projectRecord.getProjectType())){
                 return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -724,7 +724,9 @@ public class RuralProjectRecordsController extends BaseController {
 
         if (StringUtils.isNotBlank(home) && "home".equals(home)){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
-        }else {
+        }else if (StringUtils.isNotBlank(projectRecords.getHome()) && "notifyList".equals(projectRecords.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}else {
         	if("1".equals(projectRecords.getProjectType())){
 				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
 			}

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractBorrowController.java

@@ -263,6 +263,8 @@ public class WorkContractBorrowController extends BaseController {
 
 		if (StringUtils.isNotBlank(workCntractBorrow.getHome()) && "home".equals(workCntractBorrow.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workCntractBorrow.getHome()) && "notifyList".equals(workCntractBorrow.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
 		}else {
 			if("contractAll".equals(workCntractBorrow.getHome())){
 				return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfoAll/?repage";

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1605,6 +1605,8 @@ public class WorkContractInfoController extends BaseController {
         }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/list/?repage";
         }

src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -79,14 +79,14 @@ public class WorkContractRecordController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 合同归档列表页面
 	 */
 	@RequiresPermissions("workcontractrecord:workContractRecord:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkContractRecord workContractRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<WorkContractRecord> page = workContractRecordService.findPage(new Page<WorkContractRecord>(request, response), workContractRecord); 
+		Page<WorkContractRecord> page = workContractRecordService.findPage(new Page<WorkContractRecord>(request, response), workContractRecord);
 		model.addAttribute("page", page);
 		return "modules/workcontractrecord/workContractRecordList";
 	}
@@ -270,6 +270,8 @@ public class WorkContractRecordController extends BaseController {
 
 		if (StringUtils.isNotBlank(workContractRecord.getHome()) && "home".equals(workContractRecord.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workContractRecord.getHome()) && "notifyList".equals(workContractRecord.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
 		}else {
 			return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 		}
@@ -284,7 +286,7 @@ public class WorkContractRecordController extends BaseController {
 		addMessage(redirectAttributes, "删除合同归档成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 	}
-	
+
 	/**
 	 * 批量删除合同归档
 	 */
@@ -298,7 +300,7 @@ public class WorkContractRecordController extends BaseController {
 		addMessage(redirectAttributes, "删除合同归档成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontractrecord/workContractRecord/?repage";
 	}
-	
+
 	/**
 	 * 导出excel文件
 	 */
@@ -348,7 +350,7 @@ public class WorkContractRecordController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractrecord/workContractRecord/?repage";
     }
-	
+
 	/**
 	 * 下载导入合同归档数据模板
 	 */
@@ -357,7 +359,7 @@ public class WorkContractRecordController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "合同归档数据导入模板.xlsx";
-    		List<WorkContractRecord> list = Lists.newArrayList(); 
+    		List<WorkContractRecord> list = Lists.newArrayList();
     		new ExportExcel("合同归档数据", WorkContractRecord.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -365,8 +367,8 @@ public class WorkContractRecordController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractrecord/workContractRecord/?repage";
     }
-	
-	
+
+
 	/**
 	 * 选择合同
 	 */
@@ -442,4 +444,4 @@ public class WorkContractRecordController extends BaseController {
 		map.put("contractType",DictUtils.getMainDictLabel(workContractInfo.getContractType(),"contract_type",""));
 		return JsonMapper.toJsonString(map);
 	}
-}
+}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -234,6 +234,8 @@ public class WorkInvoiceController extends BaseController {
 
 		if (StringUtils.isNotBlank(workInvoice.getHome()) && "home".equals(workInvoice.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workInvoice.getHome()) && "notifyList".equals(workInvoice.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
 		}else {
 			return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
 		}

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -396,6 +396,8 @@ public class WorkReimbursementController extends BaseController {
 		}
 		if (StringUtils.isNotBlank(workReimbursement.getHome()) && "home".equals(workReimbursement.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workReimbursement.getHome()) && "notifyList".equals(workReimbursement.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
 		} else {
 			return "redirect:" + Global.getAdminPath() + "/workreimbursement/workReimbursement/?repage";
 		}

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -587,126 +587,126 @@
 					{
 					    if( d.status != 1 )
 						{
-						    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+						    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                                 "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                                 "</a>";
 						}
 						else
 						{
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                                 "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                                 "</a>";
 						}
                     }
                     else if(d.type == "18"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
 					}
 					else if(d.type == "19"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
 					}
                     else if(d.type == "57" && d.step == '申请人归档'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "50" && d.step == '投标专员标书编制'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "50" && d.step == '投标专员调整申请'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "50" && d.step == '市场研发管理部负责人备案'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "16" && d.step == '合同盖章'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "44" && d.step == '合同盖章'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "67" && d.step == '部门主任'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "67" && d.step == '签约人'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "50" && d.step == '盖章人盖章'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "50" && d.step == '申请人开标'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "50" && d.step == '市场研发管理部负责人'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "55" && d.step == '申请人审批'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "58" && d.remarks == '待处理'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "69" && d.remarks == '待处理'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "71" && d.step == '各级审批'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "60" && d.remarks == '待审批'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "61" && d.step == '行政主管'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "40" && d.step == '主管会计审核'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.remarks == "待归档")
 					{
-					    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+					    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','待归档',false)\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>"
 					}
                     else if(d.remarks == "再次申请" && d.status != "1")
                     {
-                        return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
@@ -733,44 +733,44 @@
 						}
                     }
                     else if(d.type == "66" && d.step == '转正人补充信息'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "40" && d.step == '主管会计审核'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "76" && d.step == '案例审核人审批'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "83"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.type == "84"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
 
                     else if(d.remarks == "待审批" && d.status != "1") {
-                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
                     else if(d.remarks == "待审批" && d.status != "1" && d.type == "76" && d.step == '案例审核人审批') {
-                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
 
                     else{
-                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
                             "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                             "</a>";
                     }
@@ -825,4 +825,4 @@
     });
 </script>
 </body>
-</html>
+</html>