Przeglądaj źródła

场景列表排序

lyhzzz 2 lat temu
rodzic
commit
a6608156de

+ 1 - 1
src/main/java/com/fdkankan/manage/httpClient/param/LaserSceneParam.java

@@ -14,7 +14,7 @@ public class LaserSceneParam {
     private String snCode;
     private List<String> snCodes = new ArrayList<>();
 
-    private String sceneCode;
+    private List<String> sceneCodes;
     private String startTime;
     private String endTime;
 

+ 3 - 3
src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -113,15 +113,15 @@ public class LaserService {
             param.setSnCode("phoneEmptySelect");
         }
         if(StringUtils.isNotBlank(param.getNum())){
-            newParam.setSceneCode(param.getNum());
+            newParam.setSceneCodes(Arrays.asList(param.getNum()));
         }
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());
 
-        if(StringUtils.isNotBlank(param.getFiled()) && param.getFiled().equals("create_time")){
+        if(StringUtils.isNotBlank(param.getField()) && param.getField().equals("create_time")){
             newParam.setOrderBy("shoot_time");
         }else {
-            newParam.setOrderBy(param.getFiled());
+            newParam.setOrderBy(param.getField());
         }
         newParam.setSortBy(param.getOrder());
 

+ 4 - 4
src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -26,7 +26,7 @@ public class SceneParam extends RequestBase {
     private String startTime;
     private String endTime;
 
-    private String filed;
+    private String field;
 
     private String order;
 
@@ -44,9 +44,9 @@ public class SceneParam extends RequestBase {
         return Dateutils.getEndTime(endTime);
     }
 
-    public String getFiled() {
-        if(StringUtil.isNotBlank(filed)){
-            return FiledUtil.upperCharToUnderLine(filed);
+    public String getField() {
+        if(StringUtil.isNotBlank(field)){
+            return FiledUtil.upperCharToUnderLine(field);
         }
         return "create_time";
     }

+ 1 - 2
src/main/resources/mapper/manage/SceneProMapper.xml

@@ -49,7 +49,7 @@
             and s.title like concat ('%',#{param.sceneName},'%')
         </if>
         ) as tb
-        order by create_time desc
+        order by ${param.field}  ${param.order}
     </select>
 
     <sql id="commonWhere">
@@ -85,6 +85,5 @@
         <if test="param.endTime !=null and param.endTime !='' ">
             and s.create_time &lt;= #{param.endTime}
         </if>
-
     </sql>
 </mapper>