发票作废

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -210,17 +210,10 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	public Page<WorkInvoice> findPage(Page<WorkInvoice> page, WorkInvoice workInvoice) {
 //		workInvoice.getSqlMap().put("dsf", dataScopeFilter(workInvoice.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_INVOICE.getValue()));
 		if(StringUtils.isNotBlank(workInvoice.getOfficeId())){
-			if("一部本部".equals(workInvoice.getOfficeId())){
-				List<String> officeIdList = Lists.newArrayList();
-				Office office = officeService.getByName("工程一部");
-				officeIdList.add(office.getId());
-				workInvoice.setOfficeIdList(officeIdList);
-			}else{
-				//查询该选择节点下所有的部门Id
-				List<String> officeIdList = officeService.getChildrenOffice(workInvoice.getOfficeId());
-				officeIdList.add(workInvoice.getOfficeId());
-				workInvoice.setOfficeIdList(officeIdList);
-			}
+			//查询该选择节点下所有的部门Id
+			List<String> officeIdList = officeService.getChildrenOffice(workInvoice.getOfficeId());
+			officeIdList.add(workInvoice.getOfficeId());
+			workInvoice.setOfficeIdList(officeIdList);
 		}
 		int count = dao.queryCount(workInvoice);
 		page.setCount(count);
@@ -270,19 +263,6 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	 */
 	public String getSumMoney(WorkInvoice workInvoice){
 		//workInvoice.getSqlMap().put("dsf", dataScopeFilter(workInvoice.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_INVOICE.getValue()));
-		if(StringUtils.isNotBlank(workInvoice.getOfficeId())){
-			if("一部本部".equals(workInvoice.getOfficeId())){
-				List<String> officeIdList = Lists.newArrayList();
-				Office office = officeService.getByName("工程一部");
-				officeIdList.add(office.getId());
-				workInvoice.setOfficeIdList(officeIdList);
-			}else{
-				//查询该选择节点下所有的部门Id
-				List<String> officeIdList = officeService.getChildrenOffice(workInvoice.getOfficeId());
-				officeIdList.add(workInvoice.getOfficeId());
-				workInvoice.setOfficeIdList(officeIdList);
-			}
-		}
 		workInvoice.setPage(new Page<WorkInvoice>());
 		String getSumMoney = dao.getSumMoney(workInvoice);
 		if(StringUtils.isBlank(getSumMoney)){
@@ -337,94 +317,94 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	@Transactional(readOnly = false)
 	public String save(WorkInvoice workInvoice,Map<String, Object> variables,String processInstanceId) {
 		long s1=System.currentTimeMillis();
-			if (StringUtils.isBlank(workInvoice.getNumber())) {
-				synchronized (SYN_BYTE) {
-					workInvoice.setNumber(serialNumTplService.genSerialNum(UserUtils.getSelectCompany(), WorkInvoice.SERIAL_BIZCODE));
-				}
+		if (StringUtils.isBlank(workInvoice.getNumber())) {
+			synchronized (SYN_BYTE) {
+				workInvoice.setNumber(serialNumTplService.genSerialNum(UserUtils.getSelectCompany(), WorkInvoice.SERIAL_BIZCODE));
 			}
+		}
 		long s2=System.currentTimeMillis();
-			super.save(workInvoice);
+		super.save(workInvoice);
 		long s3=System.currentTimeMillis();
-			String str = "";
-			//所属部门
-			Office office = officeService.get(workInvoice.getOffice().getId());
-			String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
-			str = "发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName()+",创建人："+userName+",所属部门:"+office.getName();
-			String title = "实际开票单位:"+workInvoice.getClient().getName();
+		String str = "";
+		//所属部门
+		Office office = officeService.get(workInvoice.getOffice().getId());
+		String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
+		str = "发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName()+",创建人："+userName+",所属部门:"+office.getName();
+		String title = "实际开票单位:"+workInvoice.getClient().getName();
 		long s4=System.currentTimeMillis();
-			updateWorkInvoiceInfo(workInvoice);
+		updateWorkInvoiceInfo(workInvoice);
 		long s5=System.currentTimeMillis();
-			// 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
-			identityService.setAuthenticatedUserId(UserUtils.getUser().getId());
-			// 启动流程
-			String businessKey = workInvoice.getId().toString();
-			WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("ggh3125f1f194c82bdea93555c750905",officeService.get(workInvoice.getOfficeId()));
-			// 启动流程
-			String processType = workActivityMenu.getProcessType();
-			StringBuffer buffer = new StringBuffer();
-			Activity activity = new Activity();
-			WorkProjectNotify workProjectNotify = UtilNotify
-					.saveNotify(workInvoice.getId(),
-							null,
-							workInvoice.getCompanyId(),
-							title,
-							str,
-							"21",
-							"0",
-							"待审批",
-							""
-					);
+		// 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
+		identityService.setAuthenticatedUserId(UserUtils.getUser().getId());
+		// 启动流程
+		String businessKey = workInvoice.getId().toString();
+		WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("ggh3125f1f194c82bdea93555c750905",officeService.get(workInvoice.getOfficeId()));
+		// 启动流程
+		String processType = workActivityMenu.getProcessType();
+		StringBuffer buffer = new StringBuffer();
+		Activity activity = new Activity();
+		WorkProjectNotify workProjectNotify = UtilNotify
+				.saveNotify(workInvoice.getId(),
+						null,
+						workInvoice.getCompanyId(),
+						title,
+						str,
+						"21",
+						"0",
+						"待审批",
+						""
+				);
 		long s6=System.currentTimeMillis();
-			List<User> users = new ArrayList<>();
-			List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"5",workInvoice.getCreateBy());
-			List<User> scbzrs = UserUtils.getByRoleActivityEnname("scfgld",1,office.getId(),"5",workInvoice.getCreateBy());
-			//List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",1,office.getId(),"5",workInvoice.getCreateBy());
+		List<User> users = new ArrayList<>();
+		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"5",workInvoice.getCreateBy());
+		List<User> scbzrs = UserUtils.getByRoleActivityEnname("scfgld",1,office.getId(),"5",workInvoice.getCreateBy());
+		//List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",1,office.getId(),"5",workInvoice.getCreateBy());
 		//财务主任
 		List<User> fpglys = UserUtils.getByRoleActivityEnname("cwzg",1,office.getId(),"5",workInvoice.getCreateBy());
 		long s7=System.currentTimeMillis();
-			if (StringUtils.isNotBlank(workActivityMenu.getId())) {
-				workProjectNotify.setNotifyRole("");
-				workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
-				List<Activity> activities = workActivityMenu.getActivities();
-				for (Activity a : activities) {
-					String encount = a.getEncount();
-					String enlist = a.getEnlist();
-					if (a.getRole()!=null && StringUtils.isNotBlank(a.getRole().getEnname())){
-						List enusers = UserUtils.getByRoleActivityEnnames(a.getRole().getEnname(),office.getId(),"5",workInvoice.getCreateBy());
-						if (enusers.size()==0){
-							workInvoice.setInvoiceState("1");//暂存
-							this.save(workInvoice);
-							return "流程审批人不能为空,角色"+a.getRole().getName()+"下无用户,请联系管理员！";
-						}
-						variables.put(enlist, enusers);
-						variables.put(encount, enusers.size());
-					}
-					if (a.getDelFlag().equals("0") && a.getCount() == 1) {
-						activity = a;
+		if (StringUtils.isNotBlank(workActivityMenu.getId())) {
+			workProjectNotify.setNotifyRole("");
+			workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
+			List<Activity> activities = workActivityMenu.getActivities();
+			for (Activity a : activities) {
+				String encount = a.getEncount();
+				String enlist = a.getEnlist();
+				if (a.getRole()!=null && StringUtils.isNotBlank(a.getRole().getEnname())){
+					List enusers = UserUtils.getByRoleActivityEnnames(a.getRole().getEnname(),office.getId(),"5",workInvoice.getCreateBy());
+					if (enusers.size()==0){
+						workInvoice.setInvoiceState("1");//暂存
+						this.save(workInvoice);
+						return "流程审批人不能为空,角色"+a.getRole().getName()+"下无用户,请联系管理员！";
 					}
+					variables.put(enlist, enusers);
+					variables.put(encount, enusers.size());
 				}
-				buffer.append(activity.getRole().getEnname());
-				if (activity != null && StringUtils.isNotBlank(activity.getId())) {
-					//角色审批
-					if (StringUtils.isNotBlank(activity.getRole().getEnname())) {
-						users = UserUtils.getByRoleActivityEnnames(activity.getRole().getEnname(),office.getId(),"5",workInvoice.getCreateBy());
-					}
-					//人员审批
-					if (StringUtils.isNotBlank(activity.getUser().getId())) {
-						users.add(activity.getUser());
-					}
+				if (a.getDelFlag().equals("0") && a.getCount() == 1) {
+					activity = a;
 				}
-				workProjectNotify.setId("");
-			} else {
-				/*variables.put("scbzrList", scbzrs);
-				variables.put("fpglyList", fpglys);*/
-				if (bmzrs.size()==0 ){
-					workInvoice.setInvoiceState("1");//暂存
-					this.save(workInvoice);
+			}
+			buffer.append(activity.getRole().getEnname());
+			if (activity != null && StringUtils.isNotBlank(activity.getId())) {
+				//角色审批
+				if (StringUtils.isNotBlank(activity.getRole().getEnname())) {
+					users = UserUtils.getByRoleActivityEnnames(activity.getRole().getEnname(),office.getId(),"5",workInvoice.getCreateBy());
 				}
-				if (bmzrs.size()==0){
-					return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
+				//人员审批
+				if (StringUtils.isNotBlank(activity.getUser().getId())) {
+					users.add(activity.getUser());
 				}
+			}
+			workProjectNotify.setId("");
+		} else {
+				/*variables.put("scbzrList", scbzrs);
+				variables.put("fpglyList", fpglys);*/
+			if (bmzrs.size()==0 ){
+				workInvoice.setInvoiceState("1");//暂存
+				this.save(workInvoice);
+			}
+			if (bmzrs.size()==0){
+				return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
+			}
 				/*if (scbzrs.size()==0){
 					return "流程审批人不能为空,角色市场分管领导下无用户,请联系管理员！";
 				}
@@ -433,67 +413,67 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 				}*/
 				/*variables.put("scbzrcount",scbzrs.size());
 				variables.put("fpglycount",fpglys.size());*/
-				processType = "workinvoice";
-				users.addAll(bmzrs);
-			}
-			for (User user : users){
-				workProjectNotify.setUser(user);
-				workProjectNotify.setId("");
-				workProjectNotifyService
-						.save(workProjectNotify);
-				Map<String,Object> extras = new HashMap<>();
-				extras.put("type","7002");
-				extras.put("id",workProjectNotify.getId());
-				extras.put("procDefKey","21");
-				UserUtils.pushInfoToApp(title,str,extras,user.getId());
-				UserUtils.pushIm(user.getId(),str);
-			}
-			variables.put("type", processType);
-			variables.put("busId", businessKey);
-			variables.put("title", "发票申请编号：" + workInvoice.getNumber());//设置标题；
+			processType = "workinvoice";
+			users.addAll(bmzrs);
+		}
+		for (User user : users){
+			workProjectNotify.setUser(user);
+			workProjectNotify.setId("");
+			workProjectNotifyService
+					.save(workProjectNotify);
+			Map<String,Object> extras = new HashMap<>();
+			extras.put("type","7002");
+			extras.put("id",workProjectNotify.getId());
+			extras.put("procDefKey","21");
+			UserUtils.pushInfoToApp(title,str,extras,user.getId());
+			UserUtils.pushIm(user.getId(),str);
+		}
+		variables.put("type", processType);
+		variables.put("busId", businessKey);
+		variables.put("title", "发票申请编号：" + workInvoice.getNumber());//设置标题；
 		long s8=System.currentTimeMillis();
-			ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
-			workInvoice.setProcessInstance(processInstance);
+		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
+		workInvoice.setProcessInstance(processInstance);
 		long s9=System.currentTimeMillis();
-			if (StringUtils.isNotBlank(processInstanceId)) {
-				workActivityProcessService.updateProcessInstanceId(processInstance.getId(),processInstanceId);
-				workActivityProcessService.deleteProcessInstanceId(processInstanceId);
-				workActivityProcessService.deleteProcessIdAuditUsers(processInstanceId);
-			}
+		if (StringUtils.isNotBlank(processInstanceId)) {
+			workActivityProcessService.updateProcessInstanceId(processInstance.getId(),processInstanceId);
+			workActivityProcessService.deleteProcessInstanceId(processInstanceId);
+			workActivityProcessService.deleteProcessIdAuditUsers(processInstanceId);
+		}
 		long s10=System.currentTimeMillis();
-			// 更新流程实例ID
-			workInvoice.setProcessInstanceId(processInstance.getId());
-			workInvoiceDao.updateProcessInstanceId(workInvoice);
+		// 更新流程实例ID
+		workInvoice.setProcessInstanceId(processInstance.getId());
+		workInvoiceDao.updateProcessInstanceId(workInvoice);
 		//通知添加流程实例ID
 		workProjectNotify.setProcessInstanceId(processInstance.getId());
 		workProjectNotifyService.save(workProjectNotify);
-			List<Activity> list = workActivityMenu.getActivities();
+		List<Activity> list = workActivityMenu.getActivities();
 		long s11=System.currentTimeMillis();
-			if (list != null && list.size() != 0) {
-				workActivityProcessService.saveList(list, processInstance.getId());
-			} else {
-				WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-				workActivityProcess.setProcessKey("workinvoice");
-				workActivityProcess.setCount(1);
-				workActivityProcess.setProcessInstanceId(processInstance.getId());
-				workActivityProcess.setIsApproval("0");
-				workActivityProcessService.save(workActivityProcess);
-				workActivityProcess.setCount(2);
-				workActivityProcess.setId("");
-				workActivityProcessService.save(workActivityProcess);
-				workActivityProcess.setCount(3);
-				workActivityProcess.setId("");
-				workActivityProcessService.save(workActivityProcess);
-				workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
-				workActivityProcessService.insertAuditsByType(scbzrs,processInstance.getId(),2,0);
-				workActivityProcessService.insertAuditsByType(fpglys,processInstance.getId(),3,0);
-			}
+		if (list != null && list.size() != 0) {
+			workActivityProcessService.saveList(list, processInstance.getId());
+		} else {
+			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
+			workActivityProcess.setProcessKey("workinvoice");
+			workActivityProcess.setCount(1);
+			workActivityProcess.setProcessInstanceId(processInstance.getId());
+			workActivityProcess.setIsApproval("0");
+			workActivityProcessService.save(workActivityProcess);
+			workActivityProcess.setCount(2);
+			workActivityProcess.setId("");
+			workActivityProcessService.save(workActivityProcess);
+			workActivityProcess.setCount(3);
+			workActivityProcess.setId("");
+			workActivityProcessService.save(workActivityProcess);
+			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
+			workActivityProcessService.insertAuditsByType(scbzrs,processInstance.getId(),2,0);
+			workActivityProcessService.insertAuditsByType(fpglys,processInstance.getId(),3,0);
+		}
 		long s12=System.currentTimeMillis();
-			logger.info("发票送审-------生成发票编号："+(s2-s1)+"  保存发票信息："+(s3-s2)+"  保存发票明细数据："+(s5-s4)
-					+"  查询角色人员："+(s7-s6)+"  流程启动："+(s9-s8)+"  workActivityProcessService.updateProcessInstanceId："+(s10-s9)
-					+"  查询角色人员："+(s12-s11)+"  总时间："+(s12-s1));
-			logger.debug("start process of {key={}, bkey={}, pid={}, variables={}}", new Object[]{
-					ActUtils.PD_REIMBURSEMENT[0], businessKey, processInstance.getId(), variables});
+		logger.info("发票送审-------生成发票编号："+(s2-s1)+"  保存发票信息："+(s3-s2)+"  保存发票明细数据："+(s5-s4)
+				+"  查询角色人员："+(s7-s6)+"  流程启动："+(s9-s8)+"  workActivityProcessService.updateProcessInstanceId："+(s10-s9)
+				+"  查询角色人员："+(s12-s11)+"  总时间："+(s12-s1));
+		logger.debug("start process of {key={}, bkey={}, pid={}, variables={}}", new Object[]{
+				ActUtils.PD_REIMBURSEMENT[0], businessKey, processInstance.getId(), variables});
 		return "";
 	}
 
@@ -1211,176 +1191,195 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	 */
 	@Transactional(readOnly = false)
 	public String auditSaveBranch(WorkInvoice workInvoice,List<User> auditUsers) {
-			//所属部门
-			Office office = officeService.get(workInvoice.getOffice().getId());
-			String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
-			String  str = "发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName()+",创建人："+userName+",所属部门:"+office.getName();
-			String title = "实际开票单位:"+workInvoice.getClient().getName();
-			// 对不同环节的业务逻辑进行操作
-			String taskDefKey = workInvoice.getAct().getTaskDefKey();
-			if("fpgly".equals(taskDefKey)){
-				updateWorkInvoiceInfo(workInvoice);
-				actTaskService.claim(workInvoice.getAct().getTaskId(), UserUtils.getUser().getId());
-			}else if (!"modifyApply".equals(taskDefKey)) {
-				actTaskService.claim(workInvoice.getAct().getTaskId(), UserUtils.getUser().getId());
-			}else {
-				workInvoice.getAct().setFlag("yes");
-				updateWorkInvoiceInfo(workInvoice);
-			}
-			String comment = "";
-			if (workInvoice.getInvoiceState().equals("4")){
-				comment = ("yes".equals(workInvoice.getAct().getFlag())?"[重新申请] ":"[已撤销] ");
-			}else {
-				comment = ("yes".equals(workInvoice.getAct().getFlag())?"[同意] ":"[驳回] ")+workInvoice.getAct().getComment();
-			}
+		//所属部门
+		Office office = officeService.get(workInvoice.getOffice().getId());
+		String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
+		String  str = "发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName()+",创建人："+userName+",所属部门:"+office.getName();
+		String title = "实际开票单位:"+workInvoice.getClient().getName();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = workInvoice.getAct().getTaskDefKey();
+		if("fpgly".equals(taskDefKey)){
+			updateWorkInvoiceInfo(workInvoice);
+			actTaskService.claim(workInvoice.getAct().getTaskId(), UserUtils.getUser().getId());
+		}else if (!"modifyApply".equals(taskDefKey)) {
+			actTaskService.claim(workInvoice.getAct().getTaskId(), UserUtils.getUser().getId());
+		}else {
+			workInvoice.getAct().setFlag("yes");
+			updateWorkInvoiceInfo(workInvoice);
+		}
+		String comment = "";
+		if (workInvoice.getInvoiceState().equals("4")){
+			comment = ("yes".equals(workInvoice.getAct().getFlag())?"[重新申请] ":"[已撤销] ");
+		}else {
+			comment = ("yes".equals(workInvoice.getAct().getFlag())?"[同意] ":"[驳回] ")+workInvoice.getAct().getComment();
+		}
 		//项目名称获取
 		List<String> projectNameList = getProjectNameList(workInvoice);
 		String projectNameStr = String.join(",", projectNameList);
-			//yes 的时候状态为审核通过 否则为未通过
-			//2 审核中 4 驳回
-			workInvoice.setInvoiceState(("yes".equals(workInvoice.getAct().getFlag()) ? "2" : "4"));
-			Map<String, Object> vars = Maps.newHashMap();
-			//业务逻辑对应的条件表达式
-			String exp = "";
-			String taskCount = "";
-			String notifyRole = "";
-			int key = 0;
-			String enname = "";
-			List<Activity> activitieList = activityService.getByProcessInstanceId(workInvoice.getProcessInstanceId());
-			WorkActivityMenu workActivityMenu = new WorkActivityMenu();
-			if (activitieList != null && activitieList.size() != 0) {
-				workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
-				workActivityMenu.setActivities(activitieList);
-			}
+		//yes 的时候状态为审核通过 否则为未通过
+		//2 审核中 4 驳回
+		workInvoice.setInvoiceState(("yes".equals(workInvoice.getAct().getFlag()) ? "2" : "4"));
+		Map<String, Object> vars = Maps.newHashMap();
+		//业务逻辑对应的条件表达式
+		String exp = "";
+		String taskCount = "";
+		String notifyRole = "";
+		int key = 0;
+		String enname = "";
+		List<Activity> activitieList = activityService.getByProcessInstanceId(workInvoice.getProcessInstanceId());
+		WorkActivityMenu workActivityMenu = new WorkActivityMenu();
+		if (activitieList != null && activitieList.size() != 0) {
+			workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
+			workActivityMenu.setActivities(activitieList);
+		}
 
-			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-			WorkActivityProcess selectProcess = new WorkActivityProcess();
-			selectProcess.setProcessInstanceId(workInvoice.getProcessInstanceId());
-			List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
-			List<Activity> activities = workActivityMenu.getActivities();
-			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newWorkInvoiceBranch")) {
-				key = 1;
-				for (int i = 0; i < workActivityProcesses.size(); i++) {
-					WorkActivityProcess activityProcess = workActivityProcesses.get(i);
-					if (taskDefKey.equals(activityProcess.getActivityTask()) && !taskDefKey.equals("modifyApply")) {
-						taskCount = activityProcess.getCount()+"";
-						workActivityProcess = activityProcess;
-						if (!workActivityProcess.getIsApproval().equals("0")) {
-							workActivityProcess.setId("");
-						}
-						exp = "pass";
-						if (!"yes".equals(workInvoice.getAct().getFlag())) {
-							workInvoice.setInvoiceState("4");
-							workActivityProcess.setIsApproval("2");
-							String returnBack = "-1";
-							for (Activity activity : activities) {
-								if (activity.getCount() == activityProcess.getCount()) {
-									notifyRole = activity.getName();
-									returnBack = activity.getReturnBack();
-									break;
-								}
-							}
-							if (returnBack.equals("0")) {
-								workActivityProcess.setId("");
+		WorkActivityProcess workActivityProcess = new WorkActivityProcess();
+		WorkActivityProcess selectProcess = new WorkActivityProcess();
+		selectProcess.setProcessInstanceId(workInvoice.getProcessInstanceId());
+		List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
+		List<Activity> activities = workActivityMenu.getActivities();
+		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newWorkInvoiceBranch")) {
+			key = 1;
+			for (int i = 0; i < workActivityProcesses.size(); i++) {
+				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
+				if (taskDefKey.equals(activityProcess.getActivityTask()) && !taskDefKey.equals("modifyApply")) {
+					taskCount = activityProcess.getCount()+"";
+					workActivityProcess = activityProcess;
+					if (!workActivityProcess.getIsApproval().equals("0")) {
+						workActivityProcess.setId("");
+					}
+					exp = "pass";
+					if (!"yes".equals(workInvoice.getAct().getFlag())) {
+						workInvoice.setInvoiceState("4");
+						workActivityProcess.setIsApproval("2");
+						String returnBack = "-1";
+						for (Activity activity : activities) {
+							if (activity.getCount() == activityProcess.getCount()) {
+								notifyRole = activity.getName();
+								returnBack = activity.getReturnBack();
+								break;
 							}
-
-						} else {
-							workActivityProcess.setIsApproval("1");
 						}
-					}else if(taskDefKey.equals("modifyApply")){
-						taskCount = "0";
-						notifyRole = "调整申请";
-						exp = "pass";
-						workActivityProcess.setId("");
-						workActivityProcess.setCount(0);
-						if (!"yes".equals(workInvoice.getAct().getFlag())) {
-							workInvoice.setInvoiceState("3");
-							workActivityProcess.setIsApproval("2");
-						} else {
-							workActivityProcess.setIsApproval("1");
+						if (returnBack.equals("0")) {
+							workActivityProcess.setId("");
 						}
-						break;
+
+					} else {
+						workActivityProcess.setIsApproval("1");
 					}
-				}
-			} else {
-				workActivityMenu.setProcessType("newWorkInvoiceBranch");
-				for (int i = 0; i < workActivityProcesses.size(); i++) {
-					WorkActivityProcess activityProcess = workActivityProcesses.get(i);
-					String count = activityProcess.getCount() + "";
-					workActivityProcess = activityProcess;
-					if (!workActivityProcess.getIsApproval().equals("0")) {
-						workActivityProcess.setId("");
+				}else if(taskDefKey.equals("modifyApply")){
+					taskCount = "0";
+					notifyRole = "调整申请";
+					exp = "pass";
+					workActivityProcess.setId("");
+					workActivityProcess.setCount(0);
+					if (!"yes".equals(workInvoice.getAct().getFlag())) {
+						workInvoice.setInvoiceState("3");
+						workActivityProcess.setIsApproval("2");
+					} else {
+						workActivityProcess.setIsApproval("1");
 					}
-					// 审核环节
-					//if ("bmzr".equals(taskDefKey) && count.contains("1")) {
-					if ("fpgly".equals(taskDefKey) && count.contains("1")) {
-						taskCount = "1";
-						exp = "pass";
-						if ("yes".equals(workInvoice.getAct().getFlag()) &&("0").equals(workInvoice.getExt())) {
-							workActivityProcessService.insertAuditsByType(auditUsers,workInvoice.getProcessInstanceId(),2,1);
-							//分公司流程
-							//notifyRole = "财务主任审批";
-							notifyRole = "审批通过";
-							workActivityProcess.setIsApproval("1");
+					break;
+				}
+			}
+		} else {
+			workActivityMenu.setProcessType("newWorkInvoiceBranch");
+			for (int i = 0; i < workActivityProcesses.size(); i++) {
+				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
+				String count = activityProcess.getCount() + "";
+				workActivityProcess = activityProcess;
+				if (!workActivityProcess.getIsApproval().equals("0")) {
+					workActivityProcess.setId("");
+				}
+				// 审核环节
+				//if ("bmzr".equals(taskDefKey) && count.contains("1")) {
+				if ("fpgly".equals(taskDefKey) && count.contains("1")) {
+					taskCount = "1";
+					exp = "pass";
+					if ("yes".equals(workInvoice.getAct().getFlag()) &&("0").equals(workInvoice.getExt())) {
+						workActivityProcessService.insertAuditsByType(auditUsers,workInvoice.getProcessInstanceId(),2,1);
+						//分公司流程
+						//notifyRole = "财务主任审批";
+						notifyRole = "审批通过";
+						workActivityProcess.setIsApproval("1");
 							/*enname = "fpgly";
 							vars.put("fpglyList", auditUsers);
 							vars.put("fpglycount",auditUsers.size());*/
-						}else {
-							notifyRole = "调整申请";
-							workActivityProcess.setIsApproval("2");
-						}
-						break;
-					}  else if ("fpgly".equals(taskDefKey) && count.contains("2")) {
-						taskCount = "2";
-						exp = "pass";
-						if ("yes".equals(workInvoice.getAct().getFlag())) {
-							notifyRole = "审批通过";
-							workActivityProcess.setIsApproval("1");
-						} else {
-							notifyRole = "调整申请";
-							workActivityProcess.setIsApproval("2");
-						}
-						break;
-					}  else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-						taskCount = "0";
-						notifyRole = "财务部门审批";
-						exp = "pass";
-						workActivityProcess.setCount(0);
-						enname = "cwygevod";
-						if (!"yes".equals(workInvoice.getAct().getFlag())) {
-							workInvoice.setInvoiceState("3");
-						}
-						break;
-					} else if ("apply_end".equals(taskDefKey)) {
+					}else {
+						notifyRole = "调整申请";
+						workActivityProcess.setIsApproval("2");
 					}
-
+					break;
+				}  else if ("fpgly".equals(taskDefKey) && count.contains("2")) {
+					taskCount = "2";
+					exp = "pass";
+					if ("yes".equals(workInvoice.getAct().getFlag())) {
+						notifyRole = "审批通过";
+						workActivityProcess.setIsApproval("1");
+					} else {
+						notifyRole = "调整申请";
+						workActivityProcess.setIsApproval("2");
+					}
+					break;
+				}  else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
+					taskCount = "0";
+					notifyRole = "财务部门审批";
+					exp = "pass";
+					workActivityProcess.setCount(0);
+					enname = "cwygevod";
+					if (!"yes".equals(workInvoice.getAct().getFlag())) {
+						workInvoice.setInvoiceState("3");
+					}
+					break;
+				} else if ("apply_end".equals(taskDefKey)) {
 				}
+
 			}
-			// 设置意见
-			workInvoice.getAct().setComment(("yes".equals(workInvoice.getAct().getFlag()) ? "[同意] " : "[驳回] ") + workInvoice.getAct().getComment());
-			workInvoice.preUpdate();
+		}
+		// 设置意见
+		workInvoice.getAct().setComment(("yes".equals(workInvoice.getAct().getFlag()) ? "[同意] " : "[驳回] ") + workInvoice.getAct().getComment());
+		workInvoice.preUpdate();
 
 		WorkProjectNotify nowWorkProjectNotify = workProjectNotifyService.processingInfo(workInvoice.getProcessInstanceId());
 
-			// 提交流程任务
-			vars.put(exp, "yes".equals(workInvoice.getAct().getFlag()) ? true : false);
-		    vars.put("passs", true);
-			workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,workInvoice.getProcessInstanceId(),taskDefKey,"modifyApply",workInvoice.getAct().getFlag(),comment, activities);
-			// 提交流程任务
-			actTaskService.complete(workInvoice.getAct().getTaskId(), workInvoice.getAct().getProcInsId(), workInvoice.getAct().getComment(), vars);
-			boolean state = actTaskService.isProcessEnd(workInvoice.getAct().getProcInsId());
-			List<User> users = new ArrayList<>();
-			List<User> userList = new ArrayList<>();
-			//ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
+		// 提交流程任务
+		vars.put(exp, "yes".equals(workInvoice.getAct().getFlag()) ? true : false);
+		vars.put("passs", true);
+		workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,workInvoice.getProcessInstanceId(),taskDefKey,"modifyApply",workInvoice.getAct().getFlag(),comment, activities);
+		// 提交流程任务
+		actTaskService.complete(workInvoice.getAct().getTaskId(), workInvoice.getAct().getProcInsId(), workInvoice.getAct().getComment(), vars);
+		boolean state = actTaskService.isProcessEnd(workInvoice.getAct().getProcInsId());
+		List<User> users = new ArrayList<>();
+		List<User> userList = new ArrayList<>();
+		//ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
 		if (!state) {
-				users.add(workInvoice.getCreateBy());
-				if ("yes".equals(workInvoice.getAct().getFlag())) {
-					title = "项目【"+ projectNameStr +"】发票申请通过";
-					str = "项目【"+ projectNameStr +"】发票申请通过，发票申请编号："+workInvoice.getNumber();
-					workInvoice.setInvoiceState("5");
-					WorkProjectNotify notify = new WorkProjectNotify();
-					notify.setNotifyId(workInvoice.getId());
-					userList = workProjectNotifyService.readByNotifyId(notify);
+			users.add(workInvoice.getCreateBy());
+			if ("yes".equals(workInvoice.getAct().getFlag())) {
+				title = "项目【"+ projectNameStr +"】发票申请通过";
+				str = "项目【"+ projectNameStr +"】发票申请通过，发票申请编号："+workInvoice.getNumber();
+				workInvoice.setInvoiceState("5");
+				WorkProjectNotify notify = new WorkProjectNotify();
+				notify.setNotifyId(workInvoice.getId());
+				userList = workProjectNotifyService.readByNotifyId(notify);
+				workProjectNotifyService
+						.save(UtilNotify
+								.saveNewNotify(workInvoice.getId(),
+										workInvoice.getCreateBy(),
+										workInvoice.getCompanyId(),
+										title,
+										str,
+										"21",
+										"0",
+										"待通知",
+										notifyRole,
+										workInvoice.getProcessInstanceId(), new Date()));
+
+			} else {
+				WorkProjectNotify notify = new WorkProjectNotify();
+				notify.setNotifyId(workInvoice.getId());
+				userList = workProjectNotifyService.readByNotifyId(notify);
+				if (StringUtils.isNotBlank(workInvoice.getInvoiceState()) && !workInvoice.getInvoiceState().equals("3")){
+					workInvoice.setInvoiceState("4");
 					workProjectNotifyService
 							.save(UtilNotify
 									.saveNewNotify(workInvoice.getId(),
@@ -1393,80 +1392,118 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 											"待通知",
 											notifyRole,
 											workInvoice.getProcessInstanceId(), new Date()));
+				}
+			}
+			workActivityProcessService.deleteProcessIdAuditUsers(workInvoice.getProcessInstanceId());
+		} else {
+			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newWorkInvoiceBranch")) {
+				WorkProjectNotify notify = new WorkProjectNotify();
+				notify.setNotifyId(workInvoice.getId());
+				userList = workProjectNotifyService.readByNotifyId(notify);
+				WorkProjectNotify workProjectNotify = UtilNotify
+						.saveNewNotify(workInvoice.getId(),
+								new User(),
+								workInvoice.getCompanyId(),
+								title,
+								str,
+								"21",
+								"0",
+								"待审批",
+								notifyRole,
+								workInvoice.getProcessInstanceId(), new Date());
+				List<WorkProjectNotify> workProjectNotifys = activityService.getByFlagAndTaskDefKeyList(
+						activities,
+						workProjectNotify,
+						taskDefKey,
+						workInvoice.getAct().getFlag(),
+						taskCount,
+						workInvoice.getCreateBy(),
+						workInvoice.getOfficeId(),
+						"5");
+				for (WorkProjectNotify workProjectNotify1:workProjectNotifys){
+					users.add(workProjectNotify1.getUser());
+					workProjectNotify1.setId("");
+					workProjectNotify1.setIsNewRecord(false);
+					workProjectNotifyService
+							.save(workProjectNotify1);
+					if (!"modifyApply".equals(taskDefKey)){
+						Map<String,Object> extras = new HashMap<>();
+						if ("fpgly".equals(taskDefKey) ){
+							extras.put("type","7001");
+						}else {
+							extras.put("type","7002");
+						}
+						extras.put("id",workProjectNotify.getId());
+						extras.put("procDefKey","21");
+						UserUtils.pushInfoToApp(title,str,extras,workProjectNotify1.getUser().getId());
 
-				} else {
-					WorkProjectNotify notify = new WorkProjectNotify();
-					notify.setNotifyId(workInvoice.getId());
-					userList = workProjectNotifyService.readByNotifyId(notify);
-					if (StringUtils.isNotBlank(workInvoice.getInvoiceState()) && !workInvoice.getInvoiceState().equals("3")){
-						workInvoice.setInvoiceState("4");
-						workProjectNotifyService
-								.save(UtilNotify
-										.saveNewNotify(workInvoice.getId(),
-												workInvoice.getCreateBy(),
-												workInvoice.getCompanyId(),
-												title,
-												str,
-												"21",
-												"0",
-												"待通知",
-												notifyRole,
-												workInvoice.getProcessInstanceId(), new Date()));
 					}
 				}
-				workActivityProcessService.deleteProcessIdAuditUsers(workInvoice.getProcessInstanceId());
+
 			} else {
-				if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newWorkInvoiceBranch")) {
+				if (!"yes".equals(workInvoice.getAct().getFlag())) {//驳回待办提醒
+					title = "项目【"+ projectNameStr +"】发票申请被驳回";
+					str = "项目【"+ projectNameStr +"】发票申请被驳回，请选择重新申请或作废";
 					WorkProjectNotify notify = new WorkProjectNotify();
 					notify.setNotifyId(workInvoice.getId());
 					userList = workProjectNotifyService.readByNotifyId(notify);
-					WorkProjectNotify workProjectNotify = UtilNotify
-							.saveNewNotify(workInvoice.getId(),
-									new User(),
-									workInvoice.getCompanyId(),
-									title,
-									str,
-									"21",
-									"0",
-									"待审批",
-									notifyRole,
-									workInvoice.getProcessInstanceId(), new Date());
-					List<WorkProjectNotify> workProjectNotifys = activityService.getByFlagAndTaskDefKeyList(
-							activities,
-							workProjectNotify,
-							taskDefKey,
-							workInvoice.getAct().getFlag(),
-							taskCount,
-							workInvoice.getCreateBy(),
-							workInvoice.getOfficeId(),
-							"5");
-					for (WorkProjectNotify workProjectNotify1:workProjectNotifys){
-						users.add(workProjectNotify1.getUser());
-						workProjectNotify1.setId("");
-						workProjectNotify1.setIsNewRecord(false);
-						workProjectNotifyService
-								.save(workProjectNotify1);
-						if (!"modifyApply".equals(taskDefKey)){
-							Map<String,Object> extras = new HashMap<>();
-							if ("fpgly".equals(taskDefKey) ){
-								extras.put("type","7001");
-							}else {
-								extras.put("type","7002");
-							}
-							extras.put("id",workProjectNotify.getId());
-							extras.put("procDefKey","21");
-							UserUtils.pushInfoToApp(title,str,extras,workProjectNotify1.getUser().getId());
+					workProjectNotifyService
+							.save(UtilNotify
+									.saveNewNotify(workInvoice.getId(),
+											workInvoice.getCreateBy(),
+											workInvoice.getCompanyId(),
+											title,
+											str,
+											"21",
+											"0",
+											"重新申请",
+											notifyRole,
+											workInvoice.getProcessInstanceId(), new Date()));
+					users.add( workInvoice.getCreateBy());
+				} else {
+					if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
+						title = "项目【"+ projectNameStr +"】发票重新申请，待审批";
+						str = "项目【"+ projectNameStr +"】发票重新申请，待审批，发票申请编号："+workInvoice.getNumber();;
+						WorkProjectNotify notify = new WorkProjectNotify();
+						notify.setNotifyId(workInvoice.getId());
+						userList = workProjectNotifyService.readByNotifyId(notify);
+						WorkProjectNotify workProjectNotify = UtilNotify
+								.saveNewNotify(workInvoice.getId(),
+										new User(),
+										workInvoice.getCompanyId(),
+										title,
+										str,
+										"21",
+										"0",
+										"待审批",
+										notifyRole,
+										workInvoice.getProcessInstanceId(), new Date());
+						for (User user1:auditUsers){
+							users.add(user1);
+							workProjectNotify.setUser(user1);
+							workProjectNotify.setId("");
+							workProjectNotify.setIsNewRecord(false);
+							workProjectNotifyService
+									.save(workProjectNotify);
+							if (!"modifyApply".equals(taskDefKey)){
+								Map<String,Object> extras = new HashMap<>();
+								if ("fpgly".equals(taskDefKey)){
+									extras.put("type","7001");
+								}else {
+									extras.put("type","7002");
+								}
+								extras.put("id",workProjectNotify.getId());
+								extras.put("procDefKey","21");
+								UserUtils.pushInfoToApp(title,str,extras,user1.getId());
 
+							}
 						}
-					}
-
-				} else {
-					if (!"yes".equals(workInvoice.getAct().getFlag())) {//驳回待办提醒
-						title = "项目【"+ projectNameStr +"】发票申请被驳回";
-						str = "项目【"+ projectNameStr +"】发票申请被驳回，请选择重新申请或作废";
+					}else {
 						WorkProjectNotify notify = new WorkProjectNotify();
 						notify.setNotifyId(workInvoice.getId());
 						userList = workProjectNotifyService.readByNotifyId(notify);
+						users.addAll(userList);
+						users.add(workInvoice.getCreateBy());
 						workProjectNotifyService
 								.save(UtilNotify
 										.saveNewNotify(workInvoice.getId(),
@@ -1479,83 +1516,26 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 												"重新申请",
 												notifyRole,
 												workInvoice.getProcessInstanceId(), new Date()));
-						users.add( workInvoice.getCreateBy());
-					} else {
-						if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
-							title = "项目【"+ projectNameStr +"】发票重新申请，待审批";
-							str = "项目【"+ projectNameStr +"】发票重新申请，待审批，发票申请编号："+workInvoice.getNumber();;
-							WorkProjectNotify notify = new WorkProjectNotify();
-							notify.setNotifyId(workInvoice.getId());
-							userList = workProjectNotifyService.readByNotifyId(notify);
-							WorkProjectNotify workProjectNotify = UtilNotify
-									.saveNewNotify(workInvoice.getId(),
-											new User(),
-											workInvoice.getCompanyId(),
-											title,
-											str,
-											"21",
-											"0",
-											"待审批",
-											notifyRole,
-											workInvoice.getProcessInstanceId(), new Date());
-							for (User user1:auditUsers){
-								users.add(user1);
-								workProjectNotify.setUser(user1);
-								workProjectNotify.setId("");
-								workProjectNotify.setIsNewRecord(false);
-								workProjectNotifyService
-										.save(workProjectNotify);
-								if (!"modifyApply".equals(taskDefKey)){
-									Map<String,Object> extras = new HashMap<>();
-									if ("fpgly".equals(taskDefKey)){
-										extras.put("type","7001");
-									}else {
-										extras.put("type","7002");
-									}
-									extras.put("id",workProjectNotify.getId());
-									extras.put("procDefKey","21");
-									UserUtils.pushInfoToApp(title,str,extras,user1.getId());
-
-								}
-							}
-						}else {
-							WorkProjectNotify notify = new WorkProjectNotify();
-							notify.setNotifyId(workInvoice.getId());
-							userList = workProjectNotifyService.readByNotifyId(notify);
-							users.addAll(userList);
-							users.add(workInvoice.getCreateBy());
-							workProjectNotifyService
-									.save(UtilNotify
-											.saveNewNotify(workInvoice.getId(),
-													workInvoice.getCreateBy(),
-													workInvoice.getCompanyId(),
-													title,
-													str,
-													"21",
-													"0",
-													"重新申请",
-													notifyRole,
-													workInvoice.getProcessInstanceId(), new Date()));
-						}
 					}
 				}
 			}
+		}
 		//对数据进行处理
 		if(null != nowWorkProjectNotify){
 			workProjectNotifyService.updateWpaData(nowWorkProjectNotify);
 		}
-			if (users!=null && users.size()!=0) {
-				for (User u : users) {
-					UserUtils.pushIm(u.getId(),str);
-				}
+		if (users!=null && users.size()!=0) {
+			for (User u : users) {
+				UserUtils.pushIm(u.getId(),str);
 			}
-			if (userList!=null && userList.size()!=0) {
-				for (User u : userList) {
-					UserUtils.pushMeIm(u.getId());
-				}
+		}
+		if (userList!=null && userList.size()!=0) {
+			for (User u : userList) {
+				UserUtils.pushMeIm(u.getId());
 			}
-			workInvoiceDao.update(workInvoice);
-			return "保存审核意见成功！";
+		}
+		workInvoiceDao.update(workInvoice);
+		return "保存审核意见成功！";
 	}
 
 
@@ -1707,14 +1687,14 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	 */
 	@Transactional(readOnly = false)
 	public void conditionCancelInvalidate(WorkInvoice workInvoice) {
-		String invalidateProcessInstanceId = workInvoice.getProcessInstanceId();
+		String invalidateProcessInstanceId = workInvoice.getCancellationProcessInstanceId();
 		try {
 			//将流程图中尚未走到的task的流程追踪信息逻辑删除，添加一条"撤销"流程追踪信息
 			WorkActivityProcess process = new WorkActivityProcess();
-			process.setProcessInstanceId(workInvoice.getProcessInstanceId());
+			process.setProcessInstanceId(workInvoice.getCancellationProcessInstanceId());
 			process.setIsApproval("0");
 			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-			workActivityProcess.setProcessInstanceId(workInvoice.getProcessInstanceId());
+			workActivityProcess.setProcessInstanceId(workInvoice.getCancellationProcessInstanceId());
 			List<WorkActivityProcess> processList = workActivityProcessService.findList(workActivityProcess);
 			WorkProjectNotify notify = new WorkProjectNotify();
 			notify.setNotifyId(workInvoice.getId());
@@ -1741,7 +1721,7 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 			}
 			//结束该流程,设为"撤销"状态
 			actTaskService.endProcessInstance(invalidateProcessInstanceId, "发票作废-撤销");
-			workInvoice.setInvoiceState("11");
+			workInvoice.setCancellationState("11");
 			workInvoice.preUpdate();
 			workInvoiceDao.update(workInvoice);
 		} catch (ActivitiObjectNotFoundException e) {

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -474,7 +474,7 @@ public class WorkInvoiceTwoController extends BaseController {
 			}
 
 			if(projectIdList.size()>0){
-			//根据项目id查询项目信息中的项目类别
+				//根据项目id查询项目信息中的项目类别
 				String projectSortCostInfo = ruralProjectRecordsService.getProjectSortCostInfo(projectIdList);
 				//如果项目类别中包含审定（内）即 8 则需要进行部门主任审核
 				if(null != projectSortCostInfo && projectSortCostInfo.contains("8")){
@@ -639,39 +639,39 @@ public class WorkInvoiceTwoController extends BaseController {
 		User loginUser = UserUtils.getUser();
 		String invoiceState = workInvoice.getCancellationState();
 		if(null != loginUser && (loginUser.getOffice().getName().equals("财务部") || loginUser.getId().equals(workInvoice.getCreateBy().getId()))){
-		//启动流程
-		workInvoice.setCancellationState("6");
-		String cancellationProcessInstanceId ="";
-		if (user!=null && StringUtils.isNotBlank(user.getId()) && StringUtils.isNotBlank(invoiceState) && "9".equals(invoiceState)){
-			cancellationProcessInstanceId = workInvoiceService.get(workInvoice.getId()).getCancellationProcessInstanceId();
-		}
-		try {
-			Map<String, Object> variables = Maps.newHashMap();
+			//启动流程
+			workInvoice.setCancellationState("6");
+			String cancellationProcessInstanceId ="";
+			if (user!=null && StringUtils.isNotBlank(user.getId()) && StringUtils.isNotBlank(invoiceState) && "9".equals(invoiceState)){
+				cancellationProcessInstanceId = workInvoiceService.get(workInvoice.getId()).getCancellationProcessInstanceId();
+			}
+			try {
+				Map<String, Object> variables = Maps.newHashMap();
 			/*WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
 			workInvoice.setClient(workClientInfo);
 			workInvoice.setProject(workProject);*/
-			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
-			workInvoice.setOfficeId(UserUtils.getSelectOffice().getId());
-			String str = "";
-			//1总公司0分公司
-			if("1".equals(workInvoice.getExt())){
-				//str = workInvoiceService.save(workInvoice, variables,processInstanceId);
-				str = workInvoiceService.cancellationBranch(workInvoice, variables,cancellationProcessInstanceId);
-			}else if("0".equals(workInvoice.getExt())){
-				str = workInvoiceService.cancellationBranch(workInvoice, variables,cancellationProcessInstanceId);
-			}
-			if(StringUtils.isNotBlank(workInvoice.getExt())){
-				if (StringUtils.isNotBlank(str)){
-					addMessage(redirectAttributes, "发票作废申请提交失败:"+str);
-				}else {
-					addMessage(redirectAttributes, "发票作废申请已经提交");
+				workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
+				workInvoice.setOfficeId(UserUtils.getSelectOffice().getId());
+				String str = "";
+				//1总公司0分公司
+				if("1".equals(workInvoice.getExt())){
+					//str = workInvoiceService.save(workInvoice, variables,processInstanceId);
+					str = workInvoiceService.cancellationBranch(workInvoice, variables,cancellationProcessInstanceId);
+				}else if("0".equals(workInvoice.getExt())){
+					str = workInvoiceService.cancellationBranch(workInvoice, variables,cancellationProcessInstanceId);
+				}
+				if(StringUtils.isNotBlank(workInvoice.getExt())){
+					if (StringUtils.isNotBlank(str)){
+						addMessage(redirectAttributes, "发票作废申请提交失败:"+str);
+					}else {
+						addMessage(redirectAttributes, "发票作废申请已经提交");
+					}
 				}
+			} catch (Exception e) {
+				addMessage(redirectAttributes, "发票作废申请提交失败!");
+				logger.error("Exception e:"+e);
 			}
-		} catch (Exception e) {
-			addMessage(redirectAttributes, "发票作废申请提交失败!");
-			logger.error("Exception e:"+e);
-		}
 		}
 		else{
 			addMessage(redirectAttributes, "您不是申请人或财务部成员，无法作废");
@@ -689,48 +689,48 @@ public class WorkInvoiceTwoController extends BaseController {
 	 */
 	@RequestMapping(value = "cancellationSaveAudit")
 	public String cancellationSaveAudit(WorkInvoice workInvoice, Model model,
-							RedirectAttributes redirectAttributes) {
+										RedirectAttributes redirectAttributes) {
 		try{
-		// 对不同环节的业务逻辑进行操作
-		String taskDefKey = workInvoice.getAct().getTaskDefKey();
-		List<User> users = null;
-		//所属部门
-		Office office = officeService.get(workInvoice.getOffice().getId());
-		if ("bmzr".equals(taskDefKey)){
-			if(("1").equals(workInvoice.getExt())) {
-				users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 2);
-				if (users == null)
-					users = UserUtils.getByRoleActivityEnname("scfgld", 1, office.getId(), "5", workInvoice.getCreateBy());
-			}else{
+			// 对不同环节的业务逻辑进行操作
+			String taskDefKey = workInvoice.getAct().getTaskDefKey();
+			List<User> users = null;
+			//所属部门
+			Office office = officeService.get(workInvoice.getOffice().getId());
+			if ("bmzr".equals(taskDefKey)){
+				if(("1").equals(workInvoice.getExt())) {
+					users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 2);
+					if (users == null)
+						users = UserUtils.getByRoleActivityEnname("scfgld", 1, office.getId(), "5", workInvoice.getCreateBy());
+				}else{
+					users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),3);
+					if (users==null )
+						users = UserUtils.getByRoleActivityEnname("cwzg",3,office.getId(),"5",workInvoice.getCreateBy());
+				}
+			}else  if ("scbzr".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),3);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("cwzg",3,office.getId(),"5",workInvoice.getCreateBy());
-			}
-		}else  if ("scbzr".equals(taskDefKey)){
-			users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),3);
-			if (users==null )
-				users = UserUtils.getByRoleActivityEnname("cwzg",1,office.getId(),"5",workInvoice.getCreateBy());
-		}else  if ("fpgly".equals(taskDefKey)){
-			if(("1").equals(workInvoice.getExt())) {
-				users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 3);
-			}else{
-				users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),1);
+					users = UserUtils.getByRoleActivityEnname("cwzg",1,office.getId(),"5",workInvoice.getCreateBy());
+			}else  if ("fpgly".equals(taskDefKey)){
+				if(("1").equals(workInvoice.getExt())) {
+					users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 3);
+				}else{
+					users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),1);
+				}
+			}else if ("modifyApply".equals(taskDefKey)){
+				users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 1);
 			}
-		}else if ("modifyApply".equals(taskDefKey)){
-			users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 1);
-		}
-		String flag = workInvoice.getAct().getFlag();
-		if ("yes".equals(flag) && (users==null || users.size()==0)){
-			addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
-		}else {
-			String str = "";
-			if(("1").equals(workInvoice.getExt())){
-				str = workInvoiceService.cancellationSaveAudit(workInvoice,users);
-			}else if(("0").equals(workInvoice.getExt())){
-				str = workInvoiceService.cancellationSaveAudit(workInvoice,users);
+			String flag = workInvoice.getAct().getFlag();
+			if ("yes".equals(flag) && (users==null || users.size()==0)){
+				addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
+			}else {
+				String str = "";
+				if(("1").equals(workInvoice.getExt())){
+					str = workInvoiceService.cancellationSaveAudit(workInvoice,users);
+				}else if(("0").equals(workInvoice.getExt())){
+					str = workInvoiceService.cancellationSaveAudit(workInvoice,users);
+				}
+				addMessage(redirectAttributes, str);
 			}
-			addMessage(redirectAttributes, str);
-		}
 		}catch (Exception e){
 			addMessage(redirectAttributes, "审批失败:");
 			logger.error("Exception e:"+e);
@@ -851,11 +851,11 @@ public class WorkInvoiceTwoController extends BaseController {
 	 * 导出excel文件
 	 */
 	@RequiresPermissions("workinvoiceTwo:workinvoiceTwo:export")
-    @RequestMapping(value = "export", method=RequestMethod.POST)
-    public String exportFile(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+	@RequestMapping(value = "export", method=RequestMethod.POST)
+	public String exportFile(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
-            String fileName = "发票一览表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-            Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
+			String fileName = "发票一览表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+			Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
 			List<WorkInvoice> workInvoiceList = page.getList();
 			workInvoiceService.disposeListExport(workInvoiceList);
 
@@ -878,22 +878,22 @@ public class WorkInvoiceTwoController extends BaseController {
 				String projectNameStr = String.join(",", projectNameList);
 				invoice.setProjectName(projectNameStr);*/
 			}
-    		new ExportExcel("发票一览表", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
-    		return null;
+			new ExportExcel("发票一览表", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
+			return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导出发票管理记录失败！失败信息："+e.getMessage());
 			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceTwo/workinvoiceTwo/?repage";
-    }
+	}
 
 	/**
 	 * 导入Excel数据
 
 	 */
 	@RequiresPermissions("workinvoiceTwo:workInvoice:import")
-    @RequestMapping(value = "import", method=RequestMethod.POST)
-    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+	@RequestMapping(value = "import", method=RequestMethod.POST)
+	public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
 		try {
 			int successNum = 0;
 			int failureNum = 0;
@@ -921,25 +921,25 @@ public class WorkInvoiceTwoController extends BaseController {
 			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceTwo/workinvoiceTwo/?repage";
-    }
+	}
 
 	/**
 	 * 下载导入开票管理数据模板
 	 */
 	@RequiresPermissions("workinvoice:workInvoice:import")
-    @RequestMapping(value = "import/template")
-    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+	@RequestMapping(value = "import/template")
+	public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
-            String fileName = "发票管理数据导入模板.xlsx";
-    		List<WorkInvoice> list = Lists.newArrayList();
-    		new ExportExcel("发票管理数据", WorkInvoice.class, 1).setDataList(list).write(response, fileName).dispose();
-    		return null;
+			String fileName = "发票管理数据导入模板.xlsx";
+			List<WorkInvoice> list = Lists.newArrayList();
+			new ExportExcel("发票管理数据", WorkInvoice.class, 1).setDataList(list).write(response, fileName).dispose();
+			return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
 			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceTwo/workinvoiceTwo/?repage";
-    }
+	}
 
 
 	/**
@@ -1297,7 +1297,7 @@ public class WorkInvoiceTwoController extends BaseController {
 	@RequestMapping(value = "applyOnWorkInvoice")
 	public String applyOnWorkInvoice(Act act, HttpServletResponse response, Model model) {
 		// 获取流程XML上的表单KEY
-			String formKey = "/workinvoice/workInvoice/form";
+		String formKey = "/workinvoice/workInvoice/form";
 		//logger.info("------formKeys:"+formKeys);
 		// 获取流程实例对象
 		if (act.getProcInsId() != null){
@@ -1531,7 +1531,7 @@ public class WorkInvoiceTwoController extends BaseController {
 		//return "redirect:" + adminPath + "/act/task";
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceTwo/workinvoiceTwo/?repage";
 	}
-/*--------------------------分割线---------------------------------*/
+	/*--------------------------分割线---------------------------------*/
 
 
 

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -83,10 +83,6 @@ import com.jeeplus.modules.signature.dailyOfficeWork.entity.DailyOfficeWork;
 import com.jeeplus.modules.signature.dailyOfficeWork.service.DailyOfficeWorkService;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureWork;
 import com.jeeplus.modules.signature.projectReportSignatureWork.service.ProjectReportSignatureWorkService;
-import com.jeeplus.modules.signatureManagement.businessSignature.entity.BusinessSignatureInfo;
-import com.jeeplus.modules.signatureManagement.businessSignature.service.BusinessSignatureService;
-import com.jeeplus.modules.signatureManagement.electronicSignature.entity.ElectronicSignatureInfo;
-import com.jeeplus.modules.signatureManagement.electronicSignature.service.ElectronicSignatureService;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
 import com.jeeplus.modules.sys.dao.RoleDao;
@@ -394,11 +390,11 @@ public class WorkProjectNotifyController extends BaseController {
 	protected HistoryService historyService;
 	@Autowired
 	protected WorkInvoiceDetailService workInvoiceDetailService;
-    @Autowired
-    private ProjectRecordsService projectRecordsService;
-    @Autowired
-    private RuralProjectRecordsService ruralProjectRecordsService;
-    @Autowired
+	@Autowired
+	private ProjectRecordsService projectRecordsService;
+	@Autowired
+	private RuralProjectRecordsService ruralProjectRecordsService;
+	@Autowired
 	private ProjectContentDataService projectContentDataService;
 	@Autowired
 	private RuralPeojectRecordChooseCheckService ruralPeojectRecordChooseCheckService;
@@ -559,10 +555,6 @@ public class WorkProjectNotifyController extends BaseController {
 
 	@Autowired
 	private ProjectReportSignatureWorkService projectReportSignatureService;
-	@Autowired
-	private ElectronicSignatureService electronicSignatureService;
-	@Autowired
-	private BusinessSignatureService businessSignatureService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -1597,16 +1589,114 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				} else if (workProjectNotify.getType().equals("170")) {    //日常签章
 
-					return this.dailyOfficeWorkAudit(workProjectNotify,model);
+					DailyOfficeWork dailyOfficeWork = dailyOfficeWorkService.get(workProjectNotify.getNotifyId());
+
+					if (dailyOfficeWork != null && StringUtils.isNotBlank(dailyOfficeWork.getId())) {
+
+
+						if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+							dailyOfficeWork.setSignatureUrlFlag(1);
+							//处理文件路径
+							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+							/*if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
+								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
+									dailyOfficeWork.setSignatureUrl(signatureUrl);
+								}
+								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}else{
+								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}*/
+						}else{
+							dailyOfficeWork.setSignatureUrlFlag(0);
+						}
+					}
+					dailyOfficeWork.setAct(getByAct(dailyOfficeWork.getProcessInstanceId()));
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						dailyOfficeWork.setHome(workProjectNotify.getHome());
+					}else{
+						dailyOfficeWork.setHome("home");
+					}
+					//判定当前流程页面签署是否已经签署过，若签署过，则auditFlag 赋值 1
+					model.addAttribute("auditFlag",dailyOfficeWork.getSignatureFlag());
+
+					model.addAttribute("processInstanceId", dailyOfficeWork.getProcessInstanceId());
+					model.addAttribute("dailyOfficeWork", dailyOfficeWork);
+
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+						if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+							WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+							//处理文件路径
+							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+							if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
+								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
+									dailyOfficeWork.setSignatureUrl(signatureUrl);
+								}
+								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}else{
+								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}
+							User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
+							signatureAttachment.setCreateBy(user);
+							signatureAttachment.setUpdateBy(user);
+							signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
+							signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
+							signatureAttachment.setDelFlag("0");
+							signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
+							String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
+							signatureAttachment.setType(type);
+							signatureWorkAttachments.add(signatureAttachment);
+						}
 
-				} else if (workProjectNotify.getType().equals("192")) {    //电子用章申请
 
-					return this.electronicSignatureAudit(workProjectNotify,model);
+						if(signatureWorkAttachments.size()>0){
+							dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
+						}
+						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						//审核模板标识
+						model.addAttribute("identification", "signatureDailyOfficeWork");
+						model.addAttribute("identificationName","日常签章申请审核意见");
+						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureAudit";
+					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureModify";
+					} else {
+						List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+						if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+							WorkClientAttachment signatureAttachment = new WorkClientAttachment();
 
-				} else if (workProjectNotify.getType().equals("193")) {    //业务用章申请
+							//处理文件路径
+							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+							if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
+								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
+									dailyOfficeWork.setSignatureUrl(signatureUrl);
+								}
+								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}else{
+								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}
+							User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
+							signatureAttachment.setCreateBy(user);
+							signatureAttachment.setUpdateBy(user);
+							signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
+							signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
+							signatureAttachment.setDelFlag("0");
+							signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
+							String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
+							signatureAttachment.setType(type);
+							signatureWorkAttachments.add(signatureAttachment);
+						}
 
-					return this.businessSignatureAudit(workProjectNotify,model);
 
+						if(signatureWorkAttachments.size()>0){
+							dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
+						}
+						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
+					}
 				} else if (workProjectNotify.getType().equals("173")) {    //报告签章
 					return this.disposeProjectReportSignatureWork(workProjectNotify,model);
 
@@ -2246,7 +2336,7 @@ public class WorkProjectNotifyController extends BaseController {
 						workInvoice.setBank(bankName);
 					}
 					workInvoice.setHome("home");
-					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+					workInvoice.setAct(getByAct(workInvoice.getCancellationProcessInstanceId()));
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
@@ -3991,26 +4081,26 @@ public class WorkProjectNotifyController extends BaseController {
 							break;
 					}
 
-						//添加报告类型
-						relateInfo.setRequiredStage(1);
-						relateInfo.setId(ruralProjectRecords.getId());
-						//查询报告文件、依据性文件、其他文件必填列表以及数据
-						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-						for (MainDictDetail mainDict : mainDictDetails) {
-							relateInfo.setAttachType(mainDict.getValue());
-							switch (mainDict.getValue()) {
-								case "11":
-									projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-									break;
-								case "12":
-									projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-									break;
-								case "13":
-									projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-									break;
-							}
-
+					//添加报告类型
+					relateInfo.setRequiredStage(1);
+					relateInfo.setId(ruralProjectRecords.getId());
+					//查询报告文件、依据性文件、其他文件必填列表以及数据
+					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+					for (MainDictDetail mainDict : mainDictDetails) {
+						relateInfo.setAttachType(mainDict.getValue());
+						switch (mainDict.getValue()) {
+							case "11":
+								projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+								break;
+							case "12":
+								projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+								break;
+							case "13":
+								projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+								break;
 						}
+
+					}
 					//}
 					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
 						projectcontentinfo.setHome(workProjectNotify.getHome());
@@ -5635,105 +5725,105 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageTwoView";
 					}
 				}else if (workProjectNotify.getType().equals("99")) {    //资料缺失说明
-						//查询“配农网”工程类型id
-						String engineeringId = engineeringService.getEngineeringId("202");
-						ProjectMaterialDefectRecord materialDefectRecord = projectReportRecordService.getMaterialDefectRecord(workProjectNotify.getNotifyId());
-						//获取项目信息
-						RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(materialDefectRecord.getReportId());
-						//判断是否未全过程归档项目信息
-						if("3".equals(ruralProjectRecords.getProjectType())){
-							Act act = getByAct(materialDefectRecord.getProcessInstanceId());
-							materialDefectRecord.setAct(act);
-							materialDefectRecord.setHome("home");
-							model.addAttribute("materialDefectRecord", materialDefectRecord);
-							if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-								return "modules/processProjectReportRecord/projectReportRecordView";
-							}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-								return "modules/processProjectReportRecord/projectReportRecordAudit";
-							} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-								return "modules/processProjectReportRecord/projectReportRecordModifyApply";
-							} else {
-								return "modules/processProjectReportRecord/projectReportRecordView";
-							}
-						}
-						ProjectReportData projectReportData = projectReportDataService.getOnRural(materialDefectRecord.getReport().getId());
-						materialDefectRecord.setProjectReportData(projectReportData);
-						Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
-						projectcontentinfo.setProjectReportData(projectReportData);
-						//获取子项目列表信息
-						List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
-						//获取合同信息
-						WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
-						if(null != workContractInfo){
-							WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-							model.addAttribute("workClientInfo", clientInfo);
-							if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
-								//收费标准
-								String [] biao=workContractInfo.getChargeCriterion().split(",");
-								List<String> chargeCriterionList=new ArrayList<>();
-								for (int i=0;i<biao.length;i++){
-									chargeCriterionList.add(biao[i]);
-								}
-								materialDefectRecord.setChargeCriterionList(chargeCriterionList);
+					//查询“配农网”工程类型id
+					String engineeringId = engineeringService.getEngineeringId("202");
+					ProjectMaterialDefectRecord materialDefectRecord = projectReportRecordService.getMaterialDefectRecord(workProjectNotify.getNotifyId());
+					//获取项目信息
+					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(materialDefectRecord.getReportId());
+					//判断是否未全过程归档项目信息
+					if("3".equals(ruralProjectRecords.getProjectType())){
+						Act act = getByAct(materialDefectRecord.getProcessInstanceId());
+						materialDefectRecord.setAct(act);
+						materialDefectRecord.setHome("home");
+						model.addAttribute("materialDefectRecord", materialDefectRecord);
+						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							return "modules/processProjectReportRecord/projectReportRecordView";
+						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+							return "modules/processProjectReportRecord/projectReportRecordAudit";
+						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+							return "modules/processProjectReportRecord/projectReportRecordModifyApply";
+						} else {
+							return "modules/processProjectReportRecord/projectReportRecordView";
+						}
+					}
+					ProjectReportData projectReportData = projectReportDataService.getOnRural(materialDefectRecord.getReport().getId());
+					materialDefectRecord.setProjectReportData(projectReportData);
+					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
+					projectcontentinfo.setProjectReportData(projectReportData);
+					//获取子项目列表信息
+					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
+					//获取合同信息
+					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
+					if(null != workContractInfo){
+						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						model.addAttribute("workClientInfo", clientInfo);
+						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+							//收费标准
+							String [] biao=workContractInfo.getChargeCriterion().split(",");
+							List<String> chargeCriterionList=new ArrayList<>();
+							for (int i=0;i<biao.length;i++){
+								chargeCriterionList.add(biao[i]);
 							}
+							materialDefectRecord.setChargeCriterionList(chargeCriterionList);
 						}
