moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增查询字段

Browse Source
This commit is contained in:
liaozetao
2024-03-26 17:34:30 +08:00
parent 10b0c0f9f8
commit 244e269d8c
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/lucky/LuckyGiftRewardRecordAdminMapper.java
View File

@@ -20,7 +20,7 @@ public interface LuckyGiftRewardRecordAdminMapper {
* @param sendErBanNo
* @return
*/
Page<LuckyGiftSendRecordAdminVo> getGiftSendPage(Page<LuckyGiftSendRecordAdminVo> page, @Param("giftId") Integer giftId, @Param("sendErBanNo") Long sendErBanNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
Page<LuckyGiftSendRecordAdminVo> getGiftSendPage(Page<LuckyGiftSendRecordAdminVo> page, @Param("giftId") Integer giftId, @Param("rangeId") Long rangeId, @Param("sendErBanNo") Long sendErBanNo, @Param("receiveErBanNo") Long receiveErBanNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
@@ -31,5 +31,5 @@ public interface LuckyGiftRewardRecordAdminMapper {
* @param endTime
* @return
*/
List<LuckyGiftSendRecordAdminVo> getGiftSendList(@Param("giftId") Integer giftId, @Param("sendErBanNo") Long sendErBanNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
List<LuckyGiftSendRecordAdminVo> getGiftSendList(@Param("giftId") Integer giftId, @Param("rangeId") Long rangeId, @Param("sendErBanNo") Long sendErBanNo, @Param("receiveErBanNo") Long receiveErBanNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
}

4
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/LuckyGiftRewardRecordAdminService.java
View File

@@ -25,7 +25,7 @@ public interface LuckyGiftRewardRecordAdminService {
* @param pageSize
* @return
*/
Page<LuckyGiftSendRecordAdminVo> getGiftSendPage(Integer giftId, Long sendErBanNo, String startTime, String endTime, Integer pageNum, Integer pageSize);
Page<LuckyGiftSendRecordAdminVo> getGiftSendPage(Integer giftId, Long rangeId, Long sendErBanNo, Long receiveErBanNo, String startTime, String endTime, Integer pageNum, Integer pageSize);
/**
* 奖励详情
@@ -42,5 +42,5 @@ public interface LuckyGiftRewardRecordAdminService {
* @param sendErBanNo
* @param servletWebRequest
*/
void export(Integer giftId, Long sendErBanNo, String startTime, String endTime, ServletWebRequest servletWebRequest);
void export(Integer giftId, Long rangeId, Long sendErBanNo, Long receiveErBanNo, String startTime, String endTime, ServletWebRequest servletWebRequest);
}

8
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardRecordAdminServiceImpl.java
View File

@@ -44,8 +44,8 @@ public class LuckyGiftRewardRecordAdminServiceImpl implements LuckyGiftRewardRec
private LuckyGiftRewardRecordMapper luckyGiftRewardRecordMapper;
@Override
public Page<LuckyGiftSendRecordAdminVo> getGiftSendPage(Integer giftId, Long sendErBanNo, String startTime, String endTime, Integer pageNum, Integer pageSize) {
return luckyGiftRewardRecordAdminMapper.getGiftSendPage(new Page<>(pageNum, pageSize), giftId, sendErBanNo, startTime, endTime);
public Page<LuckyGiftSendRecordAdminVo> getGiftSendPage(Integer giftId, Long rangeId, Long sendErBanNo, Long receiveErBanNo, String startTime, String endTime, Integer pageNum, Integer pageSize) {
return luckyGiftRewardRecordAdminMapper.getGiftSendPage(new Page<>(pageNum, pageSize), giftId, rangeId, sendErBanNo, receiveErBanNo, startTime, endTime);
}
@Override
@@ -86,8 +86,8 @@ public class LuckyGiftRewardRecordAdminServiceImpl implements LuckyGiftRewardRec
}
@Override
public void export(Integer giftId, Long sendErBanNo, String startTime, String endTime, ServletWebRequest servletWebRequest) {
List<LuckyGiftSendRecordAdminVo> records = luckyGiftRewardRecordAdminMapper.getGiftSendList(giftId, sendErBanNo, startTime, endTime);
public void export(Integer giftId, Long rangeId, Long sendErBanNo, Long receiveErBanNo, String startTime, String endTime, ServletWebRequest servletWebRequest) {
List<LuckyGiftSendRecordAdminVo> records = luckyGiftRewardRecordAdminMapper.getGiftSendList(giftId, rangeId, sendErBanNo, receiveErBanNo, startTime, endTime);
List<LuckyGiftSendRecordAdminDto> datas = new ArrayList<>();
if (CollectionUtil.isNotEmpty(records)) {
for (LuckyGiftSendRecordAdminVo record : records) {

6
accompany-admin/accompany-admin-service/src/main/resources/mapper/LuckyGiftRewardRecordAdminMapper.xml
View File

@@ -62,9 +62,15 @@
<if test="giftId != null">
and lgrr.lucky_gift_id = #{giftId}
</if>
<if test="rangeId != null">
and lgrr.ranger_id = #{rangeId}
</if>
<if test="sendErBanNo != null">
and u1.erban_no = #{sendErBanNo}
</if>
<if test="receiveErBanNo != null">
and u2.erban_no = #{receiveErBanNo}
</if>
<if test="startTime != null and startTime != ''">
and lgrr.create_time &gt;= #{startTime}
</if>

10
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyGiftRewardRecordAdminController.java
View File

@@ -45,7 +45,9 @@ public class LuckyGiftRewardRecordAdminController {
*/
@ApiImplicitParams({
@ApiImplicitParam(name = "giftId", value = "礼物ID"),
@ApiImplicitParam(name = "rangeId", value = "区间"),
@ApiImplicitParam(name = "sendErBanNo", value = "送礼用户ID"),
@ApiImplicitParam(name = "receiveErBanNo", value = "收礼用户ID"),
@ApiImplicitParam(name = "startTime", value = "开始时间"),
@ApiImplicitParam(name = "endTime", value = "结束时间"),
@ApiImplicitParam(name = "pageNum", value = "当前页"),
@@ -53,8 +55,8 @@ public class LuckyGiftRewardRecordAdminController {
})
@ApiOperation("分页")
@GetMapping("getGiftSendPage")
public BusiResult<Page<LuckyGiftSendRecordAdminVo>> getGiftSendPage(Integer giftId, Long sendErBanNo, String startTime, String endTime, PageReq req) {
return BusiResult.success(luckyGiftRewardRecordAdminService.getGiftSendPage(giftId, sendErBanNo, startTime, endTime, req.getPage(), req.getPageSize()));
public BusiResult<Page<LuckyGiftSendRecordAdminVo>> getGiftSendPage(Integer giftId, Long rangeId, Long sendErBanNo, Long receiveErBanNo, String startTime, String endTime, PageReq req) {
return BusiResult.success(luckyGiftRewardRecordAdminService.getGiftSendPage(giftId, rangeId, sendErBanNo, receiveErBanNo, startTime, endTime, req.getPage(), req.getPageSize()));
}
/**
@@ -80,8 +82,8 @@ public class LuckyGiftRewardRecordAdminController {
*/
@ApiOperation("导出")
@GetMapping("/export")
public void export(Integer giftId, Long sendErBanNo, String startTime, String endTime, HttpServletRequest request, HttpServletResponse response) {
luckyGiftRewardRecordAdminService.export(giftId, sendErBanNo, startTime, endTime, new ServletWebRequest(request, response));
public void export(Integer giftId, Long rangeId, Long sendErBanNo, Long receiveErBanNo, String startTime, String endTime, HttpServletRequest request, HttpServletResponse response) {
luckyGiftRewardRecordAdminService.export(giftId, rangeId, sendErBanNo, receiveErBanNo, startTime, endTime, new ServletWebRequest(request, response));
}
}