报告流程修改

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

@@ -288,11 +288,11 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 		}else {
 			this.save(projectReportData);
 		}
-		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> bzshbygs = UserUtils.getByRoleActivityEnname("bzshbyg",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> bzshbygs = UserUtils.getByRoleActivityEnname("bzshbyg",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		List<User> bzshbs = UserUtils.getByRoleActivityEnname("bzshb",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> fgzlfzs = UserUtils.getByRoleActivityEnname("zlfgld",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> fgzlfzs = UserUtils.getByRoleActivityEnname("zlfgld",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		List<User> glydas = UserUtils.getByRoleActivityEnname("bggdgly",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		List<User> gzrs = UserUtils.getByRoleActivityEnname("gzr",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 
@@ -372,7 +372,7 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 				variables.put("fgzlfzcount",fgzlfzs.size());
 				variables.put("glydacount",glydas.size());
 				variables.put("gzrcount",gzrs.size());*/
-			processType = "reportChangeReview";
+			processType = "reportAudit";
 			users.addAll(masters);
 			variables.put("masterList", masters);
 			variables.put("mastercount", masters.size());
@@ -422,22 +422,22 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 			workActivityProcessService.insert(workActivityProcess);
 			workActivityProcess.setCount(4);
 			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(5);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(6);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(7);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(8);
-			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(5);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(6);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(7);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(8);
+//			workActivityProcessService.insert(workActivityProcess);
 			workActivityProcessService.insertAuditsByType(masters,processInstance.getId(),1,1);
-			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),2,0);
-			workActivityProcessService.insertAuditsByType(bzshbygs,processInstance.getId(),3,0);
-			workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),4,0);
-			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),5,0);
-			workActivityProcessService.insertAuditsByType(fgzlfzs,processInstance.getId(),6,0);
-			workActivityProcessService.insertAuditsByType(glydas,processInstance.getId(),7,0);
-			workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),8,0);
+//			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),2,0);
+//			workActivityProcessService.insertAuditsByType(bzshbygs,processInstance.getId(),3,0);
+			workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),2,0);
+//			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),5,0);
+//			workActivityProcessService.insertAuditsByType(fgzlfzs,processInstance.getId(),6,0);
+			workActivityProcessService.insertAuditsByType(glydas,processInstance.getId(),4,0);
+			workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),3,0);
 		}
 		return "true";
 	}
@@ -559,7 +559,7 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 		selectProcess.setProcessInstanceId(projectReportData.getProcessInstanceId());
 		List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
 		List<Activity> activities = workActivityMenu.getActivities();
-		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportChangeReview")) {
+		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportAudit")) {
 			key = 1;
 			for (int i = 0; i < workActivityProcesses.size(); i++) {
 				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -604,7 +604,7 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 				}
 			}
 		} else {
-			workActivityMenu.setProcessType("reportChangeReview");
+			workActivityMenu.setProcessType("reportAudit");
 			for (int i = 0; i < workActivityProcesses.size(); i++) {
 				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
 				String count = activityProcess.getCount() + "";
@@ -619,41 +619,7 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),2,1);
 
-						notifyRole = "部门经理审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "bmzr";
-						vars.put("bmzrList", auditUsers);
-						vars.put("bmzrcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				}
-				// 审核环节
-				else if ("bmzr".equals(taskDefKey) && count.contains("2")) {
-					taskCount = "2";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),3,1);
-
-						notifyRole = "审核部审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "bzshbyg";
-						vars.put("bzshbygList", auditUsers);
-						vars.put("bzshbygcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				} else if ("bzshbyg".equals(taskDefKey) && count.contains("3")) {
-					taskCount = "3";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),4,1);
-
-						notifyRole = "部门分管领导审核";
+						notifyRole = "标准审核部审批";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshb";
 						vars.put("bzshbList", auditUsers);
@@ -663,72 +629,24 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						workActivityProcess.setIsApproval("2");
 					}
 					break;
-				}else if ("bzshb".equals(taskDefKey) && count.contains("4")) {
-					taskCount = "4";
+				}else if ("bzshb".equals(taskDefKey) && count.contains("2")) {
+					taskCount = "2";
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),5,1);
 
