fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperateFlowData.java

@@ -28,6 +28,16 @@ public class OperateFlowData {
 
     private String projectItemTargetRoomName;
 
+    /**
+     *  时间升降序
+     */
+    private Integer dateSort;
+
+    /**
+     * 状态升降序
+     */
+    private Integer stateSort;
+
     /**
      * 设备目录id
      */
@@ -146,6 +156,22 @@ public class OperateFlowData {
         this.projectItemTargetRoomName = projectItemTargetRoomName;
     }
 
+    public Integer getDateSort() {
+        return dateSort;
+    }
+
+    public void setDateSort(Integer dateSort) {
+        this.dateSort = dateSort;
+    }
+
+    public Integer getStateSort() {
+        return stateSort;
+    }
+
+    public void setStateSort(Integer stateSort) {
+        this.stateSort = stateSort;
+    }
+
     public long getDeviceLevelId() {
         return deviceLevelId;
     }

virgo.api/src/main/resources/mapper/OperateFlowDataMapper.xml

@@ -116,7 +116,23 @@
                 and a.type = #{ofd.type}
             </if>
         </where>
-        order by a.date desc
+        <choose>
+            <when test="ofd.dateSort == 0">
+                order by a.date desc
+            </when>
+            <when test="ofd.stateSort == 0">
+                order by a.state desc
+            </when>
+            <when test="ofd.dateSort == 1">
+                order by a.date asc
+            </when>
+            <when test="ofd.stateSort == 1">
+                order by a.state asc
+            </when>
+            <otherwise>
+                order by a.date desc
+            </otherwise>
+        </choose>
         limit #{currIndex} , #{pageSize}
     </select>