111

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -414,6 +414,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 				variables.put("gzrcount",gzrs.size());*/
 			processType = "reportReview";
 			users.addAll(masters);
+			variables.put("masterList", masters);
+			variables.put("mastercount", masters.size());
 		}
 		for (User u : users){
 			workProjectNotify.setUser(u);
@@ -871,6 +873,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "部门经理审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bmzr";
+						vars.put("bmzrList", auditUsers);
+						vars.put("bmzrcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -887,6 +891,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "审核部审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshbyg";
+						vars.put("bzshbygList", auditUsers);
+						vars.put("bzshbygcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -901,6 +907,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "部门分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshb";
+						vars.put("bzshbList", auditUsers);
+						vars.put("bzshbcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -915,6 +923,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "部门分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "fgld";
+						vars.put("fgldList", auditUsers);
+						vars.put("fgldcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -929,6 +939,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "分管质量副总审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "zlfgld";
+						vars.put("fgzlfzList", auditUsers);
+						vars.put("fgzlfzcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -943,6 +955,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "档案管理员审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bggdgly";
+						vars.put("glydaList", auditUsers);
+						vars.put("glydacount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -957,6 +971,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						notifyRole = "盖章人盖章";
 						workActivityProcess.setIsApproval("1");
 						enname = "gzr";
+						vars.put("gzrList", auditUsers);
+						vars.put("gzrcount",auditUsers.size());
 					} else {
 						workActivityProcess.setIsApproval("2");
 						notifyRole = "调整报告";

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

@@ -772,8 +772,8 @@ public class ProjectcontentinfoController extends BaseController {
 	//
 	@RequestMapping(value = {"saveReport"})
 	public String saveReport(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response,
-							 Model model,RedirectAttributes redirectAttributes) {
-		try{
+							 Model model,RedirectAttributes redirectAttributes) throws Exception {
+//		try{
 			String str = projectcontentinfoService.saveData(projectcontentinfo,2);
 			addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));
 			ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
@@ -785,9 +785,9 @@ public class ProjectcontentinfoController extends BaseController {
 				}
 				return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectcontentinfo/?id="+projectcontentinfo.getId();
 			}
-		}catch (Exception e){
-			logger.error("ProjectcontentinfoController save Exception e"+e);
-		}
+//		}catch (Exception e){
+//			logger.error("ProjectcontentinfoController save Exception e"+e);
+//		}
 		if(UserUtils.isManager()){
 			model.addAttribute("flag","1");
 		}