-						notifyRole = "部门分管领导审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "fgld";
-						vars.put("fgldList", auditUsers);
-						vars.put("fgldcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				}else if ("fgld".equals(taskDefKey) && count.contains("4")) {
-					taskCount = "5";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),6,1);
-
-						notifyRole = "分管质量副总审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "zlfgld";
-						vars.put("fgzlfzList", auditUsers);
-						vars.put("fgzlfzcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				} else if ("fgzlfz".equals(taskDefKey) && count.contains("5")) {
-					taskCount = "6";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),7,1);
-
-						notifyRole = "档案管理员审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "bggdgly";
-						vars.put("glydaList", auditUsers);
-						vars.put("glydacount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				} else if ("glyda".equals(taskDefKey) && count.contains("6")) {
-					taskCount = "7";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),8,1);
-
 						notifyRole = "盖章人盖章";
 						workActivityProcess.setIsApproval("1");
 						enname = "gzr";
 						vars.put("gzrList", auditUsers);
 						vars.put("gzrcount",auditUsers.size());
 					} else {
-						workActivityProcess.setIsApproval("2");
 						notifyRole = "调整报告";
+						workActivityProcess.setIsApproval("2");
 					}
 					break;
-				} else if ("gzr".equals(taskDefKey) && count.contains("7")) {
-					taskCount = "8";
+				}else if ("gzr".equals(taskDefKey) && count.contains("3")) {
+					taskCount = "3";
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						notifyRole = "审批通过";
@@ -807,7 +725,7 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 			}
 			workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
 		} else {
-			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportChangeReview")) {
+			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportAudit")) {
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(projectReportData.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);

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

@@ -330,12 +330,12 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		}else {
 			this.save(projectReportData);
 		}
