From d3e23e26fcfc17e770fca7c29b290ef5082e5734 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 04 七月 2023 22:32:00 +0800
Subject: [PATCH] 优化1.5报表相关bug
---
service-report/src/main/java/com/java110/report/smo/impl/ReportInfoSettingTitleValueInnerServiceSMOImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportInfoSettingTitleValueInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportInfoSettingTitleValueInnerServiceSMOImpl.java
index b2dd5bf..63c3d40 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportInfoSettingTitleValueInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportInfoSettingTitleValueInnerServiceSMOImpl.java
@@ -2,18 +2,16 @@
import com.java110.intf.report.IReportInfoSettingTitleValueInnerServiceSMO;
-import com.java110.po.reportInfoSettingTitleValue.ReportInfoSettingTitleValuePo;
+import com.java110.po.reportInfo.ReportInfoSettingTitleValuePo;
import com.java110.report.dao.IReportInfoSettingTitleValueServiceDao;
-import com.java110.dto.reportInfoSettingTitleValue.ReportInfoSettingTitleValueDto;
+import com.java110.dto.reportInfo.ReportInfoSettingTitleValueDto;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -68,6 +66,21 @@
return reportInfoSettingTitleValues;
}
+ @Override
+ public List<ReportInfoSettingTitleValueDto> getReportInfoSettingTitleValueInfoResult(@RequestBody ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto) {
+
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = reportInfoSettingTitleValueDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ reportInfoSettingTitleValueDto.setPage((page - 1) * reportInfoSettingTitleValueDto.getRow());
+ }
+
+ List<ReportInfoSettingTitleValueDto> reportInfoSettingTitleValues = BeanConvertUtil.covertBeanList(reportInfoSettingTitleValueServiceDaoImpl.getReportInfoSettingTitleValueInfoResult(BeanConvertUtil.beanCovertMap(reportInfoSettingTitleValueDto)), ReportInfoSettingTitleValueDto.class);
+
+ return reportInfoSettingTitleValues;
+ }
@Override
--
Gitblit v1.8.0