+					}
 
-						Act act = getByAct(materialDefectRecord.getProcessInstanceId());
-						materialDefectRecord.setAct(act);
+					Act act = getByAct(materialDefectRecord.getProcessInstanceId());
+					materialDefectRecord.setAct(act);
 
-						if(StringUtils.isNotBlank(workProjectNotify.getHome())){
-							materialDefectRecord.setHome(workProjectNotify.getHome());
-						}else{
-							materialDefectRecord.setHome("home");
-						}
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						materialDefectRecord.setHome(workProjectNotify.getHome());
+					}else{
+						materialDefectRecord.setHome("home");
+					}
 
 
-						WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfoByReported(ruralProjectRecords.getWorkContractInfo().getId());
-						ruralProjectRecords.setWorkContractInfo(projectContractInfo);
-						materialDefectRecord.getReport().setProject(new ProjectRecords());
-						MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,materialDefectRecord.getReport().getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
-						if(null != projectContractInfo){
-							if(projectContractInfo.getWorkClientInfoList().size()>0){
-								model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());
-							}
+					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfoByReported(ruralProjectRecords.getWorkContractInfo().getId());
+					ruralProjectRecords.setWorkContractInfo(projectContractInfo);
+					materialDefectRecord.getReport().setProject(new ProjectRecords());
+					MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,materialDefectRecord.getReport().getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
+					if(null != projectContractInfo){
+						if(projectContractInfo.getWorkClientInfoList().size()>0){
+							model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());
 						}
