排序修改

src/main/java/com/cc/service/impl/SolrServiceImpl.java

@@ -56,7 +56,12 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "AFSJ_DESC "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
+
                     }else{
                         solrParams.add("sort", "AFSJ_DESC DESC");
                     }
@@ -1155,10 +1160,10 @@ public class SolrServiceImpl implements SolrService {
                 if(StringUtils.isNotBlank(sort)){
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
-                    if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "DJSJ_DESC "+order);
+                    if(sort.equals("ladw_gajgmc")){
+                        solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
                     }else{
-                        solrParams.add("sort", "DJSJ_DESC DESC");
+                        solrParams.add("sort", sort.toUpperCase()+" "+order);
                     }
                 }
                 String flag ="";
@@ -1807,7 +1812,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "DJSJ_DESC "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "DJSJ_DESC DESC");
                     }
@@ -2509,7 +2518,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort",sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "DJSJ_DESC "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "DJSJ_DESC DESC");
                     }
@@ -3249,7 +3262,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "DJSJ_DESC "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "DJSJ_DESC DESC");
                     }
@@ -3866,7 +3883,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "DJSJ_DESC "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "DJSJ_DESC DESC");
                     }
@@ -4547,7 +4568,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "WZMSTCX_DJSJ "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "WZMSTCX_DJSJ DESC");
                     }
@@ -5165,7 +5190,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "DJSJ "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "DJSJ DESC");
                     }
@@ -5691,7 +5720,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "SWSJ_RQSJGZXX "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "SWSJ_RQSJGZXX DESC");
                     }
@@ -5770,7 +5803,11 @@ public class SolrServiceImpl implements SolrService {
                     solrParams.add("sort", sort.toUpperCase()+" "+order);
                 }else{
                     if(StringUtils.isNotBlank(order)){
-                        solrParams.add("sort", "ASJFSSJ_ASJFSKSSJ "+order);
+                        if(sort.equals("ladw_gajgmc")){
+                            solrParams.add("sort", "LADW_GAJGJGDM"+" "+order);
+                        }else{
+                            solrParams.add("sort", sort.toUpperCase()+" "+order);
+                        }
                     }else{
                         solrParams.add("sort", "ASJFSSJ_ASJFSKSSJ DESC");
                     }