Skip to content

D
dataC_api
Commit 7c49f0be authored by 高宇's avatar 高宇
Browse files
Options

1 固定表头第一步

parent 951cb88d
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 52 deletions
src/main/java/org/rcisoft/bus/jnsp7xtm/enums/ColTransitionEnum.java 0 → 100644
View file @ 7c49f0be
package org.rcisoft.bus.jnsp7xtm.enums;
import lombok.Getter;
@Getter
public enum ColTransitionEnum {
JNSP7XTM("jnsp_","j7xtm.");
ColTransitionEnum(String code, String value){
this.value = value;
this.code = code;
}
private String value, code;
}
src/main/java/org/rcisoft/bus/jnsp7xtm/service/impl/Jnsp7xtmServiceImpl.java
View file @ 7c49f0be
...@@ -17,6 +17,7 @@ import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmTableHeaderDto; ...@@ -17,6 +17,7 @@ import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmTableHeaderDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto; import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto; import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm; import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import org.rcisoft.bus.jnsp7xtm.enums.ColTransitionEnum;
import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmService; import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmService;
import org.rcisoft.core.exception.CyServiceException; import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo; import org.rcisoft.core.model.CyPageInfo;
...@@ -80,13 +81,25 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt ...@@ -80,13 +81,25 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
jnsp74tmPageRequestDto.setType("1"); jnsp74tmPageRequestDto.setType("1");
// 获取总值 // 获取总值
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality()); String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setOneDimensionality(originalOneDime);
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
jnsp74tmPageRequestDto.setTwoDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getTwoDimensionality()); String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setTwoDimensionality(originalTwoDime);
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setThreeDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getThreeDimensionality()); String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setThreeDimensionality(originalthreeDime);
} }
IPage<Jnsp7xtm> jnsp74tmIPage = jnsp74tmRepository.queryJnsp74tmByPaged(paginationUtility, jnsp74tmPageRequestDto); IPage<Jnsp7xtm> jnsp74tmIPage = jnsp74tmRepository.queryJnsp74tmByPaged(paginationUtility, jnsp74tmPageRequestDto);
return jnsp74tmIPage; return jnsp74tmIPage;
...@@ -109,13 +122,25 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt ...@@ -109,13 +122,25 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
jnsp74tmPageRequestDto.setType("1"); jnsp74tmPageRequestDto.setType("1");
// 获取总值 // 获取总值
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality()); String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setOneDimensionality(originalOneDime);
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
jnsp74tmPageRequestDto.setTwoDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getTwoDimensionality()); String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setTwoDimensionality(originalTwoDime);
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setThreeDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getThreeDimensionality()); String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setThreeDimensionality(originalthreeDime);
} }
Integer total = jnsp74tmRepository.queryAllJnsp74tm(jnsp74tmPageRequestDto); Integer total = jnsp74tmRepository.queryAllJnsp74tm(jnsp74tmPageRequestDto);
if (total > 0) { if (total > 0) {
...@@ -157,13 +182,25 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt ...@@ -157,13 +182,25 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
// 获取总值 // 获取总值
// 获取总值 // 获取总值
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality()); String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setOneDimensionality(originalOneDime);
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
jnsp74tmPageRequestDto.setTwoDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getTwoDimensionality()); String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setTwoDimensionality(originalTwoDime);
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setThreeDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getThreeDimensionality()); String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
jnsp74tmPageRequestDto.setThreeDimensionality(originalthreeDime);
} }
Integer total = jnsp74tmRepository.queryAllJnsp74tm(jnsp74tmPageRequestDto); Integer total = jnsp74tmRepository.queryAllJnsp74tm(jnsp74tmPageRequestDto);
if (total > 0) { if (total > 0) {
...@@ -318,29 +355,54 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt ...@@ -318,29 +355,54 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
// 获取排序列 // 获取排序列
String orderColumn = ""; String orderColumn = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getOneDimensionality(); String statisticsOneOneDimensionality = "";
orderColumn = jnsp74tmPageRequestDto.getOneDimensionality(); String orderOneOneDimensionality = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) { if (!"".equals(statistics)) {
statistics = statistics +","+ "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality(); if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
orderColumn = orderColumn +","+ jnsp74tmPageRequestDto.getTwoDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
statistics = statistics +","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," + orderOneOneDimensionality;
}
} else { } else {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality(); if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
orderColumn = jnsp74tmPageRequestDto.getTwoDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
} }
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) { if (!"".equals(statistics)) {
statistics = statistics + ","+ "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality(); if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getThreeDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
statistics = statistics + ","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," +orderOneOneDimensionality;
}
} else { } else {
statistics = "j7xtm," + jnsp74tmPageRequestDto.getThreeDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderColumn = jnsp74tmPageRequestDto.getThreeDimensionality(); orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
} }
} }
List<Map<String, Object>> exportListCount = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,1,10,"2","xsjg",statistics,orderColumn); List<Map<String, Object>> exportListCount = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,1,10,"2","xsjg",statistics,orderColumn);
if (!exportListCount.isEmpty()) { if (!exportListCount.isEmpty()) {
for (int i=0; i<exportListCount.size(); i++) { for (int i=0; i<exportListCount.size(); i++) {
...@@ -412,26 +474,38 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt ...@@ -412,26 +474,38 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
List<Jnsp7xtmTableHeaderDto> list = new ArrayList<>(); List<Jnsp7xtmTableHeaderDto> list = new ArrayList<>();
// 维度一 // 维度一
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto(); Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto();
oneTableHeader.setName(fixedTable.get(jnsp74tmPageRequestDto.getOneDimensionality())); oneTableHeader.setName(fixedTable.get(originalOneDime));
oneTableHeader.setKey(jnsp74tmPageRequestDto.getOneDimensionality()); oneTableHeader.setKey(originalOneDime);
oneTableHeader.setOldKey(jnsp74tmPageRequestDto.getOneDimensionality()); oneTableHeader.setOldKey(originalOneDime);
list.add(oneTableHeader); list.add(oneTableHeader);
} }
// 维度二 // 维度二
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto(); Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto();
oneTableHeader.setName(fixedTable.get(jnsp74tmPageRequestDto.getTwoDimensionality())); oneTableHeader.setName(fixedTable.get(originalTwoDime));
oneTableHeader.setKey(jnsp74tmPageRequestDto.getTwoDimensionality()); oneTableHeader.setKey(originalTwoDime);
oneTableHeader.setOldKey(jnsp74tmPageRequestDto.getTwoDimensionality()); oneTableHeader.setOldKey(originalTwoDime);
list.add(oneTableHeader); list.add(oneTableHeader);
} }
// 维度三 // 维度三
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
String originalThreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalThreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto(); Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto();
oneTableHeader.setName(fixedTable.get(jnsp74tmPageRequestDto.getThreeDimensionality())); oneTableHeader.setName(fixedTable.get(originalThreeDime));
oneTableHeader.setKey(jnsp74tmPageRequestDto.getThreeDimensionality()); oneTableHeader.setKey(originalThreeDime);
oneTableHeader.setOldKey(jnsp74tmPageRequestDto.getThreeDimensionality()); oneTableHeader.setOldKey(originalThreeDime);
list.add(oneTableHeader); list.add(oneTableHeader);
} }
return list; return list;
......
src/main/java/org/rcisoft/bus/jnsp7xtm/service/impl/Jnsp7xtmStatisticServiceImpl.java
View file @ 7c49f0be
...@@ -6,6 +6,7 @@ import org.rcisoft.bus.jnsp7xtm.dao.Jnsp7xtmStatisticsRepository; ...@@ -6,6 +6,7 @@ import org.rcisoft.bus.jnsp7xtm.dao.Jnsp7xtmStatisticsRepository;
import org.rcisoft.bus.jnsp7xtm.dto.*; import org.rcisoft.bus.jnsp7xtm.dto.*;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto; import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm; import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import org.rcisoft.bus.jnsp7xtm.enums.ColTransitionEnum;
import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmStatisticService; import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmStatisticService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -88,35 +89,59 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService { ...@@ -88,35 +89,59 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
Jnsp7xtmPageListDto jnsp74tmPageListDto = new Jnsp7xtmPageListDto(); Jnsp7xtmPageListDto jnsp74tmPageListDto = new Jnsp7xtmPageListDto();
if (!StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (!StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("khdm"); jnsp74tmPageRequestDto.setOneDimensionality(ColTransitionEnum.JNSP7XTM.getCode() + "khdm");
jnsp74tmPageRequestDto.setTwoDimensionality("khm"); jnsp74tmPageRequestDto.setTwoDimensionality(ColTransitionEnum.JNSP7XTM.getCode() + "khm");
} }
// 获取统计列 // 获取统计列
String statistics = ""; String statistics = "";
// 获取排序列 // 获取排序列
String orderColumn = ""; String orderColumn = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
statistics = "j7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality(); String statisticsOneOneDimensionality = "";
orderColumn = jnsp74tmPageRequestDto.getOneDimensionality(); String orderOneOneDimensionality = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) { if (!"".equals(statistics)) {
statistics = statistics +","+ "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality(); if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getTwoDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
statistics = statistics +","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," + orderOneOneDimensionality;
}
} else { } else {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality(); if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
orderColumn = jnsp74tmPageRequestDto.getTwoDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
} }
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) { if (!"".equals(statistics)) {
statistics = statistics + ","+ "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality(); if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getThreeDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
statistics = statistics + ","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," +orderOneOneDimensionality;
}
} else { } else {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality(); statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderColumn = jnsp74tmPageRequestDto.getThreeDimensionality(); orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
} }
} }
...@@ -296,26 +321,38 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService { ...@@ -296,26 +321,38 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
String dimensionalityThree = ""; String dimensionalityThree = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
if (listMap.containsKey(jnsp74tmPageRequestDto.getOneDimensionality())) { String originalOneDime = "";
key = key + listMap.get(jnsp74tmPageRequestDto.getOneDimensionality()) + "::"; if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
dimensionalityOne = (String) listMap.get(jnsp74tmPageRequestDto.getOneDimensionality()); originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
listMap.remove(jnsp74tmPageRequestDto.getOneDimensionality()); }
if (listMap.containsKey(originalOneDime)) {
key = key + listMap.get(originalOneDime) + "::";
dimensionalityOne = (String) listMap.get(originalOneDime);
listMap.remove(originalOneDime);
} }
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
if (listMap.containsKey(jnsp74tmPageRequestDto.getTwoDimensionality())) { String originalTwoDime = "";
key = key + listMap.get(jnsp74tmPageRequestDto.getTwoDimensionality()) + "::"; if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
dimensionalityTwo = (String) listMap.get(jnsp74tmPageRequestDto.getTwoDimensionality()); originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
listMap.remove(jnsp74tmPageRequestDto.getTwoDimensionality()); }
if (listMap.containsKey(originalTwoDime)) {
key = key + listMap.get(originalTwoDime) + "::";
dimensionalityTwo = (String) listMap.get(originalTwoDime);
listMap.remove(originalTwoDime);
} }
} }
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) { if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
if (listMap.containsKey(jnsp74tmPageRequestDto.getThreeDimensionality())) { String originalthreeDime = "";
key = key + listMap.get(jnsp74tmPageRequestDto.getThreeDimensionality()) + "::"; if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
dimensionalityThree = (String) listMap.get(jnsp74tmPageRequestDto.getThreeDimensionality()); originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
listMap.remove(jnsp74tmPageRequestDto.getThreeDimensionality()); }
if (listMap.containsKey(originalthreeDime)) {
key = key + listMap.get(originalthreeDime) + "::";
dimensionalityThree = (String) listMap.get(originalthreeDime);
listMap.remove(originalthreeDime);
} }
} }
/** /**
...@@ -423,4 +460,5 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService { ...@@ -423,4 +460,5 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
} }
return jnsp74TmDto; return jnsp74TmDto;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment