待办事项-我发起的存在审核按钮问题修改

src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -35,6 +35,7 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private Date startDate;
 	private Date endDate;
 	private String userName;
+	private String view;
 
 	public WorkProjectNotify() {
 		super();
@@ -178,4 +179,12 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	public void setTypes(String types) {
 		this.types = types;
 	}
+
+	public String getView() {
+		return view;
+	}
+
+	public void setView(String view) {
+		this.view = view;
+	}
 }

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -14,6 +14,7 @@ import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workprojectnotify.dao.WorkProjectNotifyDao;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workreimbursement.utils.HistoicFlowUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +36,8 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 	private OfficeService officeService;
 	@Autowired
 	private UserDao userDao;
+	@Autowired
+	private HistoicFlowUtil histoicFlowUtil;
 
 	public WorkProjectNotify get(String id) {
 		return super.get(id);
@@ -98,7 +101,18 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		page.setCount(count);
 		page.setCountFlag(false);
 		workProjectNotify.setPage(page);
-		page.setList(findReadList(workProjectNotify));
+		List<WorkProjectNotify> listByMine = dao.findReadList(workProjectNotify);
+		for (WorkProjectNotify info: listByMine) {
+			if(StringUtils.isNotBlank(info.getProcessInstanceId())){
+				String histoicFlow = histoicFlowUtil.histoicFlow(info.getProcessInstanceId());
+				if(StringUtils.isNotBlank(histoicFlow)){
+					info.setNotifyRole(histoicFlow);
+				}else{
+					info.setNotifyRole("已结束");
+				}
+			}
+		}
+		page.setList(listByMine);
 		return page;
 	}
 
@@ -113,7 +127,18 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		page.setCount(count);
 		page.setCountFlag(false);
 		workProjectNotify.setPage(page);
