流程审核功能修改

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

@@ -28,6 +28,9 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.DictService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workactivity.entity.Activity;
+import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
@@ -100,6 +103,8 @@ public class ProjectReportRecordController extends BaseController {
 	private ProjectEarlyReviewService projectEarlyReviewService;
 	@Autowired
 	private ProjectResultsFileTemplateService projectResultsFileTemplateService;
+	@Autowired
+	private ActivityService activityService;
 
 	@ModelAttribute
 	public ProjectReportRecord get(@RequestParam(required=false) String id) {
@@ -545,7 +550,22 @@ public class ProjectReportRecordController extends BaseController {
 			if ("yes".equals(flag) && (users==null || users.size()==0)){
 				addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
 			}else {
-				String str = projectReportRecordService.auditSave(projectReportRecord,users);
+				String str = null;
+				List<Activity> activitieList = activityService.getByProcessInstanceId(projectReportRecord.getProcessInstanceId());
+				WorkActivityMenu workActivityMenu = new WorkActivityMenu();
+				if (activitieList != null && activitieList.size() != 0) {
+					workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
+					workActivityMenu.setActivities(activitieList);
+				}
+				//判断流程是否是老的流程，如果是老的流程则走老审核信息
+				if (workActivityMenu.getProcessType().equals("newReportRecord")) {
+					str = projectReportRecordService.newAuditSave(projectReportRecord,users);
+				}else {
+					str = projectReportRecordService.auditSave(projectReportRecord,users);
+				}
+
+
+				//String str = projectReportRecordService.auditSave(projectReportRecord,users);
 				addMessage(redirectAttributes, str);
 			}
 		}catch (Exception e){
@@ -556,6 +576,8 @@ public class ProjectReportRecordController extends BaseController {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else if (StringUtils.isNotBlank(projectReportRecord.getHome()) && "notifyList".equals(projectReportRecord.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}else if (StringUtils.isNotBlank(projectReportRecord.getHome()) && "record".equals(projectReportRecord.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/list/?repage";
 		}else {
 			RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
 			if(StringUtils.isNotBlank(projectReportRecord.getCondition())){