Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -65,4 +65,6 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
     public ProjectReportData getByInvalidProcessInstanceId(String invalidProcessInstanceId);
 
     void reportNumber(@Param("reportId") String reportId,@Param("number") String number,@Param("url") String url);
+
+    int updateUpId(@Param("id")String id,@Param("upId")String upId);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -84,6 +84,16 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String signCostOneName;
 	private String signCostTwoName;
 	private String masterName;
+	private String upId;
+
+	public String getUpId() {
+		return upId;
+	}
+
+	public void setUpId(String upId) {
+		this.upId = upId;
+	}
+
 
 	public String getReportType() {
 		return reportType;

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

@@ -13,6 +13,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectBasedDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectContentDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportChangeDao;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -95,6 +96,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 	private OfficeService officeService;
 	@Autowired
 	private WorkReviewAuditDao workReviewAuditDao;
+	@Autowired
+	private ProjectReportDataDao projectReportDataDao;
 
 	public ProjectReportData get(String id) {
 		ProjectReportData projectReportData = super.get(id);
@@ -371,6 +374,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 				variables.put("gzrcount",gzrs.size());*/
 			processType = "reportChangeReview";
 			users.addAll(masters);
+			variables.put("masterList", masters);
+			variables.put("mastercount", masters.size());
 		}
 		for (User u : users){
 			workProjectNotify.setUser(u);
@@ -378,12 +383,12 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 			workProjectNotify.setNotifyRole("项目负责人审批");
 			workProjectNotifyService
 					.save(workProjectNotify);
-			Map<String,Object> extras = new HashMap<>();
-			extras.put("type","7001");
-			extras.put("id",workProjectNotify.getId());
-			extras.put("procDefKey","46");
-			UserUtils.pushInfoToApp(title,str,extras,u.getId());
-			UserUtils.pushIm(u.getId(),"报告变更变更发起人:\" + user.getName() + \",报告变更名称:\"+ projectReportData.getName() + \" 待审批!");
+//			Map<String,Object> extras = new HashMap<>();
+//			extras.put("type","7001");
+//			extras.put("id",workProjectNotify.getId());
+//			extras.put("procDefKey","46");
+//			UserUtils.pushInfoToApp(title,str,extras,u.getId());
+//			UserUtils.pushIm(u.getId(),"报告变更变更发起人:\" + user.getName() + \",报告变更名称:\"+ projectReportData.getName() + \" 待审批!");
 		}
 		variables.put("type", processType);
 		variables.put("busId", businessKey);
@@ -400,6 +405,7 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 		// 更新流程实例ID
 		projectReportData.setProcessInstanceId(processInstance.getId());
 		dao.updateProcessInstanceId(projectReportData);
+		projectReportDataDao.updateUpId(projectReportData.getReportId(),processInstance.getId());
 		List<Activity> list = workActivityMenu.getActivities();
 		if (list != null && list.size() != 0) {
 			workActivityProcessService.saveList(list, processInstance.getId());
@@ -616,6 +622,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						notifyRole = "部门经理审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bmzr";
+						vars.put("bmzrList", auditUsers);
+						vars.put("bmzrcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -632,6 +640,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						notifyRole = "审核部审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshbyg";
+						vars.put("bzshbygList", auditUsers);
+						vars.put("bzshbygcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -646,6 +656,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						notifyRole = "部门分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshb";
+						vars.put("bzshbList", auditUsers);
+						vars.put("bzshbcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -660,6 +672,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						notifyRole = "部门分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "fgld";
+						vars.put("fgldList", auditUsers);
+						vars.put("fgldcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -674,6 +688,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						notifyRole = "分管质量副总审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "zlfgld";
+						vars.put("fgzlfzList", auditUsers);
+						vars.put("fgzlfzcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -688,6 +704,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						notifyRole = "档案管理员审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bggdgly";
+						vars.put("glydaList", auditUsers);
+						vars.put("glydacount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
 						workActivityProcess.setIsApproval("2");
@@ -702,6 +720,8 @@ public class ProjectReportChangeService extends CrudService<ProjectReportChangeD
 						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/service/ProjectReportDataService.java

@@ -568,11 +568,11 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 				}
 				workProjectNotify.setId("");
 			} else {
-				//variables.put("bmzrList", bmzrs);
+				variables.put("bmzrList", bmzrs);
 				if (bmzrs.size()==0) {
 					return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
 				}
-				//variables.put("bmzrcount",bmzrs.size());
+				variables.put("bmzrcount",bmzrs.size());
 				users.addAll(bmzrs);
 				processType = "reportInvalidReview";
 			}

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

@@ -821,15 +821,15 @@ public class ProjectcontentinfoController extends BaseController {
 	@RequestMapping(value = {"saveChangeAudit"})
 	public String saveChangeAudit(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response,
 								  Model model,RedirectAttributes redirectAttributes) {
-		try{
+//		try{
 			Boolean b = projectcontentinfoService.saveChange(projectcontentinfo,2);
 			if (b){
 				addMessage(redirectAttributes, "发起报告变更成功");
 				return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectcontentinfo/?id="+projectcontentinfo.getId()+"&view=change";
 			}
-		}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");
 		}
@@ -1322,15 +1322,22 @@ public class ProjectcontentinfoController extends BaseController {
 	 */
 	@RequestMapping(value = "getProcessOne")
 	public String getProcessOne(Projectcontentinfo projectcontentinfo,String type,Model model) {
-		if ("1".equals(type)){
+		if ("2".equals(type)){          //审批中流程
 			ProjectReportData projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
 			model.addAttribute("processInstanceId", projectReportData.getProcessInstanceId());
-		}else if("2".equals(type)){
-			ProjectReportData projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
-			model.addAttribute("processInstanceId", projectReportData.getProcessInstanceId());
-		}else if("3".equals(type)){
+		}else if("8".equals(type)){         //变更中流程
+			ProjectReportData projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
+			model.addAttribute("processInstanceId", projectReportData.getUpId());
+		}else if("6".equals(type) || "7".equals(type)){      //作废流程
 			ProjectReportData projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
 			model.addAttribute("processInstanceId", projectReportData.getInvalidProcessInstanceId());
+		}else if("5".equals(type)){
+			ProjectReportData projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
+			if(projectReportData.getUpId() != null){
+				model.addAttribute("processInstanceId", projectReportData.getUpId());
+			}else {
+				model.addAttribute("processInstanceId", projectReportData.getProcessInstanceId());
+			}
 		}
 		return "modules/workreimbursement/workReimbursementTrack";
 	}

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -29,7 +29,8 @@
 		a.process_instance_id AS "processInstanceId",
 		a.invalid_process_instance_id AS "invalidProcessInstanceId",
 		m.name AS "master.name",
-		a.number_path as "numberPath"
+		a.number_path as "numberPath",
+		a.update_process_instance_id as "upId"
 	</sql>
 	
 	<sql id="projectReportDataJoins">
@@ -562,4 +563,12 @@
 		WHERE a.invalid_process_instance_id = #{invalidProcessInstanceId}
 	</select>
 
+	<update id="updateUpId">
+		update project_report_data
+		set update_process_instance_id = #{upId}
+		<where>
+			id = #{id}
+		</where>
+	</update>
+
 </mapper>

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

@@ -227,7 +227,7 @@
 		    var elem = document.getElementById("status_td_" + index);
             var st = getAuditState(status);
             if(st.action)
-                var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type=1','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type="+status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
             else
                 var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";