~yxh/opo.git - Gitblit

			@@ -488,11 +488,15 @@
			cmap.put("意见：", "不通过");
			if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) cmap.put("意见：", checkFundVO.getFlowcontent());
			contentList.add(cmap);
			try{
			DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
			dingTalkReqVo.setTitle("财务系统驳回信息");
			dingTalkReqVo.setNumber(sysUser.getPhonenumber());
			dingTalkReqVo.setContents(contentList);
			dingTalkService.sendNotification(dingTalkReqVo);
			}catch (Exception e){
			log.error("费用---财务系统驳回信息报错了", e);
			}
			}

			serviceFund.setRecordstatus(RecordStatus);
			@@ -1833,7 +1837,7 @@
			serviceFundflow.setApplytype(serviceProcessVO.getApplytype());
			serviceFundflow.setFundid(StringUtils.isNotEmpty(serviceProcessVO.getBackCode()) ? Long.valueOf(serviceProcessVO.getBackCode()) : null);
			fundflowService.save(serviceFundflow);

			try {
			ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
			ConcurrentHashMap map = new ConcurrentHashMap();
			map.put("审批人：", serviceProcessVO.getCheckusername());
			@@ -1846,5 +1850,8 @@
			dingTalkReqVo.setContents(contentList);
			log.info("钉钉发送消息:{}", dingTalkReqVo);
			dingTalkService.sendNotification(dingTalkReqVo);
			} catch (Exception e) {
			log.error("财务系统信息---钉钉消息发送失败，不影响主流程", e);
			}
			}
			}

			@@ -136,7 +136,7 @@
			if (serviceReimbursement.getCreateTime() != null) {
			wrappers.eq(ServiceReimbursement::getCreateTime, serviceReimbursement.getCreateTime());
			}
			if (!serviceReimbursement.getUsername().equals("shenji")) {
			if (StringUtils.isNotBlank(serviceReimbursement.getUsername()) && !serviceReimbursement.getUsername().equals("shenji")) {
			wrappers.like(ServiceReimbursement::getUsername, serviceReimbursement.getUsername());
			}
			if (StringUtils.isNotBlank(serviceReimbursement.getTravelers())) {
			@@ -450,11 +450,15 @@
			if (StringUtils.isNotBlank(checkFundVO.getFlowcontent()))
			map.put("意见：", checkFundVO.getFlowcontent());
			contentList.add(map);
			try {
			DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
			dingTalkReqVo.setTitle("财务系统驳回信息");
			dingTalkReqVo.setNumber(sysUser.getPhonenumber());
			dingTalkReqVo.setContents(contentList);
			dingTalkService.sendNotification(dingTalkReqVo);
			}catch (Exception e){
			log.error("差旅---财务系统驳回信息报错了", e);
			}
			}

			serviceReimbursement.setRecordstatus(RecordStatus);

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