c-chengc1/hmc_gbhd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-04-30 10:12:48 +08:00
parent bb394ce8e3
commit 73b3fc749e
5 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientItemController.java
+21 -8
View File
@@ -5,10 +5,7 @@ import com.budwk.app.base.result.Result;
import com.budwk.app.client.module.activity.service.ClientItemService;
import com.budwk.app.client.module.activity.vo.ClientActivitySignVO;
import com.budwk.app.client.module.activity.vo.ClientItemSignUpVO;
import com.budwk.app.module.activity.models.ActGroup;
import com.budwk.app.module.activity.models.ActUser;
import com.budwk.app.module.activity.models.ActivityItem;
import com.budwk.app.module.activity.models.ActivityItemUser;
import com.budwk.app.module.activity.models.*;
import com.budwk.app.web.commons.auth.satoken.StpClientUtil;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
@@ -16,6 +13,7 @@ import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.adaptor.JsonAdaptor;
import org.nutz.mvc.annotation.AdaptBy;
@@ -47,14 +45,22 @@ public class ClientItemController {
/**
* 查询出这个活动所有报名的人
* 查询出这个活动自己团队所有报名的人
*
* @param activityId
* @return
*/
@At("/list-apply-user/?")
@SaCheckLogin(type = StpClientUtil.TYPE)
public Result listApplyUser(String activityId){
List<ActivityItemUser> userList = dao.query(ActivityItemUser.class, Cnd.where(ActivityItemUser::getActivityId, "=", activityId));
public Result listApplyUser(String activityId) {
//查询自己在哪个团队
ActGroupUser user = dao.fetch(ActGroupUser.class, Cnd.where(ActGroupUser::getActivityId, "=", activityId).and(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()));
if (Lang.isEmpty(user)) {
return Result.error("您还没加入任何团队");
}
List<ActivityItemUser> userList = dao.query(ActivityItemUser.class,
Cnd.where(ActivityItemUser::getActivityId, "=", activityId)
.and(ActivityItemUser::getGroupId, "=", user.getGroupId()));
return Result.success(userList);
}
@@ -74,10 +80,16 @@ public class ClientItemController {
@At("/list-team-user/?")
@SaCheckLogin(type = StpClientUtil.TYPE)
public Result listTeamUser(Long activityId) {
//查询自己在哪个团队
ActGroupUser user = dao.fetch(ActGroupUser.class, Cnd.where(ActGroupUser::getActivityId, "=", activityId).and(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()));
if (Lang.isEmpty(user)) {
return Result.error("您还没加入任何团队");
}
Sql sql = Sqls.create("""
SELECT
t1.groupId,
t1.userId,
t1.isLeader,
t2.activityId,
t3.userName,
t3.unitName,
@@ -88,7 +100,8 @@ public class ClientItemController {
LEFT JOIN act_user t3 ON t3.userId = t1.userId
WHERE
t2.activityId = @activityId
""").setParam("activityId", activityId);
AND t1.groupId=@groupId
""").setParam("activityId", activityId).setParam("groupId", user.getGroupId());
List<NutMap> list = clientItemService.listMap(sql);
return Result.success(list);
}
backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientItemServiceImpl.java
+10 -2
View File
@@ -3,8 +3,10 @@ package com.budwk.app.client.module.activity.service.impl;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.client.module.activity.service.ClientItemService;
import com.budwk.app.client.module.activity.vo.ClientItemSignUpVO;
import com.budwk.app.module.activity.models.ActGroupUser;
import com.budwk.app.module.activity.models.Activity;
import com.budwk.app.module.activity.models.ActivityItemUser;
import com.budwk.app.web.commons.auth.satoken.StpClientUtil;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
@@ -28,9 +30,15 @@ public class ClientItemServiceImpl extends BaseServiceImpl<ActivityItemUser> imp
if (activity.getItemEndTime().isBefore(LocalDateTime.now())){
throw new RuntimeException("项目报名已结束!");
}
//找到自己的团队
ActGroupUser groupUser = dao().fetch(ActGroupUser.class,
Cnd.where(ActGroupUser::getActivityId, "=", signVO.getActivityId())
.and(ActGroupUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()));
// 删除掉之前的
clear(Cnd.where(ActivityItemUser::getActivityId, "=", signVO.getActivityId())
.and(ActivityItemUser::getGroupId, "=", signVO.getGroupId())
.and(ActivityItemUser::getGroupId, "=", groupUser.getGroupId())
.and(ActivityItemUser::getItemId, "=", signVO.getItemId())
);
@@ -39,7 +47,7 @@ public class ClientItemServiceImpl extends BaseServiceImpl<ActivityItemUser> imp
ActivityItemUser itemUser = new ActivityItemUser();
itemUser.setActivityId(signVO.getActivityId());
itemUser.setItemId(signVO.getItemId());
itemUser.setGroupId(signVO.getGroupId());
itemUser.setGroupId(groupUser.getGroupId());
itemUser.setUserId(userId);
userList.add(itemUser);
}