|
@@ -6,10 +6,12 @@ import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import com.pig4cloud.plugin.excel.annotation.RequestExcel;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTeam;
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTeam;
|
|
import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
|
|
import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.model.excel.WmTeamExcelModel;
|
|
import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.PackageUserScopeEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.PackageUserScopeEnum;
|
|
@@ -18,6 +20,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTeamService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTeamService;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -56,6 +59,7 @@ public class WmTeamController {
|
|
* @param wmTeam
|
|
* @param wmTeam
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @SysLog("保存团队")
|
|
@PostMapping
|
|
@PostMapping
|
|
public R<?> save(@RequestBody @Validated({BaseEntity.Create.class}) WmTeam wmTeam) {
|
|
public R<?> save(@RequestBody @Validated({BaseEntity.Create.class}) WmTeam wmTeam) {
|
|
if (StrUtil.containsBlank(wmTeam.getName())) {
|
|
if (StrUtil.containsBlank(wmTeam.getName())) {
|
|
@@ -84,6 +88,7 @@ public class WmTeamController {
|
|
* @param wmTeam
|
|
* @param wmTeam
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @SysLog("更新团队")
|
|
@PutMapping
|
|
@PutMapping
|
|
public R<?> update(@RequestBody @Validated({BaseEntity.Update.class}) WmTeam wmTeam) {
|
|
public R<?> update(@RequestBody @Validated({BaseEntity.Update.class}) WmTeam wmTeam) {
|
|
if (StrUtil.isNotBlank(wmTeam.getName()) && StrUtil.containsBlank(wmTeam.getName())) {
|
|
if (StrUtil.isNotBlank(wmTeam.getName()) && StrUtil.containsBlank(wmTeam.getName())) {
|
|
@@ -111,7 +116,8 @@ public class WmTeamController {
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @PostMapping("/{id}")
|
|
|
|
|
|
+ @SysLog("解散团队")
|
|
|
|
+ @PostMapping("/{id}/dissolve")
|
|
public R<?> dissolve(@PathVariable("id") Integer id) {
|
|
public R<?> dissolve(@PathVariable("id") Integer id) {
|
|
// 查询团队是否还有任务在进行
|
|
// 查询团队是否还有任务在进行
|
|
int packageCount = wmScorePackageService.count(Wrappers.<WmScorePackage>lambdaQuery()
|
|
int packageCount = wmScorePackageService.count(Wrappers.<WmScorePackage>lambdaQuery()
|
|
@@ -128,6 +134,40 @@ public class WmTeamController {
|
|
return R.ok();
|
|
return R.ok();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * TODO
|
|
|
|
+ * @param teamExcelModelList
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @SysLog("团队批量导入")
|
|
|
|
+ @PostMapping("/batch-import")
|
|
|
|
+ public R<?> batchImport(@RequestExcel List<WmTeamExcelModel> teamExcelModelList) {
|
|
|
|
+
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据id查询
|
|
|
|
+ *
|
|
|
|
+ * @param id
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @GetMapping("/{id}")
|
|
|
|
+ public R<?> getById(@PathVariable("id") Integer id) {
|
|
|
|
+ WmTeam team = wmTeamService.getById(id);
|
|
|
|
+ if (team != null) {
|
|
|
|
+ if (team.getLeader() != null) {
|
|
|
|
+ SysUser leaderUser = sysUserMapper.selectById(team.getLeader());
|
|
|
|
+ team.setLeaderName(leaderUser.getRealname());
|
|
|
|
+ }
|
|
|
|
+ if (ArrayUtil.isNotEmpty(team.getMember())) {
|
|
|
|
+ List<SysUser> userList = sysUserMapper.selectBatchIds(CollectionUtil.toList(team.getMember()));
|
|
|
|
+ team.setMemberName(userList.stream().map(SysUser::getRealname).toArray(String[]::new));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return R.ok(team);
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询团队列表
|
|
* 查询团队列表
|
|
*
|
|
*
|