代码提交

liusheng

2024-01-04 2b9a47fa7e79db3cbc1fa9a04df6713cf2c3363a

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -496,7 +496,6 @@
            serviceFundflowrule.setApplytype(serviceFund.getApplytype());
            serviceFundflowrule.setCheckuserno(loginUser.getUsername());
            log.info("serviceFundController---checkFund---queryList的入参值serviceFundflowrule:{}", serviceFundflowrule);

            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);

            if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
@@ -649,6 +648,7 @@
            return toAjax(false);
        }
        for (ServiceFund sf : infoByInfoIdList) {
            sf.setApplyTime(new Date());
            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了
            if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
                //将fund表的审核状态改成100
@@ -1041,6 +1041,7 @@

    private void getDataSS(Map dataMap, Long id) {
        ServiceFund serviceFund = serviceFundService.getById(id);
        log.info("通过id查询数据的结果：{}", serviceFund);
        if (serviceFund == null) {
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }
@@ -1141,6 +1142,7 @@

    private String getDataYX(Map dataMap, Long id) {
        ServiceFund serviceFund = serviceFundService.getById(id);
        log.info("通过id获取医学、办公、绩效成本的fund信息为：{}", serviceFund);
        if (serviceFund == null) {
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }
@@ -1166,7 +1168,8 @@
            throw new ServiceException("下载失败，没有对应信息", HttpStatus.NO_CONTENT);
        }

        Date dt = serviceFund.getCreateTime();
//        Date dt = serviceFund.getCreateTime();
        Date dt = serviceFund.getApplyTime();
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String date = formatter.format(dt);
        String time = date.substring(0, 10);