修改了排序

yxh

8 天以前 53e4e0a0fb2928d153230953c631af6c17e9c385

 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;
@@ -81,6 +82,9 @@
    IServiceReimbursementpayeeService payeeService;

    @Autowired
    SysUserMapper sysUserMapper;

    @Autowired
    IServiceFundflowruleService serviceFundflowruleService;

    @Autowired
@@ -132,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())) {
@@ -161,6 +165,7 @@
            wrappers.between(ServiceReimbursement::getCreateTime ,serviceReimbursement.getStarttime(),serviceReimbursement.getEndtime());
        }*/

        wrappers.orderByDesc(ServiceReimbursement::getApplyTime);
        return this.list(wrappers);
    }

@@ -443,13 +448,18 @@
                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("财务系统驳回信息");
                dingTalkReqVo.setNumber(sysUser.getPhonenumber());
                dingTalkReqVo.setContents(contentList);
                dingTalkService.sendNotification(dingTalkReqVo);
                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);
@@ -489,13 +499,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", "发送失败");
@@ -781,8 +798,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());
@@ -791,7 +808,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("上传附件", "");