From e16ac98e0d1049d18c508799d64f11d942c74920 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Sun, 27 Apr 2025 14:32:57 +0800 Subject: [PATCH] refactor(votesActivity): 修改自主报名字段名称 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java index e1dddd9..33780fd 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java @@ -169,6 +169,8 @@ HappyActivity happyActivity = new HappyActivity(); BeanUtil.copyProperties(dto, happyActivity); happyActivity.setCode(code); + happyActivity.setExpectCnt(dto.getJoinCnt()); + happyActivity.setSurplusCnt(dto.getJoinCnt()); this.baseMapper.insert(happyActivity); return new FebsResponse().success().message("操作成功"); @@ -268,7 +270,7 @@ List<HappyActivity> happyActivities = this.baseMapper.selectList( new LambdaQueryWrapper<HappyActivity>() .select(HappyActivity::getId, HappyActivity::getName) - .eq(HappyActivity::getType, StateUpDownEnum.ACTIVITY_TYPE_CROWDFUNDING.getCode()) + .eq(HappyActivity::getPayState, StateUpDownEnum.ACTIVITY_CROWDFUNDING_STATE_OPEN.getCode()) .eq(HappyActivity::getDeleteFlag, StateUpDownEnum.DOWN.getCode()) ); return happyActivities; @@ -400,4 +402,19 @@ return new FebsResponse().success().message("操作成功"); } + + @Override + public List<HappyActivityOption> getVoteOptionListForExport(Map<String, String> params) { + LambdaQueryWrapper<HappyActivityOption> queryWrapper = new LambdaQueryWrapper<>(); + if(ObjectUtil.isNotEmpty(params.get("activityId"))){ + queryWrapper.eq(HappyActivityOption::getActivityId, Long.valueOf(params.get("activityId"))); + } + if(ObjectUtil.isNotEmpty(params.get("audit"))){ + queryWrapper.eq(HappyActivityOption::getState, Integer.valueOf(params.get("state"))); + } + if(ObjectUtil.isNotEmpty(params.get("beautyName"))){ + queryWrapper.like(HappyActivityOption::getOptionName, params.get("optionName")); + } + return happyActivityOptionMapper.selectList(queryWrapper); + } } -- Gitblit v1.9.1