Browse Source

字典需求管理-默认排序修改

yucheng 3 years ago
parent
commit
4ae65b3701

+ 18 - 0
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/rwd/demand/controller/DictionaryDemandController.java

@@ -45,6 +45,8 @@ public class DictionaryDemandController {
     private static final Set<Integer> STATE_SET = CollUtil.newHashSet(
             DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(),
             DemandBillState.PROOFING.getIndex(), DemandBillState.SEND_BACK.getIndex());
+    /** 排序 */
+    private static final String ORDER_COLUMN = "orders";
 
     @Autowired
     private IDictionaryDemandService service;
@@ -123,6 +125,10 @@ public class DictionaryDemandController {
      */
     @PostMapping("/queryDraft")
     public CommonResult<List<DictionaryDemand>> queryDraft(@RequestBody Map<String, Object> map) {
+        if(map.get(ORDER_COLUMN) == null) {
+            OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_CREATIONTIME);
+            map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
+        }
         return queryDemandByState(map, DemandBillState.SAVING.getIndex());
     }
 
@@ -133,6 +139,10 @@ public class DictionaryDemandController {
      */
     @PostMapping("/querySubmitted")
     public CommonResult<List<DictionaryDemand>> querySubmitted(@RequestBody Map<String, Object> map) {
+        if(map.get(ORDER_COLUMN) == null) {
+            OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
+            map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
+        }
         return queryDemandByState(map, DemandBillState.SUBMITTED.getIndex(),
                 DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(),
                 DemandBillState.SEND_BACK.getIndex(), DemandBillState.PROOFING.getIndex());
@@ -145,6 +155,10 @@ public class DictionaryDemandController {
      */
     @PostMapping("/queryTodo")
     public CommonResult<List<DictionaryDemand>> queryTodo(@RequestBody Map<String, Object> map) {
+        if(map.get(ORDER_COLUMN) == null) {
+            OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
+            map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
+        }
         return queryDemandByState(map, DemandBillState.SUBMITTED.getIndex(), DemandBillState.PROOFING.getIndex());
     }
 
@@ -155,6 +169,10 @@ public class DictionaryDemandController {
      */
     @PostMapping("/queryDone")
     public CommonResult<List<DictionaryDemand>> queryDone(@RequestBody Map<String, Object> map) {
+        if(map.get(ORDER_COLUMN) == null) {
+            OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
+            map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
+        }
         return queryDemandByState(map, DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(), DemandBillState.SEND_BACK.getIndex());
     }