1 固定表头第一步

src/main/java/org/rcisoft/bus/jnsp7xtm/enums/ColTransitionEnum.java

+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/Jnsp7xtmStatisticServiceImpl.java

@@ -6,6 +6,7 @@ import org.rcisoft.bus.jnsp7xtm.dao.Jnsp7xtmStatisticsRepository;
 import org.rcisoft.bus.jnsp7xtm.dto.*;
 import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto;
 import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
+import org.rcisoft.bus.jnsp7xtm.enums.ColTransitionEnum;
 import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmStatisticService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,35 +89,59 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
 
         Jnsp7xtmPageListDto jnsp74tmPageListDto = new Jnsp7xtmPageListDto();
         if (!StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
-            jnsp74tmPageRequestDto.setOneDimensionality("khdm");
-            jnsp74tmPageRequestDto.setTwoDimensionality("khm");
+            jnsp74tmPageRequestDto.setOneDimensionality(ColTransitionEnum.JNSP7XTM.getCode() + "khdm");
+            jnsp74tmPageRequestDto.setTwoDimensionality(ColTransitionEnum.JNSP7XTM.getCode() + "khm");
         }
         // 获取统计列
         String  statistics = "";
         // 获取排序列
         String orderColumn = "";
         if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
-            statistics = "j7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality();
-            orderColumn = jnsp74tmPageRequestDto.getOneDimensionality();
+            String statisticsOneOneDimensionality = "";
+            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())) {
+            String statisticsOneOneDimensionality = "";
+            String orderOneOneDimensionality = "";
             if (!"".equals(statistics)) {
-                statistics = statistics +","+ "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality();
-                orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getTwoDimensionality();
+                if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
+                    statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
+                    orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
+                    statistics = statistics +","+ statisticsOneOneDimensionality;
+                    orderColumn = orderColumn + "," + orderOneOneDimensionality;
+                }
             } else {
-                statistics = "j7xtm." +  jnsp74tmPageRequestDto.getTwoDimensionality();
-                orderColumn = jnsp74tmPageRequestDto.getTwoDimensionality();
+                if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
+                    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())) {
+            String statisticsOneOneDimensionality = "";
+            String orderOneOneDimensionality = "";
             if (!"".equals(statistics)) {
-                statistics = statistics + ","+ "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality();
-                orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getThreeDimensionality();
+                if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
+                    statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
+                    orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
+                    statistics = statistics + ","+ statisticsOneOneDimensionality;
+                    orderColumn = orderColumn + "," +orderOneOneDimensionality;
+                }
             } else {
-                statistics = "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality();
-                orderColumn = jnsp74tmPageRequestDto.getThreeDimensionality();
+                statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
+                orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
+                statistics = statisticsOneOneDimensionality;
+                orderColumn = orderOneOneDimensionality;
             }
         }
 
@@ -296,26 +321,38 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
         String dimensionalityThree = "";
 
         if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
-            if (listMap.containsKey(jnsp74tmPageRequestDto.getOneDimensionality())) {
-                key = key + listMap.get(jnsp74tmPageRequestDto.getOneDimensionality()) + "::";
-                dimensionalityOne = (String) listMap.get(jnsp74tmPageRequestDto.getOneDimensionality());
-                listMap.remove(jnsp74tmPageRequestDto.getOneDimensionality());
+            String originalOneDime = "";
+            if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
+                originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
+            }
+            if (listMap.containsKey(originalOneDime)) {
+                key = key + listMap.get(originalOneDime) + "::";
+                dimensionalityOne = (String) listMap.get(originalOneDime);
+                listMap.remove(originalOneDime);
             }
         }
 
         if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
-            if (listMap.containsKey(jnsp74tmPageRequestDto.getTwoDimensionality())) {
-                key = key + listMap.get(jnsp74tmPageRequestDto.getTwoDimensionality()) + "::";
-                dimensionalityTwo = (String) listMap.get(jnsp74tmPageRequestDto.getTwoDimensionality());
-                listMap.remove(jnsp74tmPageRequestDto.getTwoDimensionality());
+            String originalTwoDime = "";
+            if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
+                originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
+            }
+            if (listMap.containsKey(originalTwoDime)) {
+                key = key + listMap.get(originalTwoDime) + "::";
+                dimensionalityTwo = (String) listMap.get(originalTwoDime);
+                listMap.remove(originalTwoDime);
             }
         }
 
         if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
-            if (listMap.containsKey(jnsp74tmPageRequestDto.getThreeDimensionality())) {
-                key = key + listMap.get(jnsp74tmPageRequestDto.getThreeDimensionality()) + "::";
-                dimensionalityThree = (String) listMap.get(jnsp74tmPageRequestDto.getThreeDimensionality());
-                listMap.remove(jnsp74tmPageRequestDto.getThreeDimensionality());
+            String originalthreeDime = "";
+            if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
+                originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
+            }
+            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 {
         }
         return jnsp74TmDto;
     }
+
 }