Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.base.Joiner;
import com.ltkj.common.core.domain.AjaxResult;
@@ -80,7 +81,7 @@
            wqq.between(TjTollCollector::getCreateTime, accountBeginTime, accountEndTime);
        }
        wqq.orderByDesc(TjTollCollector::getCreateTime);
        wqq.eq(TjTollCollector::getIsHz,"N");
        wqq.isNull(TjTollCollector::getIsHz);
        List<TjTollCollector> list= collectorService.list(wqq);
        return AjaxResult.success(list);
    }
@@ -102,7 +103,7 @@
                    zshoukuan=zshoukuan.add(collector.getAmountReceived());
                    ztuikuan=ztuikuan.add(collector.getRefundAmount());
                    zyingjiao=zyingjiao.add(collector.getPayable());
                    collector.setIsHz("Y");
                    collector.setIsHz(accountId);
                    collectorService.updateById(collector);
                }
            }
@@ -138,7 +139,7 @@
                String[] split = accountId.split(";");
                for (String s : split) {
                    TjTollCollector tollCollector = collectorService.getTjTollCollectorById(s);
                    tollCollector.setIsHz("N");
                    tollCollector.setIsHz(null);
                    collectorService.updateById(tollCollector);
                }
                return AjaxResult.success("该账单已成功撤销");
@@ -156,4 +157,17 @@
        return AjaxResult.success(printSetUp);
    }


    @GetMapping("/getLastTime")
    @ApiOperation(value = "获取汇总时间起始时间")
    public AjaxResult getLastTime() {
        LambdaQueryWrapper<TjSummary> wq = new LambdaQueryWrapper<>();
        wq.orderByDesc(TjSummary::getCreateTime);
        List<TjSummary> list = summaryService.list(wq);
        if (null != list && list.size() > 0) return AjaxResult.success(list.get(0).getCreateTime());
        String dateStr = "2023-10-01 00:00:00";
        Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm:ss");
        return AjaxResult.success(date);
    }

}