From 72d88b29e943a55244d6ac6b591adbb51ccb8f38 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 21 Jun 2022 14:42:41 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E7=A0=81=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayRandomCodeController.java | 9 ++++++++- .../com/jero/meeting/entity/PayRandomCode.java | 10 ++++++---- .../jero/meeting/entity/PayRandomCodeLink.java | 1 + .../meeting/mapper/PayRandomCodeLinkMapper.java | 2 ++ .../mapper/xml/PayRandomCodeLinkMapper.xml | 14 ++++++++++---- .../meeting/service/PayRandomCodeLinkService.java | 15 +++++++++++---- 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java index 84ea1ba7..e70f1084 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java @@ -125,7 +125,14 @@ public class PayRandomCodeController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(randomCode, request.getParameterMap()); + List list = payRandomCodeService.list(queryWrapper); + list.forEach(item -> { + String randomCodeId = item.getRandomCodeId(); + List randomCodeLinkList = payRandomCodeLinkService.selectByRandomCodeId(randomCodeId); + item.setRandomCodeLinkList(randomCodeLinkList); + }); + return super.exportListXls(list, PayRandomCode.class, "随机码表"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCode.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCode.java index 6aad4d5e..289896fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCode.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCode.java @@ -29,6 +29,7 @@ public class PayRandomCode { /** * id */ + @TableId(type = IdType.ASSIGN_ID) @TableField(value = "random_code_id") @ApiModelProperty(value="id") private String randomCodeId; @@ -66,13 +67,13 @@ public class PayRandomCode { */ @TableField(value = "meeting_id") @ApiModelProperty(value="会议id") - private Integer meetingId; + private String meetingId; /** * 嘉宾类型 */ @TableField(value = "guest_type") - @Excel(name = "嘉宾类型", width = 15,dicCode = "guest_type") + @Excel(name = "嘉宾类型", width = 15,needMerge = true,dicCode = "guest_type") @ApiModelProperty(value="嘉宾类型") @Dict(dicCode = "guest_type") private Integer guestType; @@ -81,7 +82,7 @@ public class PayRandomCode { * 随机码个数 */ @TableField(value = "random_code_count") - @Excel(name = "随机码个数", width = 15) + @Excel(name = "随机码个数", width = 15,needMerge = true) @ApiModelProperty(value="随机码个数") private Integer randomCodeCount; @@ -89,10 +90,11 @@ public class PayRandomCode { * 使用个数 */ @TableField(value = "use_count") - @Excel(name = "使用个数", width = 15) + @Excel(name = "使用个数", width = 15,needMerge = true) @ApiModelProperty(value="使用个数") private Integer useCount; + @TableField(exist = false) @ExcelCollection(name = "随机码") private List randomCodeLinkList; } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCodeLink.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCodeLink.java index 9d3d60d1..91468532 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCodeLink.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayRandomCodeLink.java @@ -26,6 +26,7 @@ public class PayRandomCodeLink { * id */ @TableField(value = "id") + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") private String id; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayRandomCodeLinkMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayRandomCodeLinkMapper.java index 6578e118..03800f21 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayRandomCodeLinkMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayRandomCodeLinkMapper.java @@ -13,5 +13,7 @@ import com.jero.meeting.entity.PayRandomCodeLink; public interface PayRandomCodeLinkMapper extends BaseMapper { int insertList(@Param("list")List list); + List selectByRandomCodeId(@Param("randomCodeId")String randomCodeId); + } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayRandomCodeLinkMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayRandomCodeLinkMapper.xml index c1fa39f1..02c32f3a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayRandomCodeLinkMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayRandomCodeLinkMapper.xml @@ -19,16 +19,22 @@ INSERT INTO pay_random_code_link( id, random_code_id, - random_code, - use_flag + random_code )VALUES ( #{element.id,jdbcType=VARCHAR}, #{element.randomCodeId,jdbcType=VARCHAR}, - #{element.randomCode,jdbcType=BOOLEAN}, - #{element.useFlag,jdbcType=BOOLEAN} + #{element.randomCode,jdbcType=BOOLEAN} ) + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayRandomCodeLinkService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayRandomCodeLinkService.java index 4e66f248..daf07034 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayRandomCodeLinkService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayRandomCodeLinkService.java @@ -1,17 +1,24 @@ package com.jero.meeting.service; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.meeting.entity.PayRandomCodeLink; import com.jero.meeting.mapper.PayRandomCodeLinkMapper; + /** - * - *@author liJiaRao - *@date 2022-06-21 10:20 - */ + * @author liJiaRao + * @date 2022-06-21 10:20 + */ @Service public class PayRandomCodeLinkService extends ServiceImpl { + @Resource + private PayRandomCodeLinkMapper randomCodeLinkMapper; + public List selectByRandomCodeId(String randomCodeId) { + return randomCodeLinkMapper.selectByRandomCodeId(randomCodeId); + } }