通过生日算年龄

liusheng

2 天以前 1574cc259ecec7217d210c58d2bbf7b44a106234

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

@@ -177,7 +177,7 @@
            serviceFundSharedMapper.delfundsharedInfoById(null, serviceFund1.getId());

            //这个消息发送，就不在这做了，在审批记录的接口里做（即日志接口）
            //sendMeg(serviceFund1.getApplytype(), sysUser.getPhonenumber());
//            sendMeg(serviceFund1.getApplytype(), sysUser.getPhonenumber());
        }

        return true;
@@ -422,7 +422,8 @@
            SysUser user = loginUser.getUser();
            if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) {
                log.info("财务退回再提交，出纳再次审批，之后提交到财务");
                serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过");
//                serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过");
                serviceFund.setFinancechecher(user.getNickName());

                serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
                serviceFund.setRecordstatus(99);
@@ -455,7 +456,8 @@
            List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId());
            if (roleIds != null && roleIds.contains(11)) {
                //11为财务
                serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过");
//                serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过");
                serviceFund.setFinancechecher(user.getNickName());
            }

            //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级
@@ -767,7 +769,7 @@
        formmain_0831.put("中心负责人审批", serviceFund.getOpochecker());
        formmain_0831.put("支付方式", serviceFund.getZffs());
        formmain_0831.put("组长", getLastApprovalInfo(serviceFundflows, serviceFund.getManagername()));
        formmain_0831.put("审批人员", getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher()));
        formmain_0831.put("审批人员", StringUtils.isEmpty(getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())) ? "陈慕华" : getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher()));
        formmain_0831.put("支付日期", serviceFund.getRiqi());
        formmain_0831.put("识别人-作废", null);
        formmain_0831.put("财务审批签字", serviceFund.getFinancedirector());
@@ -795,6 +797,7 @@


    public String getLastApprovalInfo(List<ServiceFundflow> serviceFundflows, String managerName) {
        log.info("---------------serviceFundflows的入参为：{},managerName的值为：{}", serviceFundflows, managerName);
        if (StringUtils.isEmpty(managerName)) return "";
        if (CollectionUtils.isEmpty(serviceFundflows)) {
            //如果是最后一个人审批，这个时候可能flow里还没有生成进去
@@ -802,7 +805,7 @@
            return "审批人：" + managerName + " & 审批时间：" + sd.format(new Date()) + " & 审批结果：通过";
        }

        Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(managerName)).max(Comparator.comparing(ServiceFundflow::getCheckTime));
        Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> managerName.contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime));

        if (lastApproval.isPresent()) {
            ServiceFundflow flow = lastApproval.get();