待采购 默认按申购时间排序，添加申购时间点击排序，增加物品名称点击排序

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/dto/SubscribeDetailSelectDto.java

@@ -78,4 +78,13 @@ public class SubscribeDetailSelectDto extends BaseSelectDto {
      * 提交状态 1未提交已采购为0 2部分提交已采购大于0小于申购 3已提交采购数大于等于申购数
      */
     private Integer subStatus;
+
+    /**
+     * 申购时间排序 1升序 0倒序
+     */
+    private Integer subscribeTimeSort;
+    /**
+     * 产品名称排序 1升序 0倒序
+     */
+    private Integer productNameSort;
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -126,7 +126,27 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
                 wrapper.eq("((SELECT IF ( sum( pd.count ) IS NULL, 0, sum( pd.count )) FROM purchase_detail pd WHERE pd.subscribe_detail_id = t1.id)>=t1.count)", 1);
             }
         }
-        wrapper.orderByDesc("t1", SubscribeDetail::getCreateTime);
+
+        //没有自定义排序就默认按申购时间倒序
+        if (ObjectUtil.isEmpty(dto.getSubscribeTimeSort()) && ObjectUtil.isEmpty(dto.getProductNameSort())) {
+            wrapper.orderByDesc("t1", SubscribeDetail::getCreateTime);
+        }
+        //申购时间排序
+        if (ObjectUtil.isNotEmpty(dto.getSubscribeTimeSort())) {
+            if (1 == dto.getSubscribeTimeSort()) {
+                wrapper.orderByAsc("t1", SubscribeDetail::getCreateTime);
+            } else {
+                wrapper.orderByDesc("t1", SubscribeDetail::getCreateTime);
+            }
+        }
+        //产品名称排序
+        if (ObjectUtil.isNotEmpty(dto.getProductNameSort())) {
+            if (1 == dto.getProductNameSort()) {
+                wrapper.orderByAsc("pi.name");
+            } else {
+                wrapper.orderByDesc("pi.name");
+            }
+        }
 
         Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<SubscribeDetailVo> list = page.getRecords();