bgh

lige

2023-09-14 fb2ab400eb0edbc893e38c848f2f0ecac5bc75c4

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java

@@ -62,7 +62,7 @@
    /**
     * 查询收费员日结列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:collector:list')")
    //@PreAuthorize("@ss.hasPermi('hosp:collector:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询收费员日结列表")
    public AjaxResult list(@RequestParam(required = false) @ApiParam(value = "收费员id") String tollCollectorId,
@@ -103,7 +103,7 @@
    /**
     * 导出收费员日结列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:collector:export')")
    //@PreAuthorize("@ss.hasPermi('hosp:collector:export')")
    @Log(title = "收费员日结", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出收费员日结列表")
@@ -116,7 +116,7 @@
    /**
     * 获取收费员日结详细信息
     */
    @PreAuthorize("@ss.hasPermi('hosp:collector:query')")
    // @PreAuthorize("@ss.hasPermi('hosp:collector:query')")
    @GetMapping(value = "/{id}")
    @ApiOperation(value = "获取收费员日结详细信息")
    public AjaxResult getInfo(@PathVariable("id") String id) {
@@ -126,7 +126,7 @@
    /**
     * 点击结算 新增收费员日结
     */
    @PreAuthorize("@ss.hasPermi('hosp:collector:add')")
    //@PreAuthorize("@ss.hasPermi('hosp:collector:add')")
    @Log(title = "收费员日结", businessType = BusinessType.INSERT)
    @PostMapping
    @ApiOperation(value = "点击结算 新增收费员日结")
@@ -150,7 +150,7 @@
    }


    @PreAuthorize("@ss.hasPermi('hosp:collector:remove')")
    //@PreAuthorize("@ss.hasPermi('hosp:collector:remove')")
    @DeleteMapping("/removeTjTollCollectorById")
    @ApiOperation(value = "收费员撤销账单操作接口")
    public AjaxResult removeTjTollCollectorById(@RequestParam @ApiParam(value = "结账id") String id,
@@ -233,9 +233,10 @@
        List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
        for (TjFlowingWater tjFlowingWater : list1) {
            TjOrder tjOrder = tjOrderService.selectTjOrderByOrderId(tjFlowingWater.getOrderId());
            if(null !=tjOrder){
                TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
                tjFlowingWater.setCusName(MatchUtils.hideCusName(customer.getCusName()));

                if(null !=customer) tjFlowingWater.setCusName(MatchUtils.hideCusName(customer.getCusName()));
            }
        }
        map.put("list", list1);
        map.put("total",waterPage.getTotal());