代码提交

liusheng

22 小时以前 9c8b4a7d08ea43cccb5fd296d930ca55a2fa5a8a

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

@@ -447,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("财务系统驳回信息");
@@ -494,22 +495,19 @@

            }
            //办公室主任审批通过之后，就需要把“办公室主任”的名字填上
            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);
            SysUser sysUser = null;
            if (StringUtils.isNotEmpty(user.getUserName())) {
                sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
                log.info("差旅sysUsers返回的值为:{}", sysUser);
            }

            if (checkFundVO.getFlowconclusion() == 1  && !sysUsers.isEmpty()
                    && sysUsers.get(0).getRoles() != null
                    && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
            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", "发送失败");
@@ -795,8 +793,8 @@
        formmain_1209.put("财务审批", "");
        formmain_1209.put("财务部负责人审批", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getFinancedirector()));
        if (serviceReimbursement.getBackflowlevel() == 3)
            formmain_1209.put("办公室主任审批", "审批人：周育成 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过");
        else formmain_1209.put("办公室主任审批", getLastApprovalInfo(serviceFundflows, "周育成"));
            formmain_1209.put("办公室主任审批", "审批人：吴志强 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过");
        else formmain_1209.put("办公室主任审批", getLastApprovalInfo(serviceFundflows, "吴志强"));

        formmain_1209.put("备注", serviceReimbursement.getRemark());
        formmain_1209.put("业务副院长审批", serviceReimbursement.getBusvicepresident());
@@ -805,7 +803,8 @@
        formmain_1209.put("开户银行-作废", "");
        formmain_1209.put("卡号-作废", "");
        formmain_1209.put("支付方式", serviceReimbursement.getZffs());
        formmain_1209.put("组长", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername()));
        String lastApprovalInfo = getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername());
        formmain_1209.put("组长",  lastApprovalInfo.contains("吴志强") ? null : lastApprovalInfo);
        formmain_1209.put("审批人员", getLastApprovalInfo(serviceFundflows, "陈慕华"));
        formmain_1209.put("支付日期", serviceReimbursement.getRiqi());
        formmain_1209.put("上传附件", "");