添加排序功能

bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java

@@ -81,7 +81,7 @@ public class DfProductArticleController extends BaseController {
             }
         }
         if (Validator.isEmpty(dfProductArticle.getOrderByColumn())) {
-            queryWrapper.orderByAsc(DfProductArticle::getSerialNumber);
+            queryWrapper.last("ORDER BY CASE WHEN serial_number IS NULL THEN 1 ELSE 0 END, serial_number ASC");
         }
         condition(queryWrapper,dfProductArticle);
         List<DfProductArticle> list = dfProductArticleService.list(queryWrapper);

bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java

@@ -81,7 +81,7 @@ public class DfProductInfoController extends BaseController {
         }
         LambdaQueryWrapper<DfProductInfo> queryWrapper = new LambdaQueryWrapper();
         if (Validator.isEmpty(dfProductInfo.getOrderByColumn())) {
-            queryWrapper.orderByAsc(DfProductInfo::getSerialNumber);
+            queryWrapper.last("ORDER BY CASE WHEN serial_number IS NULL THEN 1 ELSE 0 END, serial_number ASC");
         }
         condition(queryWrapper,dfProductInfo);
         String brokerIds = dfProductInfo.getBrokerIds();
@@ -414,6 +414,25 @@ public class DfProductInfoController extends BaseController {
         for (DfProductInfo productInfo : list) {
             productInfo.setProductDetail(null);
         }
+        List<DfOrder> dfOrders = dfOrderService.list();
+        Map<Long, Integer> productOrderCounts = new HashMap<>();
+        // 计算申请人数
+        for (DfOrder order : dfOrders) {
+            if (!productOrderCounts.containsKey(order.getProductId())) {
+                productOrderCounts.put(order.getProductId(), 1);
+            } else {
+                productOrderCounts.put(order.getProductId(), productOrderCounts.get(order.getProductId()) + 1);
+            }
+        }
+        for (DfProductInfo productInfo : list) {
+            productInfo.setInterestRate(productInfo.getInterestRateBegin() + "%-" + productInfo.getInterestRateEnd() + "%");
+            Long productId = productInfo.getId();
+            if (productOrderCounts.containsKey(productId)) {
+                productInfo.setApplicantNum(Long.valueOf(productOrderCounts.get(productId)));
+            } else {
+                productInfo.setApplicantNum(0L);
+            }
+        }
         return success(list);
     }
 

bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java

@@ -70,6 +70,9 @@ public class DfProductMomentController extends BaseController {
             return null;
         }
         LambdaQueryWrapper<DfProductMoment> queryWrapper = new LambdaQueryWrapper();
+        if (Validator.isEmpty(dfProductMoment.getOrderByColumn())) {
+            queryWrapper.orderByDesc(DfProductMoment::getCreateTime);
+        }
         condition(queryWrapper,dfProductMoment);
         boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
         if (!admin) {

bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java

@@ -77,13 +77,13 @@ public class DfProductPosterController extends BaseController {
             return null;
         }
         MPJLambdaWrapper<DfProductPoster> queryWrapper = new MPJLambdaWrapper();
-        if (Validator.isEmpty(dfProductPoster.getOrderByColumn())) {
-            queryWrapper.orderByAsc(DfProductPoster::getSerialNumber);
-        }
         queryWrapper.selectAll(DfProductPoster.class)
                     .select(DfProductInfo::getProductName)
                     .disableSubLogicDel()
                     .leftJoin(DfProductInfo.class,DfProductInfo::getId,DfProductPoster::getProductId);
+        if (Validator.isEmpty(dfProductPoster.getOrderByColumn())) {
+            queryWrapper.last("ORDER BY CASE WHEN t.serial_number IS NULL THEN 1 ELSE 0 END, t.serial_number ASC");
+        }
         if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
             if ("-99".equals(dfProductPoster.getStatus())) {
 

bs-admin/src/main/java/com/bs/df/domain/DfProductMoment.java

@@ -74,5 +74,7 @@ public class DfProductMoment extends BaseEntity{
     @TableField(exist = false)
     private List<CmAttach> files;
 
+    @TableField(exist = false)
+    private String orderByColumn;
 
 }

bs-common/src/main/java/com/bs/common/core/domain/entity/SysUser.java

@@ -205,6 +205,9 @@ public class SysUser extends BaseEntity
     @TableField(exist = false)
     private String isBroker;
 
+    @TableField(exist = false)
+    private String hasBroker;
+
 
     /**
      * 微信小程序openId

bs-system/src/main/java/com/bs/system/service/impl/SysUserServiceImpl.java

@@ -99,6 +99,11 @@ public class SysUserServiceImpl extends MPJBaseServiceImpl<SysUserMapper, SysUse
                 }
             });
         }
+        if ("1".equals(user.getHasBroker())) {
+            queryWrapper.isNotNull(SysUser::getDeptId);
+        } else if ("0".equals(user.getHasBroker())) {
+            queryWrapper.isNull(SysUser::getDeptId);
+        }
         queryWrapper.orderByAsc(SysUser::getCreateTime);
         return userMapper.selectList(queryWrapper);
     }

bs-ui/src/views/article/article/index.vue

@@ -349,6 +349,9 @@ export default {
         status: [
           {required: true, message: "状态", trigger: "change"}
         ],
+        // serialNumber: [
+        //   {required: true, message: "序号不能为空", trigger: "change"}
+        // ],
         // remark: [
         //   {required: true, message: "备注不能为空", trigger: "blur"}
         // ],

bs-ui/src/views/poster/poster/index.vue

@@ -336,8 +336,8 @@ export default {
         status: [
           {required: true, message: "状态不能为空", trigger: "change"}
         ],
-        // remark: [
-        //   {required: true, message: "备注不能为空", trigger: "blur"}
+        // serialNumber: [
+        //   {required: true, message: "序号不能为空", trigger: "change"}
         // ],
       }
     };

bs-ui/src/views/product/info/index.vue

@@ -551,8 +551,8 @@ export default {
         status: [
           {required: true, message: "状态不能为空", trigger: "change"}
         ],
-        // remark: [
-        //   {required: true, message: "备注不能为空", trigger: "blur"}
+        // serialNumber: [
+        //   {required: true, message: "序号不能为空", trigger: "change"}
         // ],
       }
     };