-		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> bzshbygs = UserUtils.getByRoleActivityEnname("bzshbyg",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> bzshbygs = UserUtils.getByRoleActivityEnname("bzshbyg",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		List<User> bzshbs = UserUtils.getByRoleActivityEnname("bzshb",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> fgzlfzs = UserUtils.getByRoleActivityEnname("zlfgld",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-		List<User> glydas = UserUtils.getByRoleActivityEnname("bggdgly",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> fgzlfzs = UserUtils.getByRoleActivityEnname("zlfgld",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+//		List<User> glydas = UserUtils.getByRoleActivityEnname("bggdgly",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		List<User> gzrs = UserUtils.getByRoleActivityEnname("gzr",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 			workProjectNotify.setNotifyRole("");
@@ -415,7 +415,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 				variables.put("fgzlfzcount",fgzlfzs.size());
 				variables.put("glydacount",glydas.size());
 				variables.put("gzrcount",gzrs.size());*/
-			processType = "reportReview";
+			processType = "reportAudit";
 			users.addAll(masters);
 			variables.put("masterList", masters);
 			variables.put("mastercount", masters.size());
@@ -468,24 +468,24 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 			workActivityProcessService.insert(workActivityProcess);
 			workActivityProcess.setCount(3);
 			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(4);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(5);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(6);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(7);
-			workActivityProcessService.insert(workActivityProcess);
-			workActivityProcess.setCount(8);
-			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(4);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(5);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(6);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(7);
+//			workActivityProcessService.insert(workActivityProcess);
+//			workActivityProcess.setCount(8);
+//			workActivityProcessService.insert(workActivityProcess);
 			workActivityProcessService.insertAuditsByType(masters,processInstance.getId(),1,1);
-			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),2,0);
-			workActivityProcessService.insertAuditsByType(bzshbygs,processInstance.getId(),3,0);
-			workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),4,0);
-			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),5,0);
-			workActivityProcessService.insertAuditsByType(fgzlfzs,processInstance.getId(),6,0);
-			workActivityProcessService.insertAuditsByType(glydas,processInstance.getId(),7,0);
-			workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),8,0);
+//			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),2,0);
+//			workActivityProcessService.insertAuditsByType(bzshbygs,processInstance.getId(),3,0);
+			workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),2,0);
+//			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),5,0);
+//			workActivityProcessService.insertAuditsByType(fgzlfzs,processInstance.getId(),6,0);
+//			workActivityProcessService.insertAuditsByType(glydas,processInstance.getId(),4,0);
+			workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),3,0);
 		}
        /* logger.info("保存数据："+(s2-s1)+"[ms],查询每个节点的审批用户列表"+(s3-s2)+
                 "[ms],工作流加入参数:"+(s4-s3)+"[ms],发送推送IM APP消息："+(s5-s4)+
@@ -813,7 +813,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		selectProcess.setProcessInstanceId(projectReportData.getProcessInstanceId());
 		List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
 		List<Activity> activities = workActivityMenu.getActivities();
-		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportReview")) {
+		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportAudit")) {
 			key = 1;
 			for (int i = 0; i < workActivityProcesses.size(); i++) {
 				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -858,7 +858,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 				}
 			}
 		} else {
-			workActivityMenu.setProcessType("reportReview");
+			workActivityMenu.setProcessType("reportAudit");
 			for (int i = 0; i < workActivityProcesses.size(); i++) {
 				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
 				String count = activityProcess.getCount() + "";
@@ -873,41 +873,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),2,1);
 
-						notifyRole = "部门经理审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "bmzr";
-						vars.put("bmzrList", auditUsers);
-						vars.put("bmzrcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				}
-				// 审核环节
-				else if ("bmzr".equals(taskDefKey) && count.contains("2")) {
-					taskCount = "2";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),3,1);
-
-						notifyRole = "审核部审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "bzshbyg";
-						vars.put("bzshbygList", auditUsers);
-						vars.put("bzshbygcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				} else if ("bzshbyg".equals(taskDefKey) && count.contains("3")) {
-					taskCount = "3";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),4,1);
-
-						notifyRole = "部门分管领导审核";
+						notifyRole = "标准审核部审批";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshb";
 						vars.put("bzshbList", auditUsers);
@@ -917,72 +883,24 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						workActivityProcess.setIsApproval("2");
 					}
 					break;
-				}else if ("bzshb".equals(taskDefKey) && count.contains("4")) {
-					taskCount = "4";
+				}else if ("bzshb".equals(taskDefKey) && count.contains("2")) {
+					taskCount = "2";
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),5,1);
 
-						notifyRole = "部门分管领导审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "fgld";
-						vars.put("fgldList", auditUsers);
-						vars.put("fgldcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				}else if ("fgld".equals(taskDefKey) && count.contains("4")) {
-					taskCount = "5";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),6,1);
-
-						notifyRole = "分管质量副总审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "zlfgld";
-						vars.put("fgzlfzList", auditUsers);
-						vars.put("fgzlfzcount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				} else if ("fgzlfz".equals(taskDefKey) && count.contains("5")) {
-					taskCount = "6";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),7,1);
-
-						notifyRole = "档案管理员审核";
-						workActivityProcess.setIsApproval("1");
-						enname = "bggdgly";
-						vars.put("glydaList", auditUsers);
-						vars.put("glydacount",auditUsers.size());
-					} else {
-						notifyRole = "调整报告";
-						workActivityProcess.setIsApproval("2");
-					}
-					break;
-				} else if ("glyda".equals(taskDefKey) && count.contains("6")) {
-					taskCount = "7";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),8,1);
-
 						notifyRole = "盖章人盖章";
 						workActivityProcess.setIsApproval("1");
 						enname = "gzr";
 						vars.put("gzrList", auditUsers);
 						vars.put("gzrcount",auditUsers.size());
 					} else {
-						workActivityProcess.setIsApproval("2");
 						notifyRole = "调整报告";
+						workActivityProcess.setIsApproval("2");
 					}
 					break;
-				} else if ("gzr".equals(taskDefKey) && count.contains("7")) {
-					taskCount = "8";
+				} else if ("gzr".equals(taskDefKey) && count.contains("3")) {
+					taskCount = "3";
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						notifyRole = "审批通过";
@@ -1059,7 +977,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 			}
 			workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
 		} else {
-			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportReview")) {
+			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportAudit")) {
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(projectReportData.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);

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

@@ -825,16 +825,16 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			content.setOfficeId(office.getId());
 			content.setProject(projectcontentinfo.getProject());
 			content.setInfoId(infoId);
-			content.setName("一级复核");
+			content.setName("项目负责人复核");
 			content.setSort(420);
 			content.setDictType("2");
 			this.insertChange(content);
-			content.setDictType("3");
-			content.setName("二级复核");
-			content.setSort(430);
-			this.insertChange(content);
+//			content.setDictType("3");
+//			content.setName("二级复核");
+//			content.setSort(430);
+//			this.insertChange(content);
 			content.setDictType("4");
-			content.setName("校核");
+			content.setName("总审部校核");
 			content.setSort(440);
 			this.insertChange(content);
 			List<ProjectBasedData> list2 = projectcontentinfo.getProjectReportData().getProjectBasedDataList();

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

@@ -870,33 +870,15 @@ public class ProjectcontentinfoController extends BaseController {
 		if ("master".equals(taskDefKey)){
 			users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
 			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("bmzr",2,t.getOfficeId(),"12",t.getCreateBy());
-		}else if ("bmzr".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),3);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("bzshbyg",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("bzshbyg".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),4);
-			if (users==null )
 				users = UserUtils.getByRoleActivityEnname("bzshb",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("bzshb".equals(taskDefKey)){
+		}else if ("bzshb".equals(taskDefKey)){
 			users = UserUtils.getByProssType(t.getProcessInstanceId(),5);
 			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("fgld",2,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("fgld".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),6);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("zlfgld",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("fgzlfz".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),7);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("bggdgly",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("glyda".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),8);
-			if (users==null )
 				users = UserUtils.getByRoleActivityEnname("gzr",3,t.getOfficeId(),"12",t.getCreateBy());
 		}else if ("gzr".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),8);
+			users = UserUtils.getByProssType(t.getProcessInstanceId(),5);
+			if (users==null )
+				users = UserUtils.getByRoleActivityEnname("gzr",3,t.getOfficeId(),"12",t.getCreateBy());
 		}else if ("modifyApply".equals(taskDefKey)){
 			users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
 		}
@@ -937,33 +919,15 @@ public class ProjectcontentinfoController extends BaseController {
 		if ("master".equals(taskDefKey)){
 			users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
 			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("bmzr",2,t.getOfficeId(),"12",t.getCreateBy());
-		}else if ("bmzr".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),3);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("bzshbyg",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("bzshbyg".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),4);
-			if (users==null )
 				users = UserUtils.getByRoleActivityEnname("bzshb",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("bzshb".equals(taskDefKey)){
+		} else if ("bzshb".equals(taskDefKey)){
 			users = UserUtils.getByProssType(t.getProcessInstanceId(),5);
 			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("fgld",2,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("fgld".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),6);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("zlfgld",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("fgzlfz".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),7);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("bggdgly",3,t.getOfficeId(),"12",t.getCreateBy());
-		}else  if ("glyda".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),8);
-			if (users==null )
 				users = UserUtils.getByRoleActivityEnname("gzr",3,t.getOfficeId(),"12",t.getCreateBy());
 		}else if ("gzr".equals(taskDefKey)){
-			users = UserUtils.getByProssType(t.getProcessInstanceId(),8);
+			users = UserUtils.getByProssType(t.getProcessInstanceId(),5);
+			if (users==null )
+				users = UserUtils.getByRoleActivityEnname("gzr",3,t.getOfficeId(),"12",t.getCreateBy());
 		}else if ("modifyApply".equals(taskDefKey)){
 			users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
 		}

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -3105,7 +3105,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		if(workContractListInfo.getEndContractDate()==null){
 			workContractListInfo.setEndContractDate(new Date());
 		}
-		workContractListInfo.getSqlMap().put("dsf", dataScopeFilter(workContractListInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_LIST_INFO.getValue()));
+		String companyId = UserUtils.getUser().getComId();
+		workContractListInfo.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
+//		workContractListInfo.getSqlMap().put("dsf", dataScopeFilter(workContractListInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_LIST_INFO.getValue()));
 		workContractListInfo.setPage(page);
 		List<WorkContractListInfo> list = Lists.newArrayList();
 		List<WorkContractListInfo> workContractListInfos = workContractListInfoDao.findList(workContractListInfo);

src/main/java/com/jeeplus/modules/workreview/entity/WorkReviewAudit.java

@@ -18,6 +18,7 @@ public class WorkReviewAudit extends TreeEntity<WorkReviewAudit>{
 	private String standardDetail;		// 标准内容
 	private String parentIds;		// 所有父ID
 	private Byte maxDeduct;		// 最多扣分
+	private Byte deduct;		// 扣分
 	private String orderNum;		// 排序
 	private String companyId;   //公司id
 	private String type;
@@ -103,4 +104,12 @@ public class WorkReviewAudit extends TreeEntity<WorkReviewAudit>{
 	public void setReportId(String reportId) {
 		this.reportId = reportId;
 	}
+
+	public Byte getDeduct() {
+		return deduct;
+	}
+
+	public void setDeduct(Byte deduct) {
+		this.deduct = deduct;
+	}
 }

src/main/java/com/jeeplus/modules/workreview/entity/WorkReviewStandard.java

@@ -8,6 +8,9 @@ import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.persistence.TreeEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 
+import java.io.FileInputStream;
+import java.io.InputStream;
+
 /**
  * 复核标准Entity
  * @author ssrh

src/main/resources/jeeplus.properties

@@ -21,14 +21,14 @@ jdbc.pool.maxActive=200
 jdbc.testSql=SELECT 'x' FROM DUAL
 
 #master
-master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-master.jdbc.username=root
-master.jdbc.password=root
+#master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#master.jdbc.username=root
+#master.jdbc.password=root
 
 #slave
-slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
-slave.jdbc.username=root
-slave.jdbc.password=root
+#slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
+#slave.jdbc.username=root
+#slave.jdbc.password=root
 
 #redis settings
 redis.keyPrefix=jeeplus
@@ -216,28 +216,28 @@ app_id=8a216da860bad76d0160deacd4e40e46
 template_id=327821
 code_type=1
 
-#匞匞短信模版
+#\u531E\u531E\u77ED\u4FE1\u6A21\u7248
 327821
-#瑞华oa
+#\u745E\u534Eoa
 245207
 
 #openOffice
 open_office_addr=127.0.0.1
 open_office_port=8100
 
-#openfire��������ַ
+#openfire\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B7
 openfire.server=192.168.110.69
 sys.notify=http://cdn.gangwaninfo.com/jeeplus-resource-data/static/sys/notify.png
 
 
-#用友API
+#\u7528\u53CBAPI
 yy_apicode=35afe9ec3263424f9a18feb837177169
 yy_mhcxurl=https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseSearchByName
 yy_shcxurl=https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 #yy_mhcxurl=https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseSearchByName?keyword=KEY
 #yy_shcxurl=https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo?id=ID
 
-#百度BOS
+#\u767E\u5EA6BOS
 bos_access_key=9915286aab2949949b489e8ab3f70a09
 bos_secret_key=069036bdb93c4bc59c4995ccc543243e
 bos_endpoint=http://su.bcebos.com

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

@@ -136,7 +136,7 @@
 		</choose>
 	</select>
 
-	<select id="queryCount" resultType="int" >
+	<select id="queryCount" resultType="Integer" >
 		SELECT count(1)
 		FROM work_project_notify a
 		<if test="userName != null and userName != ''">

src/main/resources/mappings/modules/workreview/WorkReviewAuditDao.xml

@@ -14,6 +14,7 @@
 		a.standard_detail AS "standardDetail",
 		a.parent_ids AS "parentIds",
 		a.max_deduct AS "maxDeduct",
+		a.deduct AS "deduct",
 		a.order_num AS "orderNum",
 		type AS "type",
 		report_id AS "reportId",
@@ -102,6 +103,7 @@
 			standard_detail,
 			parent_ids,
 			max_deduct,
+			deduct,
 			company_id,
 			order_num,
 			type,
@@ -118,6 +120,7 @@
 			#{standardDetail},
 			#{parentIds},
 			#{maxDeduct},
+			#{deduct},
 			#{companyId},
 			#{orderNum},
 			#{type},
@@ -134,6 +137,7 @@
 			standard_detail = #{standardDetail},
 			parent_ids = #{parentIds},
 			max_deduct = #{maxDeduct},
+			deduct = #{deduct},
 			company_id = #{companyId},
 			order_num = #{orderNum},
 			type = #{type},
@@ -225,7 +229,7 @@
     </update>
     <update id="reportMaxDeduct">
         UPDATE work_review_audit SET
-			max_deduct = #{maxDeduct}
+			deduct = #{maxDeduct}
 		WHERE id = #{id}
     </update>
 

src/main/webapp/webpage/modules/projectcontentinfo/reportAudit.jsp

@@ -86,7 +86,7 @@
 
         // 确认对话框
         function reviewAudit(mess, href,obj){
-            top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+            // top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
                 //do something
                 if (typeof href == 'function') {
                     href();
@@ -108,8 +108,8 @@
                         }
                     });
                 }
-                top.layer.close(index);
-            });
+            //     top.layer.close(index);
+            // });
             return false;
         }
         // 确认对话框
@@ -139,14 +139,14 @@
             var maxDeductTotal = 0;
             var maxDeducts = 0;
             for (var i=0; i<dataList.length; i++){
-                if(dataList[i].parentId == parentId && dataList[i].id != id){
-                    maxDeducts += dataList[i].maxDeduct;
-                }
-                if(dataList[i].id == parentId){
-                    maxDeductTotal = dataList[i].maxDeduct;
+                if(dataList[i].id == id){
+                    maxDeducts = dataList[i].maxDeduct;
                 }
+                // if(dataList[i].id == parentId){
+                //     maxDeductTotal = dataList[i].maxDeduct;
+                // }
             }
-            if (maxDeductTotal-maxDeducts>=maxDeduct){
+            if (maxDeducts-maxDeduct>=0){
                 $.ajax({
                     url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
                     data:{
@@ -307,24 +307,24 @@
 									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
 										<thead>
 										<tr>
-											<th width="25%">序号</th>
+											<%--<th width="25%">序号</th>--%>
 											<th width="40%">符合内容及评分标准</th>
 											<th width="20%">扣分</th>
-											<th width="15%">操作</th>
+											<%--<th width="15%">操作</th>--%>
 										</tr>
 										</thead>
 										<tbody>
 										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
 											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-												<td title="${workReviewAudit.orderNum}">
-														${workReviewAudit.orderNum}
-												</td>
+												<%--<td title="${workReviewAudit.orderNum}">--%>
+														<%--${workReviewAudit.orderNum}--%>
+												<%--</td>--%>
 												<td title="${workReviewAudit.standardDetail}">
 														${workReviewAudit.standardDetail}
 												</td>
 												<td class="input-td">
 													<c:choose>
-													<c:when test="${workReviewAudit.orderNum > 400000 && workReviewAudit.orderNum < 500000}">
+													<c:when test="${workReviewAudit.orderNum > 4000 && workReviewAudit.orderNum < 5000}">
 														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" value="${workReviewAudit.maxDeduct}">
 													</c:when>
 													<c:otherwise>
@@ -332,16 +332,16 @@
 													</c:otherwise>
 													</c:choose>
 												</td>
-												<td>
-													<c:choose>
-														<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '5'}">
-															<a  onclick="addRow('${workReviewAudit.id}')" title="新增"><i class="fa fa-plus"></i>&nbsp;</a>
-														</c:when>
-														<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '6'}">
-															<a href="" onclick="return delRow('确认要删除吗？',this,'${workReviewAudit.id}','')"  ><i class="fa fa-backward"></i> </a>
-														</c:when>
-													</c:choose>
-												</td>
+												<%--<td>--%>
+													<%--<c:choose>--%>
+														<%--<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '5'}">--%>
+															<%--<a  onclick="addRow('${workReviewAudit.id}')" title="新增"><i class="fa fa-plus"></i>&nbsp;</a>--%>
+														<%--</c:when>--%>
+														<%--<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '6'}">--%>
+															<%--<a href="" onclick="return delRow('确认要删除吗？',this,'${workReviewAudit.id}','')"  ><i class="fa fa-backward"></i> </a>--%>
+														<%--</c:when>--%>
+													<%--</c:choose>--%>
+												<%--</td>--%>
 											</tr>
 										</c:forEach>
 										</tbody>
@@ -385,7 +385,7 @@
 									<table id="contentTable" class="table table-bordered table-condensed details no-bottom-margin">
 										<thead>
 										<tr>
-											<th width="25%">序号</th>
+											<%--<th width="25%">序号</th>--%>
 											<th width="60%">符合内容及评分标准</th>
 											<th width="15%">操作</th>
 										</tr>
@@ -393,7 +393,7 @@
 										<tbody>
 										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
 											<tr id="${workReviewAudit.id}">
-												<td>${workReviewAudit.orderNum}</td>
+												<%--<td>${workReviewAudit.orderNum}</td>--%>
 												<td title="${workReviewAudit.standardDetail}">
 													${workReviewAudit.standardDetail}
 												</td>

src/main/webapp/webpage/modules/projectcontentinfo/reportChange.jsp

@@ -6,6 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
         var validateForm;
+		var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
                 if(obj == 1){
@@ -150,15 +151,16 @@
         }
         // 确认对话框
         function reviewAudits(mess, href,obj,remarks){
-            top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+            // top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
                 console.log(remarks);
                 var remark = $(remarks);
                 remark.val("确认");
+			    $("#audit"+obj).val("1");
                 $("#check1"+obj).attr("style","display:none");
                 $("#check2"+obj).attr("style","display");
                 top.layer.msg("已确认！", {icon: 1});
-                top.layer.close(index);
-            });
+                // top.layer.close(index);
+            // });
             return false;
         }
 
@@ -174,6 +176,7 @@
                     if(data.success) {
                         $("#projectContentDataList2").html("");
                         var list = eval(data.body.list);
+						dataList=list
                         for(var i in list){
                             var tr = "<tr>" +
                                 "<td>" +

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeAudit.jsp

@@ -81,7 +81,7 @@
 
         // 确认对话框
         function reviewAudit(mess, href,obj){
-            top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+            // top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
                 //do something
                 if (typeof href == 'function') {
                     href();
@@ -103,8 +103,8 @@
                         }
                     });
                 }
-                top.layer.close(index);
-            });
+            //     top.layer.close(index);
+            // });
             return false;
         }
         // 确认对话框
@@ -135,15 +135,15 @@
             var dataList = ${fns:toJson(list)};
             var maxDeductTotal = 0;
             var maxDeducts = 0;
-            for (var i=0; i<dataList.length; i++){
-                if(dataList[i].parentId == parentId && dataList[i].id != id){
-                    maxDeducts += dataList[i].maxDeduct;
-                }
-                if(dataList[i].id == parentId){
-                    maxDeductTotal = dataList[i].maxDeduct;
-                }
-            }
-           	if (maxDeductTotal-maxDeducts>=maxDeduct){
+			for (var i=0; i<dataList.length; i++){
+				if(dataList[i].id == id){
+					maxDeducts = dataList[i].maxDeduct;
+				}
+				// if(dataList[i].id == parentId){
+				//     maxDeductTotal = dataList[i].maxDeduct;
+				// }
+			}
+           	if (maxDeducts-maxDeduct>=0){
                 $.ajax({
                     url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
                     data:{
@@ -313,24 +313,24 @@
 									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
 										<thead>
 										<tr>
-											<th width="30%">序号</th>
+											<%--<th width="30%">序号</th>--%>
 											<th width="40%">符合内容及评分标准</th>
 											<th width="15%">扣分</th>
-											<th width="15%">操作</th>
+											<%--<th width="15%">操作</th>--%>
 										</tr>
 										</thead>
 										<tbody>
 										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
 											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-												<td title="${workReviewAudit.orderNum}">
-														${workReviewAudit.orderNum}
-												</td>
+												<%--<td title="${workReviewAudit.orderNum}">--%>
+														<%--${workReviewAudit.orderNum}--%>
+												<%--</td>--%>
 												<td title="${workReviewAudit.standardDetail}">
 														${workReviewAudit.standardDetail}
 												</td>
 												<td class="input-td">
 													<c:choose>
-														<c:when test="${workReviewAudit.orderNum > 400000 && workReviewAudit.orderNum < 500000}">
+														<c:when test="${workReviewAudit.orderNum > 4000 && workReviewAudit.orderNum < 5000}">
 															<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" value="${workReviewAudit.maxDeduct}">
 														</c:when>
 														<c:otherwise>
@@ -339,16 +339,16 @@
 
 													</c:choose>
 												</td>
-												<td>
-													<c:choose>
-														<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '5'}">
-															<a  onclick="addRow('${workReviewAudit.id}')" title="新增"><i class="fa fa-plus"></i>&nbsp;</a>
-														</c:when>
-														<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '6'}">
-															<a href="" onclick="return delRow('确认要删除吗？',this,'${workReviewAudit.id}','')"  ><i class="fa fa-minus"></i> </a>
-														</c:when>
-													</c:choose>
-												</td>
+												<%--<td>--%>
+													<%--<c:choose>--%>
+														<%--<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '5'}">--%>
+															<%--<a  onclick="addRow('${workReviewAudit.id}')" title="新增"><i class="fa fa-plus"></i>&nbsp;</a>--%>
+														<%--</c:when>--%>
+														<%--<c:when test="${not empty workReviewAudit.type && workReviewAudit.type eq '6'}">--%>
+															<%--<a href="" onclick="return delRow('确认要删除吗？',this,'${workReviewAudit.id}','')"  ><i class="fa fa-minus"></i> </a>--%>
+														<%--</c:when>--%>
+													<%--</c:choose>--%>
+												<%--</td>--%>
 											</tr>
 										</c:forEach>
 										</tbody>
@@ -392,7 +392,7 @@
 									<table id="contentTable" class="table table-bordered table-condensed details no-bottom-margin">
 										<thead>
 										<tr>
-											<th width="25%">序号</th>
+											<%--<th width="25%">序号</th>--%>
 											<th width="60%">符合内容及评分标准</th>
 											<th width="15%">操作</th>
 										</tr>
@@ -400,7 +400,7 @@
 										<tbody>
 										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
 											<tr id="${workReviewAudit.id}">
-												<td title="${workReviewAudit.orderNum}">${workReviewAudit.orderNum}</td>
+												<%--<td title="${workReviewAudit.orderNum}">${workReviewAudit.orderNum}</td>--%>
 												<td title="${workReviewAudit.standardDetail}">
 														${workReviewAudit.standardDetail}
 												</td>

src/main/webapp/webpage/modules/projectcontentinfo/reportForm.jsp

@@ -12,8 +12,20 @@
 	</style>
 	<script type="text/javascript">
         var validateForm;
+        var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+				var info = false;
+				for (var i=0; i<dataList.length; i++){
+					console.log($("#audit"+dataList[i].id).val())
+				    if($("#audit"+dataList[i].id).val() == 0){
+				    info = true;
+				    }
+				}
+				if (info){
+					parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+					return false;
+				}
                 if(obj == 1){
                     $("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/saveReport?view=report");
                 }else{
@@ -184,6 +196,7 @@
 				console.log(remarks);
 				var remark = $(remarks);
 				remark.val("确认");
+			    $("#audit"+obj).val("1");
 				$("#check1"+obj).attr("style","display:none");
 				$("#check2"+obj).attr("style","display");
 				top.layer.msg("已确认！", {icon: 1});
@@ -202,6 +215,7 @@
                     if(data.success) {
                         $("#projectContentDataList2").html("");
 						var list = eval(data.body.list);
+						dataList=list
                         for(var i in list){
                             var tr = "<tr>" +
                                 "<td>" +

src/main/webapp/webpage/modules/projectcontentinfo/workReviewStandardList.jsp

@@ -42,9 +42,18 @@
 						${workReviewAudit.maxDeduct}
 					</td>
 				</c:if>
+				<c:choose>
+					<c:when test="${type == 4}">
 				<td>
-					${workReviewAudit.remarks}
+					扣${workReviewAudit.deduct}分
 				</td>
+					</c:when>
+					<c:otherwise>
+						<td>
+							${workReviewAudit.remarks}
+						</td>
+					</c:otherwise>
+				</c:choose>
 			</tr>
 		</c:forEach>
 		</tbody>

src/main/webapp/webpage/modules/workreview/workReviewStandardForm.jsp

@@ -68,7 +68,7 @@
 		<form:form id="inputForm" modelAttribute="workReviewStandard" action="${ctx}/workreview/workReviewStandard/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 			<div class="form-group layui-row first">
-				<div class="form-group-label"><h2>标准信息</h2></div>
+				<div class="form-group-label"><h2>复核信息</h2></div>
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label"><span class="require-item">*</span>上级节点：</label>
 					<div class="layui-input-block with-icon">