wsy182
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

赛会选择球队1

pull/371/head
wuyibo 2022-11-11 14:44:46 +08:00
parent 75ecb9aded
commit 0d5e13affe
7 changed files with 106 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java
View File

@ -5,6 +5,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
import io.swagger.v3.oas.annotations.Parameters;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -94,12 +95,28 @@ public class CompetitionOfTeamController extends BaseController
return toAjax(competitionOfTeamService.updateCompetitionOfTeam(competitionOfTeam));
}
@RequiresPermissions("system:competitionOfTeam:batchEditById")
@Log(title = "赛会中-参赛队伍", businessType = BusinessType.UPDATE)
@Log(title = "赛会中-参赛队伍批量修改", businessType = BusinessType.UPDATE)
@PutMapping("/batchEditById")
public AjaxResult batchEditById(@RequestBody List<CompetitionOfTeam> list)
{
return toAjax(competitionOfTeamService.batchUpdateCompetitionOfTeam(list));
}
@RequiresPermissions("system:competitionOfTeam:removeTeamGroup")
@Log(title = "赛会中-参赛队伍移除分组", businessType = BusinessType.UPDATE)
@PutMapping("/removeTeamGroup/{ids}")
public AjaxResult removeTeamGroup(@PathVariable Long[] ids)
{
return toAjax(competitionOfTeamService.removeTeamGroup(ids));
}
@RequiresPermissions("system:competitionOfTeam:intoTeamGroup")
@Log(title = "赛会中-参赛队伍移入分组", businessType = BusinessType.UPDATE)
@PostMapping("/intoTeamGroup/{competitionGroup}")
public AjaxResult intoTeamGroup(@PathVariable String competitionGroup,@RequestBody List<Long> ids)
{
return toAjax(competitionOfTeamService.intoTeamGroup(competitionGroup,ids));
}
/**
* 删除赛会中-参赛队伍
*/

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java
View File

@ -59,4 +59,8 @@ public interface CompetitionOfTeamMapper
* @return 结果
*/
public int deleteCompetitionOfTeamByIds(Long[] ids);
int removeTeamGroup(Long[] ids);
int intoTeamGroup(String competitionGroup, List<Long> ids);
}

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java
View File

@ -66,4 +66,8 @@ public interface ICompetitionOfTeamService
* @return 结果
*/
public int deleteCompetitionOfTeamById(Long id);
int removeTeamGroup(Long[] ids);
int intoTeamGroup(String competitionGroup,List<Long> ids);
}

10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java
View File

@ -101,4 +101,14 @@ public class CompetitionOfTeamServiceImpl implements ICompetitionOfTeamService
{
return competitionOfTeamMapper.deleteCompetitionOfTeamById(id);
}
@Override
public int removeTeamGroup(Long[] ids) {
return competitionOfTeamMapper.removeTeamGroup(ids);
}
@Override
public int intoTeamGroup(String competitionGroup, List<Long> ids) {
return competitionOfTeamMapper.intoTeamGroup(competitionGroup,ids);
}
}

12
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
View File

@ -109,6 +109,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
where id = #{id}
</update>
<update id="removeTeamGroup">
update competition_of_team set competition_group = null where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<update id="intoTeamGroup">
update competition_of_team set competition_group = #{competitionGroup} where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<delete id="deleteCompetitionOfTeamById" parameterType="Long">
delete from competition_of_team where id = #{id}

25
ruoyi-ui/src/api/system/competitionOfTeam.js
View File

@ -34,7 +34,30 @@ export function updateCompetitionOfTeam(data) {
data: data
})
}
//赛会中-参赛队伍批量修改
export function batchEditById(data) {
return request({
url: '/system/competitionOfTeam/batchEditById',
method: 'put',
data: data
})
}
//赛会中-参赛队伍移入分组
export function intoTeamGroup(data,competitionGroup) {
return request({
url: '/system/competitionOfTeam/intoTeamGroup/'+competitionGroup,
method: 'post',
data: data
})
}
//赛会中-参赛队伍移除分组
export function removeTeamGroup(ids,data) {
return request({
url: '/system/competitionOfTeam/removeTeamGroup/'+ids,
method: 'put',
data: data
})
}
// 删除赛会中-参赛队伍
export function delCompetitionOfTeam(id) {
return request({

42
ruoyi-ui/src/views/system/competitionSet/index.vue
View File

@ -156,7 +156,7 @@
<el-table-column label="联系人电话" align="center" prop="contactsTel" />
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.competitionGroup" type="primary" icon="el-icon-delete" circle></el-button>
<el-button v-if="scope.row.competitionGroup" @click="clickDelTeamGroup(scope.row)" type="primary" icon="el-icon-delete" circle></el-button>
</template>
</el-table-column>
</el-table>
@ -237,7 +237,7 @@
<el-dialog
title="选择球队"
title="选择球队添加到分组"
:visible.sync="addTeamDialogVisible"
width="30%"
center>
@ -266,7 +266,7 @@
<script>
import { listCompetition, getCompetition, delCompetition, addCompetition, updateCompetition } from "@/api/system/competition";
import { listCompetitionOfTeam, getCompetitionOfTeam, delCompetitionOfTeam, addCompetitionOfTeam, updateCompetitionOfTeam } from "@/api/system/competitionOfTeam";
import { listCompetitionOfTeam, batchEditById, intoTeamGroup, removeTeamGroup, updateCompetitionOfTeam } from "@/api/system/competitionOfTeam";
import { listCompetitionMembers, getCompetitionMembers, delCompetitionMembers, addCompetitionMembers, updateCompetitionMembers } from "@/api/system/competitionMembers";
import { listCompetitionTeamGroup, getCompetitionTeamGroup, delCompetitionTeamGroup, addCompetitionTeamGroup, updateCompetitionTeamGroup } from "@/api/system/competitionTeamGroup";
export default {
@ -359,6 +359,23 @@ export default {
});
}
},
//球队移除分组
clickDelTeamGroup(row){
let competitionObj = this.competitionObj;
let that = this;
that.$modal.confirm('是否确认从分组中移除球队为"' + row.teamName + '"的数据？').then(function() {
removeTeamGroup(row.id,{}).then(response => {
listCompetitionOfTeam({"pageNum": 1, "pageSize": 1000,"competitionId":competitionObj.id,"competitionGroup":row.competitionGroup})
.then(response => {
that.alreadyGroupTeamList = response.rows;
});
that.$message({
message: '恭喜你，球队移除成功',
type: 'success'
});
});
})
},
//删除分组
delGroup(row){
console.info(row)
@ -392,15 +409,18 @@ export default {
});
},
handleSelectionTeamChange(val){
//console.info(this.currentGroupRow)
let list = [];
for (let i = 0;i<val.length;i++){
let team = val[i];
let selectedTeam = {
"id": team.id,
"competitionGroup": team.competitionGroup
"competitionGroup": this.currentGroupRow.competitionGroup
};
this.teamMultipleSelection.push(selectedTeam);
list.push(selectedTeam);
}
this.teamMultipleSelection=list;
//console.info(this.teamMultipleSelection)
//this.multipleSelection = val;
},
//保存选择的分组数据
@ -413,8 +433,14 @@ export default {
});
}else {
this.addTeamDialogVisible = false;
updateCompetitionOfTeam({"id": id, "status": tage}).then(response => {
batchEditById(this.teamMultipleSelection).then(response => {
this.$message({
message: '恭喜你，成功新增到分组',
type: 'success'
});
listCompetitionOfTeam({"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id,"competitionGroup":this.currentGroupRow.competitionGroup}).then(response => {
this.alreadyGroupTeamList = response.rows;
});
});
}
},