luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

pageNo,pageSize放到controller

master
yinzuomei 3 years ago
parent
c20933d86f
commit
d1cae44971
2 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  2. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

6
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
View File

@ -565,8 +565,8 @@ public class IcResiUserController implements ResultDataResolver {
searchForm.setFormCode("resi_base_info"); searchForm.setFormCode("resi_base_info");
searchForm.setCustomerId(tokenDto.getCustomerId()); searchForm.setCustomerId(tokenDto.getCustomerId());
searchForm.setStaffId(tokenDto.getUserId()); searchForm.setStaffId(tokenDto.getUserId());
searchForm.setPageNo(pageFormDTO.getPageNo()); // searchForm.setPageNo(pageFormDTO.getPageNo());
searchForm.setPageSize(pageFormDTO.getPageSize()); // searchForm.setPageSize(pageFormDTO.getPageSize());
List<ResiUserQueryValueDTO> conditions=new ArrayList<>(); List<ResiUserQueryValueDTO> conditions=new ArrayList<>();
// ResiUserQueryValueDTO temp=new ResiUserQueryValueDTO(); // ResiUserQueryValueDTO temp=new ResiUserQueryValueDTO();
// temp.setColumnName(""); // temp.setColumnName("");
@ -577,6 +577,8 @@ public class IcResiUserController implements ResultDataResolver {
searchForm.setConditions(conditions); searchForm.setConditions(conditions);
pageFormDTO.setSearchForm(searchForm); pageFormDTO.setSearchForm(searchForm);
} }
pageFormDTO.getSearchForm().setPageNo(pageFormDTO.getPageNo());
pageFormDTO.getSearchForm().setPageSize(pageFormDTO.getPageSize());
if (null == pageFormDTO.getExportConfig()) { if (null == pageFormDTO.getExportConfig()) {
IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO(); IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO();
exportTemplateSaveFormDTO.setFormCode("resi_base_info"); exportTemplateSaveFormDTO.setFormCode("resi_base_info");

3
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
View File

@ -164,8 +164,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
allShowColumns.addAll(exportConfigData.getHiddenSqlColumns()); allShowColumns.addAll(exportConfigData.getHiddenSqlColumns());
do { do {
String finalStaffOrgPath = staffOrgPath; String finalStaffOrgPath = staffOrgPath;
// mapListPage = PageHelper.startPage(searchForm.getPageNo(), searchForm.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> { mapListPage = PageHelper.startPage(searchForm.getPageNo(), searchForm.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> {
mapListPage = PageHelper.startPage(exportResiUserFormDTO.getPageNo(), exportResiUserFormDTO.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> {
icResiUserService.dynamicQuery(searchForm.getCustomerId(), searchForm.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, searchForm.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath); icResiUserService.dynamicQuery(searchForm.getCustomerId(), searchForm.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, searchForm.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath);
}); });
if (!searchForm.getIsPage()){ if (!searchForm.getIsPage()){

Write Preview
Loading…
Cancel
Save