feat(controller): 结算包结算列表/导出排序

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SettleStatusEnum.java

@@ -18,7 +18,7 @@ public enum SettleStatusEnum {
 	SETTLE_STATUS_SUBMIT("3", "已提交", "已提交结算"),
 	SETTLE_STATUS_NO("4", "未结算", ""),
 	SETTLE_STATUS_PART("5", "部分成功", ""),
-	SETTLE_STATUS_WAIT("9", "申请结算", "申请结算"),
+	SETTLE_STATUS_WAIT("9", "待结算", "申请结算"),
 	SETTLE_STATUS_NULL("", "", "");
 
 	private String val;

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageSettleNoteMapper.xml

@@ -119,7 +119,7 @@
 		<if test="query.settleNoteStatus != null">
 			AND e.settle_note_status = #{query.settleNoteStatus}
 		</if>
-		ORDER BY e.sub_time DESC
+		ORDER BY e.sub_time DESC, t.id
 	</select>
 
 	<!-- 结算包结算列表 -->
@@ -165,6 +165,6 @@
 		<if test="query.settleNoteStatus != null">
 			AND e.settle_note_status = #{query.settleNoteStatus}
 		</if>
-		ORDER BY e.sub_time DESC
+		ORDER BY e.sub_time DESC, t.id
 	</select>
 </mapper>