~yxh/opo.git - Gitblit

			@@ -545,7 +545,7 @@

			//记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级
			serviceFund.setBackflowlevel(FlowLevel);
			} //else {
			} else {
			CheckFlag = 2;
			if (CheckFlag == 2) {
			//应医院要求如果出现退回，直接退到发起者
			@@ -559,7 +559,7 @@
			FlowLevel = 0;
			}
			}

			}
			SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
			//审批未通过：单据信息 + 审批人/审批时间/意见（意见 = "审批未通过。" + 驳回意见）
			List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
			@@ -578,8 +578,6 @@
			} catch (Exception e) {
			log.error("费用---审批未通过钉钉通知失败，fundId={}", serviceFund.getId(), e);
			}
			//}

			serviceFund.setRecordstatus(RecordStatus);
			serviceFund.setFlowlevel(FlowLevel.longValue());
			// serviceFund.setBackflowlevel(serviceFund.getFlowlevel());

			@@ -461,7 +461,7 @@
			serviceReimbursement.setFinancechecher(user.getNickName());
			}

			} //else {
			} else {
			CheckFlag = 2;

			if (CheckFlag == 2) {
			@@ -474,6 +474,7 @@
			FlowLevel = (FlowLevel - 1);
			if (FlowLevel < 0) {
			FlowLevel = 0;
			}
			}
			}
			SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement.getUserno());
			@@ -497,7 +498,6 @@
			} catch (Exception e) {
			log.error("差旅---审批未通过钉钉通知失败，id={}", serviceReimbursement.getId(), e);
			}
			//}

			serviceReimbursement.setRecordstatus(RecordStatus);
			serviceReimbursement.setFlowlevel(Long.valueOf(FlowLevel.toString()));

	ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史