+					}
 
-						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-						//添加项目类型
-						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-						String money=ruralProjectRecords.getSubmitMoney();
-						Integer approvalMoney=null;
-						if(StringUtils.isBlank(money)){
-							approvalMoney=1;
-						}else{
-							approvalMoney=Integer.parseInt(money);
-						}
-						switch (approvalMoney){
-							case 0:
-								//金额为0
-								relateInfo.setAttachmentProjectApprovalMoney(null);
-								break;
-							case 1:
-								//500w以下金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("1");
-								break;
-							case 2:
-								//500w以上金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("2");
-								break;
-						}
+					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+					//添加项目类型
+					relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+					String money=ruralProjectRecords.getSubmitMoney();
+					Integer approvalMoney=null;
+					if(StringUtils.isBlank(money)){
+						approvalMoney=1;
+					}else{
+						approvalMoney=Integer.parseInt(money);
+					}
+					switch (approvalMoney){
+						case 0:
+							//金额为0
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+							break;
+						case 1:
+							//500w以下金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("1");
+							break;
+						case 2:
+							//500w以上金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("2");
+							break;
+					}
 
-						//添加报告类型
-						//relateInfo.setRequiredStage(2);
-						List<Integer> requiredStageList = Lists.newArrayList();
-						requiredStageList.add(1);
-						requiredStageList.add(2);
-						relateInfo.setRequiredStageList(requiredStageList);
-						relateInfo.setId(ruralProjectRecords.getId());
-						//查询报告文件、依据性文件、其他文件必填列表以及数据
-						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+					//添加报告类型
+					//relateInfo.setRequiredStage(2);
+					List<Integer> requiredStageList = Lists.newArrayList();
+					requiredStageList.add(1);
+					requiredStageList.add(2);
+					relateInfo.setRequiredStageList(requiredStageList);
+					relateInfo.setId(ruralProjectRecords.getId());
+					//查询报告文件、依据性文件、其他文件必填列表以及数据
+					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
 					//文件处理
 					projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"其他资料");
 						/*for (MainDictDetail mainDict : mainDictDetails) {
@@ -6056,50 +6146,50 @@ public class WorkProjectNotifyController extends BaseController {
 						flag = true;
 					}
 					if(flag) {*/
-						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-						//添加项目类型
-						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-						//if(0 == projectSort){
-							//查看送审金额是否为500w以上金额
+					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+					//添加项目类型
+					relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+					//if(0 == projectSort){
+					//查看送审金额是否为500w以上金额
 //							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-							//设置默认值为500w以上的展示数据
+					//设置默认值为500w以上的展示数据
 //							approvalMoney = 2;
-							String money=ruralProjectRecords.getSubmitMoney();
-							Integer approvalMoney=null;
-							if(StringUtils.isBlank(money)){
-								approvalMoney=1;
-							}else{
-								approvalMoney=Integer.parseInt(money);
-							}
-							switch (approvalMoney){
-								case 0:
-									//金额为0
-									relateInfo.setAttachmentProjectApprovalMoney(null);
-									break;
-								case 1:
-									//500w以下金额状态
-									relateInfo.setAttachmentProjectApprovalMoney("1");
-									break;
-								case 2:
-									//500w以上金额状态
-									relateInfo.setAttachmentProjectApprovalMoney("2");
-									break;
-							}
+					String money=ruralProjectRecords.getSubmitMoney();
+					Integer approvalMoney=null;
+					if(StringUtils.isBlank(money)){
+						approvalMoney=1;
+					}else{
+						approvalMoney=Integer.parseInt(money);
+					}
+					switch (approvalMoney){
+						case 0:
+							//金额为0
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+							break;
+						case 1:
+							//500w以下金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("1");
+							break;
+						case 2:
+							//500w以上金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("2");
+							break;
+					}
 						/*}else{
 							relateInfo.setAttachmentProjectApprovalMoney(null);
 						}*/
 
