~yxh/opo.git - Gitblit

			@@ -22,5 +22,7 @@
			//器官移植状态：0：未移植；1：已移植，2：弃用
			private Integer transplantstate = null;

			private String donateHospital;


			}

			@@ -518,8 +518,17 @@
			Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
			log.info("sserviceFund保存的的值是-------- :{}", aBoolean);

			//053审批通过之后，就需要把“办公室主任”的名字填上
			if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
			//办公室审批通过之后，就需要把“办公室主任”的名字填上
			List<SysUser> sysUsers =null;
			if(StringUtils.isNotEmpty(user.getUserName())) {
			SysUser su = new SysUser();
			su.setUserName(user.getUserName());
			sysUsers = sysUserMapper.selectAllocatedList(su);
			log.info("费用sysUsers返回的值为:{}", sysUsers);
			}
			if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null && !sysUsers.isEmpty()
			&& sysUsers.get(0).getRoles() != null
			&& sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
			serviceFund.setOfficedirector(user.getNickName());
			serviceFund.setUploadStates(1);
			//数据发送

			@@ -25,6 +25,7 @@
			import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
			import com.ruoyi.project.mapper.*;
			import com.ruoyi.project.service.*;
			import com.ruoyi.system.mapper.SysUserMapper;
			import com.ruoyi.system.mapper.SysUserRoleMapper;
			import com.ruoyi.system.service.ISysPostService;
			import com.ruoyi.system.service.ISysUserService;
			@@ -79,6 +80,9 @@

			@Autowired
			IServiceReimbursementpayeeService payeeService;

			@Autowired
			SysUserMapper sysUserMapper;

			@Autowired
			IServiceFundflowruleService serviceFundflowruleService;
			@@ -489,8 +493,18 @@
			}

			}
			//053审批通过之后，就需要把“办公室主任”的名字填上
			if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
			//办公室主任审批通过之后，就需要把“办公室主任”的名字填上
			List<SysUser> sysUsers =null;
			if(StringUtils.isNotEmpty(user.getUserName())) {
			SysUser su = new SysUser();
			su.setUserName(user.getUserName());
			sysUsers = sysUserMapper.selectAllocatedList(su);
			log.info("差旅sysUsers返回的值为:{}", sysUsers);
			}

			if (checkFundVO.getFlowconclusion() == 1 && !sysUsers.isEmpty()
			&& sysUsers.get(0).getRoles() != null
			&& sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
			serviceReimbursement.setOfficedirector(user.getNickName());
			serviceReimbursement.setUploadStates(1);

	ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史