1111

src/main/java/com/jeeplus/modules/workbidingproject/web/WorkBidingProjectController.java

@@ -12,6 +12,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workbidingproject.entity.WorkBidingProject;
@@ -69,6 +70,7 @@ public class WorkBidingProjectController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkBidingProject workBidingProject, HttpServletRequest request, HttpServletResponse response, Model model) {
 		if(!UserUtils.getSelectOffice().getName().contains("招标")){
+			//不是招标部，-1 代表不显示
 			workBidingProject.setBiddingType("-1");
 			model.addAttribute("status", "1");
 		}else {

src/main/java/com/jeeplus/modules/workbidproject/service/WorkBidProjectService.java

@@ -729,6 +729,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "市场研发管理部负责人备案";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
+						vars.put("scyfglbzrcount",auditUsers.size());
+						vars.put("scyfglbzrList",auditUsers);
+
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
@@ -742,6 +745,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "总经理审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "zjl";
+						vars.put("zjlcount",auditUsers.size());
+						vars.put("zjlList",auditUsers);
+
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
@@ -755,6 +761,8 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "投标专员标书编制";
 						workActivityProcess.setIsApproval("1");
 						enname = "tbzy";
+						vars.put("tbzycount",auditUsers.size());
+						vars.put("tbzyList",auditUsers);
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
@@ -768,6 +776,8 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "市场研发管理部负责人审批";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
+						vars.put("scyfglbzrcount",auditUsers.size());
+						vars.put("scyfglbzrList",auditUsers);
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
@@ -781,6 +791,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "盖章人盖章";
 						workActivityProcess.setIsApproval("1");
 						enname = "gzr";
+						vars.put("gzrcount",auditUsers.size());
+						vars.put("gzrList",auditUsers);
+
 					} else {
 						enname = "不为空";
 						workActivityProcess.setIsApproval("2");
@@ -829,6 +842,8 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 					notifyRole = "申请人开标";
 					workActivityProcess.setIsApproval("1");
 					enname = "sqr";
+
+
 					WorkProjectNotify notify = new WorkProjectNotify();
 					notify.setNotifyId(workBidProject.getId());
 					userList = workProjectNotifyService.readByNotifyId(notify);
@@ -856,6 +871,8 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "市场研发管理部负责人";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
+
+
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
@@ -878,6 +895,8 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 					exp = "pass";
 					workActivityProcess.setCount(0);
 					enname = "fgld";
+
+
 					if (!"yes".equals(workBidProject.getAct().getFlag())) {
 						workBidProject.setStatus("3");
 					}

src/main/java/com/jeeplus/modules/workbidproject/web/WorkBidProjectController.java

@@ -305,23 +305,27 @@ public class  WorkBidProjectController extends BaseController {
 	public String saveAudit(WorkBidProject workBidProject,
 							Model model,
 							RedirectAttributes redirectAttributes) {
-		try {
+//		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workBidProject.getAct().getTaskDefKey();
 			String flag = workBidProject.getAct().getFlag();
 			List<User> users = null;
+			//分管领导
 			if ("fgld".equals(taskDefKey)) {
 				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 2);
 				if (users == null)
 					users = UserUtils.getByRoleActivityEnname("scyfglbzr", 3, workBidProject.getOfficeId(), "16", workBidProject.getCreateBy());
+			//市场部分管领导负责人
 			} else if ("scyfglbzr".equals(taskDefKey)) {
 				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 3);
 				if (users == null)
 					users = UserUtils.getByRoleActivityEnname("zjl", 1, workBidProject.getOfficeId(), "16", workBidProject.getCreateBy());
+			//总经理
 			} else if ("zjl".equals(taskDefKey)) {
 				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 4);
 				if (users == null)
 					users = UserUtils.getByRoleActivityEnname("tbzy", 3, workBidProject.getOfficeId(), "16", workBidProject.getCreateBy());
+			//投标专员
 			} else if ("tbzy".equals(taskDefKey)) {
 				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 5);
 				if (users == null)
@@ -347,9 +351,9 @@ public class  WorkBidProjectController extends BaseController {
 				String str = workBidProjectService.auditSave(workBidProject, users);
 				addMessage(redirectAttributes, str);
 			}
-		} catch (Exception e) {
-			addMessage(redirectAttributes, "审批失败");
-		}
+//		} catch (Exception e) {
+//			addMessage(redirectAttributes, "审批失败");
+//		}
 		if (StringUtils.isNotBlank(workBidProject.getHome()) && "home".equals(workBidProject.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {