Merge remote-tracking branch 'origin/master'

sinake

4 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

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

@@ -112,6 +112,15 @@
    }

    /**
     * 器官费用汇总（应收/实收/未回款），按当前查询条件统计全部结果
     */
    @ApiOperation("器官费用汇总")
    @GetMapping("/organfeeSummary")
    public AjaxResult organfeeSummary(ServiceDonorchargeorgan serviceDonorchargeorgan) {
        return AjaxResult.success(serviceDonorchargeorganService.organfeeSummary(serviceDonorchargeorgan));
    }

    /**
     * 器官状态值转文本
     */
    private String organStateName(String organState) {
@@ -207,7 +216,7 @@
    @Log(title = "捐献器官", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
        return toAjax(serviceDonorchargeorganService.removeByIds(ids) > 0);
    }

    @RepeatSubmit
@@ -242,6 +251,17 @@
    }

    /**
     * 收费统计明细（点击已收/未收金额钻取）
     */
    @ApiOperation("收费统计明细")
    @PostMapping("/getSpStatChangeDetail")
    public TableDataInfo getSpStatChangeDetail(@RequestBody SpStatChangeDetailReq spStatChangeDetailReq) {
        startPage();
        List<SpStatChangeDetail> list = serviceDonorchargeorganService.getSpStatChangeDetail(spStatChangeDetailReq);
        return getDataTable(list);
    }

    /**
     * 导出收款统计
     */
    @ApiOperation("导出收款统计")