-						//添加报告类型
-						//relateInfo.setRequiredStage(2);
-						List<Integer> requiredStageList = Lists.newArrayList();
-						requiredStageList.add(1);
-						requiredStageList.add(2);
-						relateInfo.setRequiredStageList(requiredStageList);
-						relateInfo.setId(ruralProjectRecords.getId());
-						//查询报告文件、依据性文件、其他文件必填列表以及数据
-						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+					//添加报告类型
+					//relateInfo.setRequiredStage(2);
+					List<Integer> requiredStageList = Lists.newArrayList();
+					requiredStageList.add(1);
+					requiredStageList.add(2);
+					relateInfo.setRequiredStageList(requiredStageList);
+					relateInfo.setId(ruralProjectRecords.getId());
+					//查询报告文件、依据性文件、其他文件必填列表以及数据
+					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
 					projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"1000");
 						/*for (MainDictDetail mainDict : mainDictDetails) {
 							relateInfo.setAttachType(mainDict.getValue());
@@ -6335,42 +6425,42 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 
-						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-						//添加项目类型
-						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-						String money=ruralProjectRecords.getSubmitMoney();
-						Integer approvalMoney=null;
-						if(StringUtils.isBlank(money)){
-							approvalMoney=1;
-						}else{
-							approvalMoney=Integer.parseInt(money);
-						}
-						switch (approvalMoney){
-							case 0:
-								//金额为0
-								relateInfo.setAttachmentProjectApprovalMoney(null);
-								break;
-							case 1:
-								//500w以下金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("1");
-								break;
-							case 2:
-								//500w以上金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("2");
-								break;
-						}
+					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+					//添加项目类型
+					relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+					String money=ruralProjectRecords.getSubmitMoney();
+					Integer approvalMoney=null;
+					if(StringUtils.isBlank(money)){
+						approvalMoney=1;
+					}else{
+						approvalMoney=Integer.parseInt(money);
+					}
+					switch (approvalMoney){
+						case 0:
+							//金额为0
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+							break;
+						case 1:
+							//500w以下金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("1");
+							break;
+						case 2:
+							//500w以上金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("2");
+							break;
+					}
 
-						//添加报告类型
-						//relateInfo.setRequiredStage(2);
-						List<Integer> requiredStageList = Lists.newArrayList();
-						requiredStageList.add(1);
-						requiredStageList.add(2);
-						relateInfo.setRequiredStageList(requiredStageList);
-						relateInfo.setId(ruralProjectRecords.getId());
-						//查询报告文件、依据性文件、其他文件必填列表以及数据
-						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+					//添加报告类型
+					//relateInfo.setRequiredStage(2);
+					List<Integer> requiredStageList = Lists.newArrayList();
+					requiredStageList.add(1);
+					requiredStageList.add(2);
+					relateInfo.setRequiredStageList(requiredStageList);
+					relateInfo.setId(ruralProjectRecords.getId());
+					//查询报告文件、依据性文件、其他文件必填列表以及数据
+					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
 					projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"");
 						/*for (MainDictDetail mainDict : mainDictDetails) {
 							relateInfo.setAttachType(mainDict.getValue());
@@ -6642,43 +6732,43 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 
-						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-						//添加项目类型
-						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-						String money=ruralProjectRecords.getSubmitMoney();
-						Integer approvalMoney=null;
-						if(StringUtils.isBlank(money)){
-							approvalMoney=1;
-						}else{
-							approvalMoney=Integer.parseInt(money);
-						}
-						switch (approvalMoney){
-							case 0:
-								//金额为0
-								relateInfo.setAttachmentProjectApprovalMoney(null);
-								break;
-							case 1:
-								//500w以下金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("1");
-								break;
-							case 2:
-								//500w以上金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("2");
-								break;
-						}
+					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+					//添加项目类型
+					relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+					String money=ruralProjectRecords.getSubmitMoney();
+					Integer approvalMoney=null;
+					if(StringUtils.isBlank(money)){
+						approvalMoney=1;
+					}else{
+						approvalMoney=Integer.parseInt(money);
+					}
+					switch (approvalMoney){
+						case 0:
+							//金额为0
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+							break;
+						case 1:
+							//500w以下金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("1");
+							break;
+						case 2:
+							//500w以上金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("2");
+							break;
+					}
 
-						//添加报告类型
-						//relateInfo.setRequiredStage(2);
-						List<Integer> requiredStageList = Lists.newArrayList();
-						requiredStageList.add(1);
-						requiredStageList.add(2);
-						relateInfo.setRequiredStageList(requiredStageList);
-						relateInfo.setId(ruralProjectRecords.getId());
-						//查询报告文件、依据性文件、其他文件必填列表以及数据
-						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-						projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"");
+					//添加报告类型
+					//relateInfo.setRequiredStage(2);
+					List<Integer> requiredStageList = Lists.newArrayList();
+					requiredStageList.add(1);
+					requiredStageList.add(2);
+					relateInfo.setRequiredStageList(requiredStageList);
+					relateInfo.setId(ruralProjectRecords.getId());
+					//查询报告文件、依据性文件、其他文件必填列表以及数据
+					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+					projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"");
 						/*for (MainDictDetail mainDict : mainDictDetails) {
 							relateInfo.setAttachType(mainDict.getValue());
 							switch (mainDict.getValue()) {
@@ -8780,50 +8870,50 @@ public class WorkProjectNotifyController extends BaseController {
 					flag = true;
 				}
 				if(flag) {*/
