代码提交

liusheng

2023-09-21 bdb5b994b566f50dd0acac4b02fc697c656fc94e

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

@@ -75,6 +75,9 @@
    private IServiceFundService serviceFundService;

    @Autowired
    private IBaseOnlyvalueService baseOnlyvalueService;

    @Autowired
    private ISysPostService postService;

    @Autowired
@@ -162,13 +165,14 @@
        }
        //根据金额筛选
        if (spFinancialExpensesIn.getMoney() != null) {
            list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()) == new BigDecimal(spFinancialExpensesIn.getMoney())).collect(Collectors.toList());
            list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());

        }
        //根据创建时间排序
        Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
            @Override
            public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
                return o2.getCreateTime().compareTo(o1.getCreateTime());
                return o1.getCreateTime().compareTo(o2.getCreateTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);
@@ -217,13 +221,13 @@
    @RepeatSubmit
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {

        boolean b = serviceReimbursementService.save(serviceReimbursement);
//        if (b) {
//            addReiSharedDatd(serviceReimbursement, 1);
//        }
        Long id = serviceReimbursement.getId();
        return AjaxResult.success(id);
        if (!Objects.isNull(serviceReimbursement)) {
            serviceReimbursement.setCheckstatus(serviceReimbursement.getCheckstatus() == null ? 1 : serviceReimbursement.getCheckstatus());
            boolean b = serviceReimbursementService.save(serviceReimbursement);
            Long id = serviceReimbursement.getId();
            return AjaxResult.success(id);
        }
        return error();
    }

//    public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
@@ -629,7 +633,7 @@

            }
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) {
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceReimbursement.setOfficedirector(user.getNickName());
            }

@@ -900,6 +904,7 @@
        String date = formatter.format(dt);
        String time = date.substring(0, 10);

        dataMap.put("ZB", rdInfoByItem.get(0).getDeptmentname() == null ? "" : rdInfoByItem.get(0).getDeptmentname());
        dataMap.put("XZBH", rdInfoByItem.get(0).getBh() == null ? "" : rdInfoByItem.get(0).getBh());
        dataMap.put("TBYYMMDD", time);
        dataMap.put("BXDFJ", rdInfoByItem.get(0).getAttachcount() == null ? "   " : "" + rdInfoByItem.get(0).getAttachcount());