-		page.setList(dao.findListByMine(workProjectNotify));
+		List<WorkProjectNotify> listByMine = dao.findListByMine(workProjectNotify);
+		for (WorkProjectNotify info: listByMine) {
+			if(StringUtils.isNotBlank(info.getProcessInstanceId())){
+				String histoicFlow = histoicFlowUtil.histoicFlow(info.getProcessInstanceId());
+				if(StringUtils.isNotBlank(histoicFlow)){
+					info.setNotifyRole(histoicFlow);
+				}else{
+					info.setNotifyRole("已结束");
+				}
+			}
+		}
+		page.setList(listByMine);
 		return page;
 	}
 	public Page<WorkProjectNotify> findPages(Page<WorkProjectNotify> page, WorkProjectNotify workProjectNotify) {

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -934,7 +934,7 @@ public class WorkProjectNotifyController extends BaseController {
 				UserUtils.pushMeIm("");
 			}
 
-			workProjectNotify.setStatus("2");
+			//workProjectNotify.setStatus("2");
 			workProjectNotify.preUpdate();
 			workProjectNotifyService.save(workProjectNotify);
 			if (StringUtils.isNotBlank(workProjectNotify.getType())) {
@@ -957,7 +957,9 @@ public class WorkProjectNotifyController extends BaseController {
 					}else{
 						model.addAttribute("isShow", '0');
 					}
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workreimbursement/workReimbursementFormDetail";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if (workReimbursement.getAct() != null && StringUtils.isNotBlank(workReimbursement.getAct().getTaskDefKey()) && "cw".equals(workReimbursement.getAct().getTaskDefKey())) {
 							return "modules/workreimbursement/workReimbursementCWAudit";
 						}
@@ -976,7 +978,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workContractInfo.setHome("home");
 					workContractInfo.setAct(getByAct(workContractInfo.getProcessInstanceId()));
 					model.addAttribute("workContractInfo", workContractInfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractinfo/workContractInfoLookForm";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if (workContractInfo.getAct() != null) {
 							if ("gzr".equals(workContractInfo.getAct().getTaskDefKey())) {
 								return "modules/workcontractinfo/workContractgzAudit";
@@ -988,8 +992,6 @@ public class WorkProjectNotifyController extends BaseController {
 							return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo?id="+workContractInfo.getAlterBeforeId();
 						}*/
 						return "modules/workcontractinfo/workContractInfoFormEdit";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workcontractinfo/workContractInfoLookForm";
 					}
 				} else if (workProjectNotify.getType().equals("18")) {
 					Company company = companyService.get(workProjectNotify.getNotifyId());
@@ -1009,7 +1011,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workinvoice/workInvoiceView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
@@ -1030,7 +1032,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workinvoice/workInvoiceView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
@@ -1050,7 +1052,7 @@ public class WorkProjectNotifyController extends BaseController {
 					oaLeave.setAct(getByAct(oaLeave.getProcessInstanceId()));
 					oaLeave.setHome("home");
 					model.addAttribute("leave", oaLeave);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/oa/leave/form?id=" + oaLeave.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/oa/leave/leaveTodoList";
@@ -1061,7 +1063,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workOvertimeForm.setAct(getByAct(workOvertimeForm.getProcessInstanceId()));
 					workOvertimeForm.setHome("home");
 					model.addAttribute("workOvertimeForm", workOvertimeForm);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/workovertimeform/workOvertimeForm/form?id=" + workOvertimeForm.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/workovertimeform/workOvertimeForm/workOvertimeTodoList";
@@ -1072,7 +1074,7 @@ public class WorkProjectNotifyController extends BaseController {
 					oaEvection.setAct(getByAct(oaEvection.getProcessInstanceId()));
 					oaEvection.setHome("home");
 					model.addAttribute("oaEvection", oaEvection);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/oa_evection/oaEvection/form?id=" + oaEvection.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/oa_evection/oaEvection/oaEvectionTodoList";
@@ -1083,7 +1085,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workSealForm.setAct(getByAct(workSealForm.getProcessInstanceId()));
 					workSealForm.setHome("home");
 					model.addAttribute("workSealForm", workSealForm);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/worksealform/workSealForm/form?id=" + workSealForm.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/worksealform/workSealForm/workSealFormTodoList";
@@ -1095,7 +1097,7 @@ public class WorkProjectNotifyController extends BaseController {
 					goOut.setAct(getByAct(goOut.getProcessInstanceId()));
 					goOut.setHome("home");
 					model.addAttribute("goOut", goOut);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/goout/goOut/form?id=" + goOut.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/goout/goOut/goOutTodoList";
@@ -1104,7 +1106,7 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("29")) {
 					WorkProjectDeposit workProjectDeposit = workProjectDepositService.get(workProjectNotify.getNotifyId());
 					model.addAttribute("workProjectDeposit", workProjectDeposit);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/workprojectdeposit/workProjectDeposit/form?id=" + workProjectDeposit.getId();
 					}
 				} else if ("32".equals(workProjectNotify.getType())) {
@@ -1112,7 +1114,7 @@ public class WorkProjectNotifyController extends BaseController {
 					oaAll.setAct(getByAct(oaAll.getProcessInstanceId()));
 					oaAll.setHome("home");
 					model.addAttribute("oaAll", oaAll);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/oaall/oaAll/form?id=" + oaAll.getId() + "&tabId=0";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/oaall/oaAll/leaveTodoList";
@@ -1123,7 +1125,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workPettyCash.setAct(getByAct(workPettyCash.getProcessInstanceId()));
 					workPettyCash.setHome("home");
 					model.addAttribute("workPettyCash", workPettyCash);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/workpettycash/workPettyCash/form?id=" + workPettyCash.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/workpettycash/workPettyCash/workPettyCashTodoList";
@@ -1134,7 +1136,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workPayment.setAct(getByAct(workPayment.getProcessInstanceId()));
 					workPayment.setHome("home");
 					model.addAttribute("workPayment", workPayment);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/workpayment/workPayment/form?id=" + workPayment.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/workpayment/workPayment/workPaymentTodoList";
@@ -1145,7 +1147,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workReimbur.setAct(getByAct(workReimbur.getProcessInstanceId()));
 					workReimbur.setHome("home");
 					model.addAttribute("workReimbur", workReimbur);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/workreimbur/workReimbur/form?id=" + workReimbur.getId() + "&name=view";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/workreimbur/workReimbur/workReimburTodoList";
@@ -1156,7 +1158,7 @@ public class WorkProjectNotifyController extends BaseController {
 					oaBuy.setAct(getByAct(oaBuy.getProcessInstanceId()));
 					oaBuy.setHome("home");
 					model.addAttribute("oaBuy", oaBuy);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/oabuy/oaBuy/form?id=" + oaBuy.getId() + "&tabId=0";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/oabuy/oaBuy/oaBuyTodoList";
@@ -1167,7 +1169,7 @@ public class WorkProjectNotifyController extends BaseController {
 					oaPerformance.setAct(getByAct(oaPerformance.getProcessInstanceId()));
 					oaPerformance.setHome("home");
 					model.addAttribute("oaPerformance", oaPerformance);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "redirect:" + Global.getAdminPath() + "/oaperformance/oaPerformance/form?id=" + oaPerformance.getId() + "&tabId=0";
 					} else if (workProjectNotify.getRemarks().contains("待审批")) {
 						//return "redirect:"+Global.getAdminPath()+"/oaperformance/oaPerformance/oaPerformanceTodoList";
@@ -1178,7 +1180,7 @@ public class WorkProjectNotifyController extends BaseController {
 					caseInfo.setHome("home");
 					caseInfo.setAct(getByAct(caseInfo.getProcessInstanceId()));
 					model.addAttribute("caseInfo", caseInfo);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/caseinfo/caseInfoView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/caseinfo/caseInfoAudit";
@@ -1190,7 +1192,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workInvoiceReturn.setHome("home");
 					workInvoiceReturn.setAct(getByAct(workInvoiceReturn.getProcessInstanceId()));
 					model.addAttribute("workInvoiceReturn", workInvoiceReturn);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workinvoicereturn/workInvoiceReturnView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("fpgly".equals(workInvoiceReturn.getAct().getTaskDefKey())) {
@@ -1218,7 +1220,9 @@ public class WorkProjectNotifyController extends BaseController {
 						projectRecords.setHome("home");
 						model.addAttribute("processInstanceId", projectRecords.getProcessInstanceId());
 						model.addAttribute("projectRecords", projectRecords);
-						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/projectrecord/projectRecordsView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/projectrecord/projectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/projectrecord/projectRecordsModify";
@@ -1241,7 +1245,9 @@ public class WorkProjectNotifyController extends BaseController {
 						ruralProjectRecords.setHome("home");
 						model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
 						model.addAttribute("projectRecords", ruralProjectRecords);
-						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/ruralprojectrecords/ruralProjectRecordsView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsModify";
@@ -1266,7 +1272,9 @@ public class WorkProjectNotifyController extends BaseController {
 					followReport.setHome("home");
 					model.addAttribute("processInstanceId", followReport.getProcessInstanceId());
 					model.addAttribute("projectFollowReport",followReport);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/projectrecord/workContentFromAndView/workFollowView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectrecord/workContentFromAndView/workFollowAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectrecord/workContentFromAndView/workFollowModify";
@@ -1288,7 +1296,9 @@ public class WorkProjectNotifyController extends BaseController {
 						projectRecords.setHome("home");
 						model.addAttribute("processInstanceId", projectRecords.getProcessInstanceId());
 						model.addAttribute("projectRecords", projectRecords);
-						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/projectrecord/projectRecordsView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/projectrecord/projectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/projectrecord/projectRecordsModify";
@@ -1311,7 +1321,9 @@ public class WorkProjectNotifyController extends BaseController {
 						ruralProjectRecords.setHome("home");
 						model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
 						model.addAttribute("projectRecords", ruralProjectRecords);
-						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/ruralprojectrecords/ruralProjectRecordsView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsModify";
@@ -1326,7 +1338,9 @@ public class WorkProjectNotifyController extends BaseController {
 					reported.setAct(act);
 					reported.setHome("home");
 					model.addAttribute("ruralProjectRecordsReported", reported);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedModify";
@@ -1369,7 +1383,9 @@ public class WorkProjectNotifyController extends BaseController {
 						projectRecordsAlter.setHome("home");
 						model.addAttribute("processInstanceId", projectRecordsAlter.getProcessInstanceId());
 						model.addAttribute("projectRecordsAlter", projectRecordsAlter);
-						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/projectrecord/projectRecordsAlterView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/projectrecord/projectRecordsAlterAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/projectrecord/projectRecordsAlterModify";
@@ -1391,7 +1407,9 @@ public class WorkProjectNotifyController extends BaseController {
 						ruralProjectRecordsAlter.setHome("home");
 						model.addAttribute("processInstanceId", ruralProjectRecordsAlter.getProcessInstanceId());
 						model.addAttribute("projectRecordsAlter", ruralProjectRecordsAlter);
-						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/ruralprojectrecords/ruralProjectRecordsAlterView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsAlterAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsAlterModify";
@@ -1404,7 +1422,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workContractRecord.setAct(getByAct(workContractRecord.getProcessInstanceId()));
 					workContractRecord.setHome("home");
 					model.addAttribute("workContractRecord", workContractRecord);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractrecord/workContractView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractrecord/workContractRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractrecord/workContractRecordModifyApply";
@@ -1416,7 +1436,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workContractBorrow.setAct(getByAct(workContractBorrow.getProcessInstanceId()));
 					workContractBorrow.setHome("home");
 					model.addAttribute("workContractBorrow", workContractBorrow);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workContractBorrow/workContractBorrowView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workContractBorrow/workContractBorrowAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workContractBorrow/workContractBorrowModify";
@@ -1429,7 +1451,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workContractSignature.setHome("home");
 					model.addAttribute("processInstanceId", workContractSignature.getProcessInstanceId());
 					model.addAttribute("workContractSignature", workContractSignature);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractsignature/workContractSignatureView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractsignature/workContractSignatureAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractsignature/workContractSignatureModifyApply";
@@ -1441,7 +1465,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workReceiptsRevise.setAct(getByAct(workReceiptsRevise.getProcessInstanceId()));
 					workReceiptsRevise.setHome("home");
 					model.addAttribute("workReceiptsRevise", workReceiptsRevise);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workreceiptsrevise/workReceiptsReviseView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workreceiptsrevise/workReceiptsReviseAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workreceiptsrevise/workReceiptsReviseModify";
@@ -1453,7 +1479,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workReceiptsRevise.setAct(getByAct(workReceiptsRevise.getInvalidProcessInstanceId()));
 					workReceiptsRevise.setHome("home");
 					model.addAttribute("workReceiptsRevise", workReceiptsRevise);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workreceiptsrevise/workReceiptsReviseView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workreceiptsrevise/workReceiptsReviseInvalidAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workreceiptsrevise/workReceiptsReviseInvalidModify";
@@ -1465,7 +1493,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workInvoiceAlter.setAct(getByAct(workInvoiceAlter.getProcessInstanceId()));
 					workInvoiceAlter.setHome("home");
 					model.addAttribute("workInvoiceAlter", workInvoiceAlter);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workinvoicealter/workInvoiceViewa";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workinvoicealter/workInvoiceAudita";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workinvoicealter/workInvoiceModifya";
@@ -1477,7 +1507,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workInvoiceReturnAlter.setAct(getByAct(workInvoiceReturnAlter.getProcessInstanceId()));
 					workInvoiceReturnAlter.setHome("home");
 					model.addAttribute("workInvoiceReturnAlter", workInvoiceReturnAlter);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workinvoicereturnalter/workInvoiceReturnAlterView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workinvoicereturnalter/workInvoiceReturnAlterAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workinvoicereturnalter/workInvoiceReturnAlterModify";
@@ -1489,7 +1521,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workContractInfo.setHome("home");
 					workContractInfo.setAct(getByAct(workContractInfo.getAlterProcessInstanceId()));
 					model.addAttribute("workContractInfo", workContractInfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractinfo/workContractInfoLookForm";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if (workContractInfo.getAct() != null) {
 							if ("gzr".equals(workContractInfo.getAct().getTaskDefKey())) {
 								return "modules/workcontractinfo/contractgzAlterAudit";
@@ -1501,8 +1535,6 @@ public class WorkProjectNotifyController extends BaseController {
 							return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo?id="+workContractInfo.getAlterBeforeId();
 						}*/
 						return "modules/workcontractinfo/workContractInfoFormEdita";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workcontractinfo/workContractInfoLookForm";
 					}
 				} else if (workProjectNotify.getType().equals("43")) {    //合同作废
 					WorkContractInfo workContractInfo = workContractInfoService.get(workProjectNotify.getNotifyId());
@@ -1525,7 +1557,9 @@ public class WorkProjectNotifyController extends BaseController {
 					String taskDefKey = workContractInfo.getAct().getTaskDefKey();
 
 					model.addAttribute("workContractInfo", workContractInfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractinfo/workContractInfoLookForm";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractinfo/" + view;
 					} else if (("3").equals(workContractInfo.getInvalidateStatus())) {
 						return "modules/workcontractinfo/contractInvalidateFormModify";
@@ -1559,7 +1593,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
 					model.addAttribute("type", type);
 					model.addAttribute("list", workReviewAudits);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/projectcontentinfo/reportView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/reportAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/reportModifyApply";
@@ -1587,7 +1623,9 @@ public class WorkProjectNotifyController extends BaseController {
 					String taskDefKey = workContractInfo.getAct().getTaskDefKey();
 
 					model.addAttribute("workContractInfo", workContractInfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractinfo/workContractInfoLookForm";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractinfo/" + view;
 					} else if (("3").equals(workContractInfo.getInvalidateStatus())) {
 						return "modules/workcontractinfo/contractInvalidateFormModify";
@@ -1656,7 +1694,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
 					model.addAttribute("type", type);
 					model.addAttribute("list", workReviewAudits);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify";
@@ -1690,7 +1730,11 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("list", workReviewAudits);
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						ProjectReportData beforeEntity = projectReportChangeService.getBefore(projectReportData.getBeforeEntity().getId());
+						projectReportData.setBeforeEntity(beforeEntity);
+						return "modules/projectcontentinfo/reportChangeView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/reportChangeAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/reportChangeModifyApply";
@@ -1708,7 +1752,9 @@ public class WorkProjectNotifyController extends BaseController {
 					projectcontentinfo.setHome("home");
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/projectcontentinfo/reportInvalidView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/reportInvalidAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/reportInvalidModifyApply";
@@ -1720,7 +1766,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workBidProject.setAct(getByAct(workBidProject.getProcessInstanceId()));
 					workBidProject.setHome("home");
 					model.addAttribute("workBidProject", workBidProject);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workbidproject/workBidProjectView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("zjl".equals(workBidProject.getAct().getTaskDefKey())) {
 							return "modules/workbidproject/workBidProjectzjlAudit";
 						} else if ("tbzy".equals(workBidProject.getAct().getTaskDefKey())) {
@@ -1773,7 +1821,9 @@ public class WorkProjectNotifyController extends BaseController {
 
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/projectReportRecordModifyApply";
@@ -1787,7 +1837,9 @@ public class WorkProjectNotifyController extends BaseController {
 					projectReportRecord.setAct(act);
 					projectReportRecord.setHome("home");
 					model.addAttribute("projectReportRecord", projectReportRecord);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/processProjectReportRecord/projectReportRecordView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/processProjectReportRecord/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/processProjectReportRecord/projectReportRecordModifyApply";
@@ -1800,7 +1852,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workReceiptsSettle.setAct(act);
 					workReceiptsSettle.setHome("home");
 					model.addAttribute("workReceiptsSettle", workReceiptsSettle);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workreceiptssettle/workReceiptsSettleView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("fpgly".equals(workReceiptsSettle.getAct().getTaskDefKey())) {
 							return "modules/workreceiptssettle/workReceiptsSettleKPAudit";
 						} else if ("cn".equals(act.getTaskDefKey())) {
@@ -1833,7 +1887,9 @@ public class WorkProjectNotifyController extends BaseController {
                         workIncomingMessage.setDetailList(list);
                     }
 					model.addAttribute("workIncomingMessage", workIncomingMessage);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workincomingmessage/workIncomingMessageView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workincomingmessage/workIncomingMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workincomingmessage/workIncomingMessageModifyApply";
@@ -1846,7 +1902,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workAdministrativeAtamp.setAct(act);
 					workAdministrativeAtamp.setHome("home");
 					model.addAttribute("workAdministrativeAtamp", workAdministrativeAtamp);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workadministrativeatamp/workAdministrativeAtampView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workadministrativeatamp/workAdministrativeAtampAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workadministrativeatamp/workAdministrativeAtampModifyApply";
@@ -1858,7 +1916,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workStockContract.setAct(getByAct(workStockContract.getProcessInstanceId()));
 					workStockContract.setHome("home");
 					model.addAttribute("workStockContract", workStockContract);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workstockcontract/workStockContractView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("gzr".equals(workStockContract.getAct().getTaskDefKey())) {
 							return "modules/workstockcontract/workStockContractgzAudit";
 						} else if ("sqr".equals(workStockContract.getAct().getTaskDefKey())) {
@@ -1892,7 +1952,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workBorrowMangement.setAct(act);
 					workBorrowMangement.setHome("home");
 					model.addAttribute("workBorrowMangement", workBorrowMangement);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workborrowmangement/workBorrowMangementView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workborrowmangement/workBorrowMangementAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workborrowmangement/workBorrowMangementModifyApply";
@@ -1908,7 +1970,13 @@ public class WorkProjectNotifyController extends BaseController {
 					workSendMessage.setAct(act);
 					workSendMessage.setHome("home");
 					model.addAttribute("workSendMessage", workSendMessage);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						if (UserUtils.getUser().getId().equals(workSendMessage.getCreateBy().getId())) {
+							return "modules/worksendmessage/workSendMessageView";
+						} else {
+							return "modules/worksendmessage/workSendMessageMemberView";
+						}
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/worksendmessage/workSendMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/worksendmessage/workSendMessageModifyApply";
@@ -1928,12 +1996,14 @@ public class WorkProjectNotifyController extends BaseController {
                     oaNotify.setAct(act);
                     oaNotify.setHome("home");
                     model.addAttribute("oaNotify", oaNotify);
-                    if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/oa/oaNotifyView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
                         return "modules/oa/oaNotifyAudit";
                     } else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
                         return "modules/oa/oaNotifyModifyApply";
                     } else {
-                        return "modules/oa/oaNotifyView";
+						return "modules/oa/oaNotifyView";
                     }
                 } else if ("60".equals(workProjectNotify.getType())) {    //归还借用管理
 					WorkBorrowBack workBorrowBack = workBorrowBackService.get(workProjectNotify.getNotifyId());
@@ -1943,7 +2013,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workBorrowBack.setAct(act);
 					workBorrowBack.setHome("home");
 					model.addAttribute("workBorrowBack", workBorrowBack);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workborrowmangement/workBorrowBackView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workborrowmangement/workBorrowBackAudit";
 					} else {
 						return "modules/workborrowmangement/workBorrowBackView";
@@ -1953,7 +2025,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workStock.setAct(getByAct(workStock.getProcessInstanceId()));
 					workStock.setHome("home");
 					model.addAttribute("workStock", workStock);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workstock/workStockView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("xzzg".equals(workStock.getAct().getTaskDefKey())) {
 							if (workStock.getAcceptDate() == null) {
 								workStock.setAcceptDate(new Date());
@@ -1989,7 +2063,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workScrap.setAct(getByAct(workScrap.getProcessInstanceId()));
 					workScrap.setHome("home");
 					model.addAttribute("workScrap", workScrap);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workscrap/workScrapView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workscrap/workScrapAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workscrap/workScrapModify";
@@ -2006,7 +2082,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<WorkItemCollarItem> workItemCollarItem = workItemCollarService.findWorkItemCollarItemList(workItemCollar);
 					workItemCollar.setWorkItemCollarItemList(workItemCollarItem);
 					model.addAttribute("workItemCollar", workItemCollar);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workitemcollar/workItemCollarView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workitemcollar/workItemCollarAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workitemcollar/workItemCollarModifyApply";
@@ -2023,7 +2101,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<WorkRegularScore> workRegularScoreList = workRegularScoreService.findList(workRegularScore);
 					workRegularApply.setWorkRegularScoreList(workRegularScoreList);
 					model.addAttribute("workRegularApply", workRegularApply);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workregularapply/workRegularApplyView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workregularapply/workRegularApplyAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workregularapply/workRegularApplyModifyApply";
@@ -2040,7 +2120,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<WorkOfficeChangeUser> workOfficeChangeUserList = workOfficeChangeUserService.findList(workOfficeChangeUser);
 					workOfficeChange.setWorkOfficeChangeUserList(workOfficeChangeUserList);
 					model.addAttribute("workOfficeChange", workOfficeChange);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workofficechange/workOfficeChangeView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workofficechange/workOfficeChangeAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workofficechange/workOfficeChangeModifyApply";
@@ -2092,7 +2174,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<WorkChangeJobUser> workChangeJobUserList = workChangeJobUserService.findList(WorkChangeJobUser);
 					workChangeJob.setWorkChangeJobUserList(workChangeJobUserList);
 					model.addAttribute("workChangeJob", workChangeJob);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workchangejob/workChangeJobView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workchangejob/workChangeJobAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workchangejob/workChangeJobModifyApply";
@@ -2104,19 +2188,23 @@ public class WorkProjectNotifyController extends BaseController {
 					workContractInfo.setHome("home");
 					workContractInfo.setAct(getByAct(workContractInfo.getProcessInstanceId()));
 					model.addAttribute("workContractInfo", workContractInfo);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workcontractinfo/workContractInfoLookForm";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractinfo/workContractCompletionAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractinfo/workContractCompletionAudit";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workcontractinfo/workContractInfoLookForm";
 					}
 				}else if ("76".equals(workProjectNotify.getType())) {
 					WorkExample workExample = workExampleService.get(workProjectNotify.getNotifyId());
 					workExample.setHome("home");
 					workExample.setAct(getByAct(workExample.getProcessInstanceId()));
 					model.addAttribute("workExample", workExample);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						model.addAttribute("workExample", workExample);
+						model.addAttribute("sign", "view");
+						return "modules/workexample/workExampleIndex";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("workExample", workExample);
 						model.addAttribute("sign", "audit");
 						return "modules/workexample/workExampleIndex";
@@ -2124,10 +2212,6 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("workExample", workExample);
 						model.addAttribute("sign", "modify");
 						return "modules/workexample/workExampleIndex";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						model.addAttribute("workExample", workExample);
-						model.addAttribute("sign", "view");
-						return "modules/workexample/workExampleIndex";
 					}
 				}else if ("75".equals(workProjectNotify.getType())) {    //加入企业
 					Useroffice useroffice = userofficeService.get(workProjectNotify.getNotifyId());
@@ -2135,7 +2219,20 @@ public class WorkProjectNotifyController extends BaseController {
 					useroffice.setAct(act);
 					useroffice.setHome("home");
 					model.addAttribute("useroffice", useroffice);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						Office office = officeService.get(useroffice.getCompanyId());
+						User user = UserUtils.get(useroffice.getUserId());
+						if(StringUtils.isNotBlank(useroffice.getMaster())){
+							User master =  UserUtils.get(useroffice.getMaster());
+							useroffice.setMasterName(master.getName());
+						}
+
+						model.addAttribute("companyinfo", useroffice);
+						model.addAttribute("office", office);
+						model.addAttribute("user", user);
+						model.addAttribute("disabled",true);
+						return "modules/sys/companyinfoView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						Office office = officeService.get(useroffice.getCompanyId());
 						User user = UserUtils.get(UserUtils.getUser().getId());
 						model.addAttribute("user", user);
@@ -2171,7 +2268,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workRelationship.setHome("home");
 					workRelationship.setAct(getByAct(workRelationship.getProcessInstanceId()));
 					model.addAttribute("workRelationship", workRelationship);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workrelationship/workRelationshipView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("rlzybzr".equals(workRelationship.getAct().getTaskDefKey())) {
@@ -2191,7 +2288,7 @@ public class WorkProjectNotifyController extends BaseController {
 					workRelationship.setHome("home");
 					workRelationship.setAct(getByAct(workRelationship.getProcessInstanceId()));
 					model.addAttribute("workRelationship", workRelationship);
-					if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workrelationship/workRelationshipView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workrelationship/workRelationshipAuditFirst";
@@ -2201,7 +2298,7 @@ public class WorkProjectNotifyController extends BaseController {
 				}else if("74".equals(workProjectNotify.getType())){//系统预警
 					SysWarning sysWarning =sysWarningService.get(workProjectNotify.getNotifyId());
 					model.addAttribute("sysWarning", sysWarning);
-					if(workProjectNotify.getRemarks().contains("待通知")){
+					if(workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())){
 						return "modules/syswarning/sysWarningLookForm";
 					}
 				}
@@ -2211,7 +2308,9 @@ public class WorkProjectNotifyController extends BaseController {
 					workResignation.setAct(act);
 					workResignation.setHome("home");
 					model.addAttribute("workResignation", workResignation);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workresignation/workResignationView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("bmzr".equals(workResignation.getAct().getTaskDefKey()) || "fgld".equals(workResignation.getAct().getTaskDefKey()) ||"zjl".equals(workResignation.getAct().getTaskDefKey()) ) {
 							return "modules/workresignation/workResignationAudit";
 						} else {
@@ -2237,12 +2336,12 @@ public class WorkProjectNotifyController extends BaseController {
 					workOvertime.setHome("home");
 					workOvertime.setAct(getByAct(workOvertime.getProcessInstanceId()));
 					model.addAttribute("workOvertime", workOvertime);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workovertime/workOvertimeView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workovertime/workOvertimeAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workovertime/workOvertimeModify";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workovertime/workOvertimeView";
 					}
 				}
 				else if ("78".equals(workProjectNotify.getType())) {//出差
@@ -2250,12 +2349,12 @@ public class WorkProjectNotifyController extends BaseController {
 					workOut.setHome("home");
 					workOut.setAct(getByAct(workOut.getProcessInstanceId()));
 					model.addAttribute("workOut", workOut);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workout/workOutView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workout/workOutAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workout/workOutModify";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workout/workOutView";
 					}
 				}
 				else if ("79".equals(workProjectNotify.getType())) {//外勤
@@ -2263,12 +2362,12 @@ public class WorkProjectNotifyController extends BaseController {
 					workField.setHome("home");
 					workField.setAct(getByAct(workField.getProcessInstanceId()));
 					model.addAttribute("workField", workField);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workfield/workFieldView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workfield/workFieldAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workfield/workFieldModify";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workfield/workFieldView";
 					}
 				}else if ("80".equals(workProjectNotify.getType())||"81".equals(workProjectNotify.getType())||"82".equals(workProjectNotify.getType())) {    //请假
 					LeaveApply leaveApply = leaveApplyService.get(workProjectNotify.getNotifyId());
@@ -2284,7 +2383,9 @@ public class WorkProjectNotifyController extends BaseController {
 					List<LeaveDetail> hisList=leaveDetailDao.findListHis(leaveApply.getStaffId());
 					leaveApply.setHisLeaveDetailList(hisList);
 					model.addAttribute("leaveApply", leaveApply);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/leaveapply/leaveApplyView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/leaveapply/leaveApplyAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						if ("81".equals(workProjectNotify.getType())){
@@ -2316,34 +2417,34 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("workSingleWage", workSingleWage);
 					model.addAttribute("nowm", map.get("1"));
 					model.addAttribute("oldm", map.get("2"));
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workfield/workSingleWageView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/worksinglewage/workSingleWageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/worksinglewage/workSingleWageModifyApply";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workfield/workSingleWageView";
 					}
 				}else if ("87".equals(workProjectNotify.getType())) {//借款
 					WorkLoan workLoan = workLoanService.get(workProjectNotify.getNotifyId());
 					workLoan.setHome("home");
 					workLoan.setAct(getByAct(workLoan.getProcessInstanceId()));
 					model.addAttribute("workLoan", workLoan);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/workloan/workLoanView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workloan/workLoanAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workloan/workLoanModify";
-					} else if (workProjectNotify.getRemarks().contains("待通知")) {
-						return "modules/workloan/workLoanView";
 					}
 				}else if ("88".equals(workProjectNotify.getType())) {//借款
 					WorkRepay workRepay = workRepayService.get(workProjectNotify.getNotifyId());
 					workRepay.setHome("home");
 					workRepay.setAct(getByAct(workRepay.getProcessInstanceId()));
 					model.addAttribute("workRepay", workRepay);
-					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						return "modules/workrepay/workRepayAudit";
-					}else if (workProjectNotify.getRemarks().contains("待通知")) {
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workrepay/workRepayView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						return "modules/workrepay/workRepayAudit";
 					}
 				}
 			}

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -355,19 +355,21 @@
 
 	<update id="update">
 		UPDATE work_project_notify SET 	
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			remarks = #{remarks},
-			company_id = #{companyId},
-			title = #{title},
-			content = #{content},
-			type = #{type},
-			notify_user = #{user.id},
-			notify_id = #{notifyId},
-			notify_role = #{notifyRole},
-			status = #{status},
-			kind = #{kind},
-			officeId = #{officeId}
+			update_by = #{updateBy.id}
+			,update_date = #{updateDate}
+			,remarks = #{remarks}
+			,company_id = #{companyId}
+			,title = #{title}
+			,content = #{content}
+			,type = #{type}
+			,notify_user = #{user.id}
+			,notify_id = #{notifyId}
+			,notify_role = #{notifyRole}
+			<if test="status != null and status != ''">
+				,status = #{status}
+			</if>
+			,kind = #{kind}
+			,officeId = #{officeId}
 			<if test="processInstanceId != null and processInstanceId != ''">
 				,process_instance_id = #{processInstanceId}
 			</if>
@@ -572,6 +574,7 @@
 	<select id="findListByMine" resultType="WorkProjectNotify" >
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
+		,a.process_instance_id as "processInstanceId"
 		FROM work_project_notify a
 		<if test="userName != null and userName != ''">
 			LEFT JOIN sys_user u ON u.id = a.create_by

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -128,7 +128,7 @@
 								</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>

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

@@ -462,182 +462,9 @@
                         return "<span title='"+ d.step +"'>" + d.step + "</span>";
                     }}
                 ,{align:'center', title: '标题', minWidth:150,templet:function(d){
-
-                    if(d.type == "6")
-					{
-					    if( d.status != 1 )
-						{
-						    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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%')\">" +
-                                "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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)\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
-                    }
-                    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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
-                    }
+					return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&view=view','95%','95%')\">" +
+						"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+						"</a>";
                     }}
                 ,{align:'center',title: '内容', minWidth:150,templet:function(d){
                         return "<span title='"+ d.content +"'>" + d.content + "</span>";

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

@@ -462,182 +462,9 @@
                         return "<span title='"+ d.step +"'>" + d.step + "</span>";
                     }}
                 ,{align:'center', title: '标题', minWidth:150,templet:function(d){
-
-                    if(d.type == "6")
-					{
-					    if( d.status != 1 )
-						{
-						    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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%')\">" +
-                                "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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)\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
-                    }
-                    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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<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%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
-                    }
+					return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&view=view','95%','95%')\">" +
+						"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+						"</a>";
                     }}
                 ,{align:'center',title: '内容', minWidth:150,templet:function(d){
                         return "<span title='"+ d.content +"'>" + d.content + "</span>";