代码提交

src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java

@@ -97,10 +97,8 @@ public class CustomMadeInfoController extends BladeController {
 	 */
 	@GetMapping("/list-by-order-no")
 	public R<List<CustomMadeInfo>> listByOrderNo(@RequestParam String orderNo) {
-		LambdaQueryWrapper<CustomMadeInfo> wrapper = Wrappers.lambdaQuery();
-		wrapper.eq(CustomMadeInfo::getOrderNo, orderNo);
-		List<CustomMadeInfo> pages = iCustomMadeInfoService.list(wrapper);
-		return R.data(pages);
+		List<CustomMadeInfo> list = iCustomMadeInfoService.listByOrderNo(orderNo);
+		return R.data(list);
 	}
 
 	/**
@@ -138,6 +136,7 @@ public class CustomMadeInfoController extends BladeController {
 			wrapper.lt(CustomMadeInfo::getCreateTime, endTime + " 23:59:59");
 		}
 
+		wrapper.orderByDesc(CustomMadeInfo::getCreateTime);
 		IPage<CustomMadeInfo> pages = iCustomMadeInfoService.page(Condition.getPage(query), wrapper);
 		return R.data(pages);
 	}
@@ -177,6 +176,7 @@ public class CustomMadeInfoController extends BladeController {
 			wrapper.lt(CustomMadeInfo::getCreateTime, endTime + " 23:59:59");
 		}
 
+		wrapper.orderByDesc(CustomMadeInfo::getCreateTime);
 		List<CustomMadeInfo> dataList = iCustomMadeInfoService.list(wrapper);
 
 		List<CustomMadeInfoExcelVO> vos = new ArrayList<>();

src/main/java/org/springblade/modules/desk/controller/OrderController.java

@@ -4,9 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,11 +17,12 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
+import org.springblade.modules.desk.entity.CustomMadeInfo;
 import org.springblade.modules.desk.entity.Order;
+import org.springblade.modules.desk.service.ICustomMadeInfoService;
 import org.springblade.modules.desk.service.IOrderService;
 import org.springblade.modules.desk.vo.OrderExcelVO;
 import org.springblade.modules.weixin.entity.WeChatAddress;
-import org.springblade.modules.weixin.entity.WeChatUser;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -45,12 +43,16 @@ public class OrderController {
 
 	private final IOrderService orderService;
 
+	private final ICustomMadeInfoService madeInfoService;
+
 	/**
 	 * 详情
 	 */
 	@GetMapping("/detail")
 	public R<Order> detail(@RequestParam String id) {
 		Order detail = orderService.getById(id);
+		List<CustomMadeInfo> list = madeInfoService.listByOrderNo(detail.getOrderNo());
+		detail.setFilledMadeInfoNum(Func.isEmpty(list) ? 0 : list.size());
 		return R.data(detail);
 	}
 
@@ -59,21 +61,7 @@ public class OrderController {
 	 */
 	@GetMapping("/page")
 	public R<IPage<Order>> page(Query query, String buyerName, String buyerPhone, String orderNo, String status) {
-		LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
-		if (Func.isNotEmpty(buyerName)) {
-			wrapper.like(Order::getBuyerName, buyerName);
-		}
-		if (Func.isNotEmpty(buyerPhone)) {
-			wrapper.like(Order::getBuyerPhone, buyerPhone);
-		}
-		if (Func.isNotEmpty(orderNo)) {
-			wrapper.like(Order::getOrderNo, orderNo);
-		}
-		if (Func.isNotEmpty(status)) {
-			wrapper.eq(Order::getStatus, status);
-		}
-
-		IPage<Order> pages = orderService.page(Condition.getPage(query), wrapper);
+		IPage<Order> pages = orderService.pageWithMadeInfoCount(Condition.getPage(query), buyerName, buyerPhone, orderNo, status);
 		return R.data(pages);
 	}
 
@@ -81,7 +69,7 @@ public class OrderController {
 	 * 导出
 	 */
 	@GetMapping("/export")
-	public void export(HttpServletResponse response, String buyerName, String buyerPhone, String orderNo) {
+	public void export(HttpServletResponse response, String buyerName, String buyerPhone, String orderNo, String status) {
 		LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
 		if (Func.isNotEmpty(buyerName)) {
 			wrapper.like(Order::getBuyerName, buyerName);
@@ -92,7 +80,11 @@ public class OrderController {
 		if (Func.isNotEmpty(orderNo)) {
 			wrapper.like(Order::getOrderNo, orderNo);
 		}
+		if (Func.isNotEmpty(status)) {
+			wrapper.eq(Order::getStatus, status);
+		}
 
+		wrapper.orderByDesc(Order::getCreateTime);
 		List<Order> dataList = orderService.list(wrapper);
 
 		List<OrderExcelVO> vos = new ArrayList<>();

src/main/java/org/springblade/modules/desk/entity/Order.java

@@ -1,5 +1,6 @@
 package org.springblade.modules.desk.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -152,4 +153,9 @@ public class Order extends BaseEntity {
 	 */
 	private Integer status;
 
+	/**
+	 * 已填写报名单数量, 不予数据表中字段映射
+	 */
+	@TableField(exist = false)
+	private Integer filledMadeInfoNum;
 }

src/main/java/org/springblade/modules/desk/mapper/OrderMapper.java

@@ -17,9 +17,13 @@
 package org.springblade.modules.desk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.support.Query;
 import org.springblade.modules.desk.entity.CustomMadeInfo;
 import org.springblade.modules.desk.entity.Order;
 
+import java.util.List;
+
 /**
  * Mapper 接口
  *
@@ -28,6 +32,6 @@ import org.springblade.modules.desk.entity.Order;
  * @date 2023-07-25 17:47
  */
 public interface OrderMapper extends BaseMapper<Order> {
-
+	List<Order> pageWithMadeInfoCount(IPage page, String buyerName, String buyerPhone, String orderNo, String status);
 
 }

src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.desk.mapper.OrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="noticeResultMap" type="org.springblade.modules.desk.entity.Order">
+    <resultMap id="resultMap" type="org.springblade.modules.desk.entity.Order">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
@@ -29,5 +29,30 @@
         <result column="payment_time" property="paymentTime"/>
         <result column="delivery_time" property="deliveryTime"/>
         <result column="transaction_time" property="transactionTime"/>
+        <result column="filledMadeInfoNum" property="filledMadeInfoNum"/>
     </resultMap>
+
+    <select id="pageWithMadeInfoCount" resultMap="resultMap">
+        SELECT t_o.*, IFNULL(t_info.filledMadeInfoNum, 0) filledMadeInfoNum
+        FROM eh_order t_o
+        LEFT JOIN (
+            SELECT info.order_no, COUNT(info.order_no) filledMadeInfoNum
+            FROM eh_custom_made_info info
+            GROUP BY info.order_no
+        ) t_info ON t_o.order_no = t_info.order_no
+        where t_o.is_deleted = 0
+        <if test="buyerName != null and buyerName != ''">
+            and t_o.buyer_name like concat(concat('%', #{buyerName}), '%')
+        </if>
+        <if test="buyerPhone != null and buyerPhone != ''">
+            and t_o.buyer_phone like concat(concat('%', #{buyerPhone}), '%')
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and t_o.order_no like concat(concat('%', #{orderNo}), '%')
+        </if>
+        <if test="status != null and status != ''">
+            and t_o.status =  #{status}
+        </if>
+        order by t_o.create_time desc
+    </select>
 </mapper>

src/main/java/org/springblade/modules/desk/service/ICustomMadeInfoService.java

@@ -18,6 +18,9 @@ package org.springblade.modules.desk.service;
 
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.desk.entity.CustomMadeInfo;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * 服务类
@@ -28,4 +31,5 @@ import org.springblade.modules.desk.entity.CustomMadeInfo;
  */
 public interface ICustomMadeInfoService extends BaseService<CustomMadeInfo> {
 
+	List<CustomMadeInfo> listByOrderNo(String orderNo);
 }

src/main/java/org/springblade/modules/desk/service/IOrderService.java

@@ -16,9 +16,12 @@
  */
 package org.springblade.modules.desk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.mp.support.Query;
 import org.springblade.modules.desk.entity.CustomMadeInfo;
 import org.springblade.modules.desk.entity.Order;
+import org.springblade.modules.desk.vo.NoticeVO;
 
 /**
  * 服务类
@@ -29,4 +32,6 @@ import org.springblade.modules.desk.entity.Order;
  */
 public interface IOrderService extends BaseService<Order> {
 	String getAutoIncreSerialNumber();
+
+	IPage<Order> pageWithMadeInfoCount(IPage<Order> page, String buyerName, String buyerPhone, String orderNo, String status);
 }

src/main/java/org/springblade/modules/desk/service/impl/CustomMadeInfoServiceImpl.java

@@ -16,12 +16,16 @@
  */
 package org.springblade.modules.desk.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.modules.desk.entity.CustomMadeInfo;
 import org.springblade.modules.desk.mapper.CustomMadeInfoMapper;
 import org.springblade.modules.desk.service.ICustomMadeInfoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 服务实现类
  *
@@ -33,4 +37,11 @@ import org.springframework.stereotype.Service;
 public class CustomMadeInfoServiceImpl extends BaseServiceImpl<CustomMadeInfoMapper, CustomMadeInfo> implements ICustomMadeInfoService {
 
 
+	@Override
+	public List<CustomMadeInfo> listByOrderNo(String orderNo) {
+		LambdaQueryWrapper<CustomMadeInfo> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(CustomMadeInfo::getOrderNo, orderNo);
+		List<CustomMadeInfo> list = this.list(wrapper);
+		return list;
+	}
 }

src/main/java/org/springblade/modules/desk/service/impl/OrderServiceImpl.java

@@ -16,15 +16,18 @@
  */
 package org.springblade.modules.desk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Query;
 import org.springblade.modules.desk.entity.CustomMadeInfo;
 import org.springblade.modules.desk.entity.Order;
 import org.springblade.modules.desk.mapper.CustomMadeInfoMapper;
 import org.springblade.modules.desk.mapper.OrderMapper;
 import org.springblade.modules.desk.service.ICustomMadeInfoService;
 import org.springblade.modules.desk.service.IOrderService;
+import org.springblade.modules.desk.vo.NoticeVO;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
@@ -59,6 +62,11 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
 		return numStr;
 	}
 
+	@Override
+	public IPage<Order> pageWithMadeInfoCount(IPage<Order> page, String buyerName, String buyerPhone, String orderNo, String status) {
+		return page.setRecords(baseMapper.pageWithMadeInfoCount(page, buyerName, buyerPhone, orderNo, status));
+	}
+
 	/**
 	 * 根据位数生成最大值
 	 *

src/main/java/org/springblade/modules/weixin/controller/WeChatUserController.java

@@ -30,7 +30,7 @@ public class WeChatUserController {
 
     @GetMapping("/list")
     public R list(WeChatUser weChatUser, Query query) {
-        return R.data(weChatUserService.page(Condition.getPage(query), Wrappers.<WeChatUser>lambdaQuery(weChatUser)));
+        return R.data(weChatUserService.page(Condition.getPage(query), Wrappers.<WeChatUser>lambdaQuery(weChatUser).orderByDesc(WeChatUser::getCreateTime)));
     }
 
     /**

src/main/resources/application.yml

@@ -184,7 +184,7 @@ blade:
     #接口放行
     skip-url:
       #- /blade-resource/**
-      #- /blade-system/**
+      - /blade-desk/**
       - /blade-desk/custom-made-info/**
       - /blade-system/dict-biz/get-logistics-companies
       - /blade-system/dict-biz/get-purchase-channel