代码提交

liusheng

21 小时以前 84a995c146ce6ab74709a503d010b03fb469e022

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -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;
@@ -443,7 +447,8 @@
                map.put("审批人：", loginUser.getUser().getUserName());
                map.put("审批时间：", new Date());
                map.put("意见：", "不通过");
                if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("意见：", checkFundVO.getFlowcontent());
                if (StringUtils.isNotBlank(checkFundVO.getFlowcontent()))
                    map.put("意见：", checkFundVO.getFlowcontent());
                contentList.add(map);
                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                dingTalkReqVo.setTitle("财务系统驳回信息");
@@ -489,13 +494,20 @@
                }

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

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

                Boolean aBoolean1 = null;
                if (newSwitch == 1) {
                    log.info("差旅newSwitch返回的值为:{}", newSwitch);
                    aBoolean1 = sendData(serviceReimbursement);
                    if (!aBoolean1) {
                        allMap.put("500", "发送失败");