-					//查询报告文件、依据性文件、其他文件必填列表以及数据
-					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-					//添加项目类型
-					relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
-					relateInfo.setRequiredStage(1);
-					relateInfo.setId(ruralProjectRecords.getId());
-					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
-					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-					//if(0 == projectSort){
-						//查看送审金额是否为500w以上金额
+				//查询报告文件、依据性文件、其他文件必填列表以及数据
+				List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+				ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+				//添加项目类型
+				relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+				relateInfo.setRequiredStage(1);
+				relateInfo.setId(ruralProjectRecords.getId());
+				relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+				//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+				//if(0 == projectSort){
+				//查看送审金额是否为500w以上金额
 //						Integer appsrovalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
 //						//设置默认值为500w以上的展示数据
 //						approvalMoney = 2;
-						String money=ruralProjectRecords.getSubmitMoney();
-						Integer approvalMoney=null;
-						if(StringUtils.isBlank(money)){
-							approvalMoney=1;
-						}else{
-							approvalMoney=Integer.parseInt(money);
-						}
+				String money=ruralProjectRecords.getSubmitMoney();
+				Integer approvalMoney=null;
+				if(StringUtils.isBlank(money)){
+					approvalMoney=1;
+				}else{
+					approvalMoney=Integer.parseInt(money);
+				}
 
