zjh202500811

zjh

6 天以前 bda1ce873514c0848c4ad76bdd2274f01ab5dcc1

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

@@ -748,7 +748,7 @@
                        tjOrderDetail.setStandard(list2.get(0));
                    } else {
                        Long cusSex = customer.getCusSex();
                        Date cusBrithday = customer.getCusBrithday();
                        String cusBrithday = customer.getCusBrithday();
                        int age = DateUtil.ageOfNow(cusBrithday);
                        for (TjStandard tjStandard : list2) {
                            LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
@@ -826,7 +826,7 @@
                    tjOrderDetail.setStandard(list2.get(0));
                } else {
                    Long cusSex = customer.getCusSex();
                    Date cusBrithday = customer.getCusBrithday();
                    String cusBrithday = customer.getCusBrithday();
                    int age = DateUtil.ageOfNow(cusBrithday);
                    for (TjStandard tjStandard : list2) {
                        LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
@@ -1056,8 +1056,9 @@
    public AjaxResult preview(@RequestBody String data) {
        String is_batch_report_use_sql = configService.selectConfigByKey("is_batch_report_use_sql");
        List<String> tjNumbers = Arrays.stream(data.split(",")).collect(Collectors.toList());
        String value = configService.selectConfigByKey("path_filePath");
        if ("true".equals(is_batch_report_use_sql)) {
            return tjReportService.makeBatchReport(tjNumbers);
            return tjReportService.makeBatchReport(tjNumbers, value);
        } else {
            return makeReport(tjNumbers);
        }