zjh 2023/10/31--1

zjh

2023-10-31 84312c20c230d0606ecd760d7c0b1c5917210d2b

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

@@ -14,7 +14,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.ChargeStatisticsVo;
@@ -62,7 +64,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,
@@ -80,7 +82,6 @@
        if (null != accountBeginTime && null != accountEndTime) {
            wqq.between(TjTollCollector::getCreateTime, accountBeginTime, accountEndTime);
        } else {
            DateTime dateTime = DateUtil.lastWeek();
            wqq.between(TjTollCollector::getCreateTime, DateUtil.lastWeek(),DateUtil.date());
        }
        wqq.orderByDesc(TjTollCollector::getCreateTime);
@@ -103,7 +104,7 @@
    /**
     * 导出收费员日结列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:collector:export')")
    //@PreAuthorize("@ss.hasPermi('hosp:collector:export')")
    @Log(title = "收费员日结", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出收费员日结列表")
@@ -116,7 +117,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 +127,7 @@
    /**
     * 点击结算 新增收费员日结
     */
    @PreAuthorize("@ss.hasPermi('hosp:collector:add')")
    //@PreAuthorize("@ss.hasPermi('hosp:collector:add')")
    @Log(title = "收费员日结", businessType = BusinessType.INSERT)
    @PostMapping
    @ApiOperation(value = "点击结算 新增收费员日结")
@@ -150,7 +151,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,
@@ -175,6 +176,9 @@
//        TjTollCollector collector = tjTollCollectorService.getById(id);
        TjTollCollector collector = tjTollCollectorService.getTjTollCollectorById(id);
        if (null != collector) {
            if("Y".equals(collector.getIsHz())){
                return AjaxResult.error("该账单已汇总不可撤销");
            }
            LambdaQueryWrapper<TjTollCollectorDetail> wq = new LambdaQueryWrapper<>();
            wq.eq(TjTollCollectorDetail::getAccountId, collector.getAccountId());
            collectorDetailService.remove(wq);
@@ -207,7 +211,9 @@
        wq.orderByDesc(TjTollCollector::getAccountEndTime);
        List<TjTollCollector> list = tjTollCollectorService.list(wq);
        if (null != list && list.size() > 0) return success(list.get(0).getAccountEndTime());
        return AjaxResult.success("1970-01-01 00:00:00");
        String dateStr = "2023-10-01 00:00:00";
        Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm:ss");
        return AjaxResult.success(date);
    }


@@ -243,7 +249,7 @@
        List<Map<String, Object>> cc = new ArrayList<>();
        //统计总集合
        //付款方式
        Map<Long, List<TjFlowingWater>> m = list.stream().collect(Collectors.groupingBy(TjFlowingWater::getPayType));
        Map<Long, List<TjFlowingWater>> m = list.stream().filter(item-> StringUtils.isNotNull(item.getPayType())).collect(Collectors.groupingBy(TjFlowingWater::getPayType));
        BigDecimal zshoukuan = new BigDecimal("0.00");
        BigDecimal ztuikuan = new BigDecimal("0.00");
        BigDecimal zyingjiao = new BigDecimal("0.00");