-						switch (approvalMoney){
-							case 0:
-								//金额为0
-								relateInfo.setAttachmentProjectApprovalMoney(null);
-								break;
-							case 1:
-								//500w以下金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("1");
-								break;
-							case 2:
-								//500w以上金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("2");
-								break;
-						}
+				switch (approvalMoney){
+					case 0:
+						//金额为0
+						relateInfo.setAttachmentProjectApprovalMoney(null);
+						break;
+					case 1:
+						//500w以下金额状态
+						relateInfo.setAttachmentProjectApprovalMoney("1");
+						break;
+					case 2:
+						//500w以上金额状态
+						relateInfo.setAttachmentProjectApprovalMoney("2");
+						break;
+				}
 					/*}else{
 						relateInfo.setAttachmentProjectApprovalMoney(null);
 					}*/
-					for (MainDictDetail mainDict : mainDictDetails) {
-						//添加报告类型
-						relateInfo.setAttachType(mainDict.getValue());
-						attachmentList.addAll(projectTemplateService.getProjectTemplateList(relateInfo));
-					}
+				for (MainDictDetail mainDict : mainDictDetails) {
+					//添加报告类型
+					relateInfo.setAttachType(mainDict.getValue());
+					attachmentList.addAll(projectTemplateService.getProjectTemplateList(relateInfo));
+				}
 				//}
 
 
@@ -9962,189 +10052,5 @@ public class WorkProjectNotifyController extends BaseController {
 		}
 	}
 
-	private String dailyOfficeWorkAudit(WorkProjectNotify workProjectNotify,Model model) {
-
-		DailyOfficeWork dailyOfficeWork = dailyOfficeWorkService.get(workProjectNotify.getNotifyId());
-
-		if (dailyOfficeWork != null && StringUtils.isNotBlank(dailyOfficeWork.getId())) {
-
-
-			if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-				dailyOfficeWork.setSignatureUrlFlag(1);
-				//处理文件路径
-				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-							/*if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
-								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
-									dailyOfficeWork.setSignatureUrl(signatureUrl);
-								}
-								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}else{
-								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}*/
-			}else{
-				dailyOfficeWork.setSignatureUrlFlag(0);
-			}
-		}
-		dailyOfficeWork.setAct(getByAct(dailyOfficeWork.getProcessInstanceId()));
-		if(StringUtils.isNotBlank(workProjectNotify.getHome())){
-			dailyOfficeWork.setHome(workProjectNotify.getHome());
-		}else{
-			dailyOfficeWork.setHome("home");
-		}
-		//判定当前流程页面签署是否已经签署过，若签署过，则auditFlag 赋值 1
-		model.addAttribute("auditFlag",dailyOfficeWork.getSignatureFlag());
-
-		model.addAttribute("processInstanceId", dailyOfficeWork.getProcessInstanceId());
-		model.addAttribute("dailyOfficeWork", dailyOfficeWork);
-
-		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-			if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-				//处理文件路径
-				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-				if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
-					if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-						String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
-						dailyOfficeWork.setSignatureUrl(signatureUrl);
-					}
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-				}else{
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-				}
-				User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
-				signatureAttachment.setCreateBy(user);
-				signatureAttachment.setUpdateBy(user);
-				signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
-				signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
-				signatureAttachment.setDelFlag("0");
-				signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
-				String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
-				signatureAttachment.setType(type);
-				signatureWorkAttachments.add(signatureAttachment);
-			}
-
-
-			if(signatureWorkAttachments.size()>0){
-				dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
-			}
-			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
-		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-			//审核模板标识
-			model.addAttribute("identification", "signatureDailyOfficeWork");
-			model.addAttribute("identificationName","日常签章申请审核意见");
-			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureAudit";
-		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureModify";
-		} else {
-			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-			if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-				//处理文件路径
-				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-				if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
-					if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-						String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
-						dailyOfficeWork.setSignatureUrl(signatureUrl);
-					}
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-				}else{
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-				}
-				User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
-				signatureAttachment.setCreateBy(user);
-				signatureAttachment.setUpdateBy(user);
-				signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
-				signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
-				signatureAttachment.setDelFlag("0");
-				signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
-				String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
-				signatureAttachment.setType(type);
-				signatureWorkAttachments.add(signatureAttachment);
-			}
-
-
-			if(signatureWorkAttachments.size()>0){
-				dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
-			}
-			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
-		}
-	}
-
-	/**
-	 * 电子用章申请
-	 * @param workProjectNotify
-	 * @param model
-	 * @return
-	 */
-	private String electronicSignatureAudit(WorkProjectNotify workProjectNotify,Model model) {
-
-		ElectronicSignatureInfo electronicSignatureInfo = electronicSignatureService.get(workProjectNotify.getNotifyId());
 
-		electronicSignatureInfo.setAct(getByAct(electronicSignatureInfo.getProcessInstanceId()));
-		if(StringUtils.isNotBlank(workProjectNotify.getHome())){
-			electronicSignatureInfo.setHome(workProjectNotify.getHome());
-		}else{
-			electronicSignatureInfo.setHome("home");
-		}
-
-		model.addAttribute("processInstanceId", electronicSignatureInfo.getProcessInstanceId());
-		model.addAttribute("electronicSignatureInfo", electronicSignatureInfo);
-
-		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			return "modules/signatureManagement/electronicSignature/ElectronicSignatureView";
-		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-
-			String useTypeStr = DictUtils.getMainDictLabel(electronicSignatureInfo.getUseType(), "electronicSignature", "");
-			electronicSignatureInfo.setUseType(useTypeStr);
-			//审核模板标识
-			model.addAttribute("identification", "electronicSignature");
-			model.addAttribute("identificationName","电子用章申请审核意见");
-			return "modules/signatureManagement/electronicSignature/ElectronicSignatureAudit";
-		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-			return "modules/signatureManagement/electronicSignature/ElectronicSignatureModify";
-		} else {
-			return "modules/signatureManagement/electronicSignature/ElectronicSignatureView";
-		}
-	}
-
-	/**
-	 * 业务用章申请
-	 * @param workProjectNotify
-	 * @param model
-	 * @return
-	 */
-	private String businessSignatureAudit(WorkProjectNotify workProjectNotify,Model model) {
-
-		BusinessSignatureInfo businessSignatureInfo = businessSignatureService.get(workProjectNotify.getNotifyId());
-
-		businessSignatureInfo.setAct(getByAct(businessSignatureInfo.getProcessInstanceId()));
-		if(StringUtils.isNotBlank(workProjectNotify.getHome())){
-			businessSignatureInfo.setHome(workProjectNotify.getHome());
-		}else{
-			businessSignatureInfo.setHome("home");
-		}
-
-		model.addAttribute("processInstanceId", businessSignatureInfo.getProcessInstanceId());
-		model.addAttribute("businessSignatureInfo", businessSignatureInfo);
-
-		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			return "modules/signatureManagement/businessSignature/BusinessSignatureView";
-		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-
-			String useTypeStr = DictUtils.getMainDictLabel(businessSignatureInfo.getUseType(), "businessSignature", "");
-			businessSignatureInfo.setUseType(useTypeStr);
-			//审核模板标识
-			model.addAttribute("identification", "electronicSignature");
-			model.addAttribute("identificationName","业务用章申请审核意见");
-			return "modules/signatureManagement/businessSignature/BusinessSignatureAudit";
-		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-			return "modules/signatureManagement/businessSignature/BusinessSignatureModify";
-		} else {
-			return "modules/signatureManagement/businessSignature/BusinessSignatureView";
-		}
-	}
 }