专家--比赛详情

dev
王家东 5 months ago
parent ee939c8bd2
commit 96e746a404
  1. 62
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java
  2. 59
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
  3. 1
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
  4. 339
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListZJ.vue

@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@ -40,6 +41,10 @@ import org.jeecg.modules.demo.awardpersion.entity.AwardPersionOptions;
import org.jeecg.modules.demo.awardpersion.service.IAwardPersionService;
import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService;
import org.jeecg.modules.demo.compexp.entity.CompExp;
import org.jeecg.modules.demo.compexp.service.ICompExpService;
import org.jeecg.modules.demo.expert.entity.Expert;
import org.jeecg.modules.demo.expert.service.IExpertService;
import org.jeecg.modules.demo.expscore.entity.ExpScore;
import org.jeecg.modules.demo.expscore.service.IExpScoreService;
import org.jeecg.modules.demo.score_management.entity.ScoreManagement;
@ -112,6 +117,12 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
@Autowired
private ITongfenCompinfoService tongfenCompinfoService;
@Autowired
private IExpertService expertService;
@Autowired
private ICompExpService compExpService;
@Resource
private JeecgBaseConfig jeecgBaseConfig;
@ -177,6 +188,57 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
return Result.OK(pageList);
}
/**
* 专家 显示所有
* @param annualCompPoint
* @param pageNo
* @param pageSize
* @param req
* @return {@link Result}<{@link IPage}<{@link AnnualCompPoint}>>
*/
@GetMapping(value = "/listZJ")
public Result<IPage<AnnualCompPoint>> listZJ(AnnualCompPoint annualCompPoint,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<AnnualCompPoint> queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
// 获取当前登录用户
Subject subject = SecurityUtils.getSubject();
LoginUser loginUser = (LoginUser) subject.getPrincipal();
QueryWrapper<Expert> exqueryWrapper = new QueryWrapper<>();
exqueryWrapper.eq("user_id", loginUser.getId());
Expert expert = expertService.getOne(exqueryWrapper);
//开始获取exp-comp
QueryWrapper<CompExp> coexqueryWrapper = new QueryWrapper<>();
coexqueryWrapper.eq("expid", expert.getId());
List<CompExp> compExpList = compExpService.list(coexqueryWrapper);
List<String> compIdListss = new ArrayList<>();
for (CompExp compExps : compExpList) {
compIdListss.add(compExps.getCompid());
}
QueryWrapper<Comp> coqueryWrapper = new QueryWrapper<>();
coqueryWrapper.in("id",compIdListss);
List<Comp> compList = compService.list(coqueryWrapper);
List<String> needlist = new ArrayList<>();
for (Comp comp : compList){
needlist.add(comp.getId());
}
QueryWrapper<AnnualComp> anncoqueryWrapper = new QueryWrapper<>();
anncoqueryWrapper.in("compid",needlist);
List<AnnualComp> annualCompList = annualCompService.list(anncoqueryWrapper);
List<String> stringList = new ArrayList<>();
for (AnnualComp annualComp : annualCompList){
stringList.add(annualComp.getId());
}
queryWrapper.in("annual_comp_id",stringList);
Page<AnnualCompPoint> page = new Page<AnnualCompPoint>(pageNo, pageSize);
IPage<AnnualCompPoint> pageList = annualCompPointService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 学生端列表
* @param annualCompPoint

@ -1,6 +1,7 @@
package org.jeecg.modules.demo.annualcomp.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@ -13,6 +14,7 @@ import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.annual.entity.Annual;
import org.jeecg.modules.demo.annual.service.IAnnualService;
@ -21,6 +23,10 @@ import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.annualcomp.vo.AnnualCompVo;
import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService;
import org.jeecg.modules.demo.compexp.entity.CompExp;
import org.jeecg.modules.demo.compexp.service.ICompExpService;
import org.jeecg.modules.demo.expert.entity.Expert;
import org.jeecg.modules.demo.expert.service.IExpertService;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.service.ISysUserRoleService;
import org.jetbrains.annotations.NotNull;
@ -56,6 +62,59 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
@Autowired
private ISysUserRoleService iSysUserRoleService;
@Autowired
private IExpertService expertService;
@Autowired
private ICompExpService compExpService;
/**
* 分页列表查询
*
* @param annualComp
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "annual_comp-分页列表查询")
@ApiOperation(value="annual_comp-分页列表查询", notes="annual_comp-分页列表查询")
@GetMapping(value = "/listZJ")
public Result<IPage<AnnualComp>> listZJ(AnnualComp annualComp,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<AnnualComp> queryWrapper = QueryGenerator.initQueryWrapper(annualComp, req.getParameterMap());
Page<AnnualComp> page = new Page<AnnualComp>(pageNo, pageSize);
// 获取当前登录用户
Subject subject = SecurityUtils.getSubject();
LoginUser loginUser = (LoginUser) subject.getPrincipal();
QueryWrapper<Expert> exqueryWrapper = new QueryWrapper<>();
exqueryWrapper.eq("user_id", loginUser.getId());
Expert expert = expertService.getOne(exqueryWrapper);
//开始获取exp-comp
QueryWrapper<CompExp> coexqueryWrapper = new QueryWrapper<>();
coexqueryWrapper.eq("expid", expert.getId());
List<CompExp> compExpList = compExpService.list(coexqueryWrapper);
List<String> compIdListss = new ArrayList<>();
for (CompExp compExps : compExpList) {
compIdListss.add(compExps.getCompid());
}
QueryWrapper<Comp> coqueryWrapper = new QueryWrapper<>();
coqueryWrapper.in("id",compIdListss);
List<Comp> compList = compService.list(coqueryWrapper);
List<String> needlist = new ArrayList<>();
for (Comp comp : compList){
needlist.add(comp.getId());
}
queryWrapper.in("compid",needlist);
IPage<AnnualComp> pageList = annualCompService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*

@ -181,6 +181,7 @@ public class CompController extends JeecgController<Comp, ICompService> {
for (CompExp compExps : compExpList) {
compIdListss.add(compExps.getCompid());
}
queryWrapper.in("id",compIdListss);
Page<Comp> page = new Page<Comp>(pageNo, pageSize);
IPage<Comp> pageList = compService.page(page, queryWrapper);

@ -0,0 +1,339 @@
<template>
<div>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam"
:label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
导入
</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)"/>
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<!--省市区字段回显插槽-->
<template #pcaSlot="{text}">
{{ getAreaTextByCode(text) }}
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined"
size="small" @click="downloadFile(text)">下载
</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<AnnualCompPointModal ref="registerModal" @success="handleSuccess"></AnnualCompPointModal>
</div>
</template>
<script lang="ts" name="AnnualCompPoint-annualCompPoint" setup>
import {ref, reactive} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useListPage} from '/@/hooks/system/useListPage';
import {columns} from './AnnualCompPoint.data';
import {
listZJ,
deleteOne,
batchDelete,
getImportUrl,
getExportUrl,
updateApply
} from './AnnualCompPoint.api';
import {downloadFile} from '/@/utils/common/renderUtils';
import AnnualCompPointModal from './components/AnnualCompPointModal.vue'
import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue';
import {router} from "/@/router";
import {useRouter} from "vue-router";
import {award} from "/@/views/award/AwardManagement.api.ts";
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '年度比赛项目管理',
api: listZJ,
// api: () => list({ ...params, compStatus: compStatus }),
columns,
canResize: false,
useSearchForm: false,
actionColumn: {
width: 180,
fixed: 'right',
},
beforeFetch: (params) => {
queryParam.annualCompState=2;
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "年度比赛项目管理",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, {
reload,
collapseAll,
updateTableDataRecord,
findTableDataRecord,
getDataSource
}, {rowSelection, selectedRowKeys}] = tableContext;
const labelCol = reactive({
xs: {span: 24},
sm: {span: 7},
});
const wrapperCol = reactive({
xs: {span: 24},
sm: {span: 16},
});
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 年度项目管理 评奖
*/
const router = useRouter()
function pingjiang(record: Recordable) {
// console.log(record.id)
award({annualCompid:record.id})
router.push({
path: '/award/AwardManagementList',
query: {id: record.id}
});
}
/**
* 年度项目管理 报名管理
*/
function applicationManage(record: Recordable) {
router.push({
path: '/workManage/works',
query: {annualCompPointId: record.id}
});
}
/**
* 年度项目管理 选题管理
*/
function topicManage(record: Recordable) {
router.push({
path: '/workManage/works',
query: {annualCompPointId: record.id}
});
}
/**
* 年度项目管理 作品管理
*/
function workManage(record: Recordable) {
router.push({
path: '/workManage/works',
query: {annualCompPointId: record.id}
});
}
/**
* 年度项目管理 评分管理
*/
function scoreManage(record: Recordable) {
router.push({
path: '/workManage/works',
query: {annualCompPointId: record.id}
});
}
/**
* 年度项目管理 评奖管理
*/
function awardManage(record: Recordable) {
router.push({
path: '/workManage/works',
query: {annualCompPointId: record.id}
});
}
/**
* 年度项目管理 提交审核按钮
*/
function handleSubmitandApply(record: Recordable) {
updateApply({id: record.id, annualCompState: record.annualCompState}, handleSuccess);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
const actions = [
{
label: '报名',
onClick: applicationManage.bind(null, record),
},
{
label: '选题',
onClick: topicManage.bind(null, record),
},
{
label: '作品管理',
onClick: workManage.bind(null, record),
},
{
label: '评分',
onClick: scoreManage.bind(null, record),
},
{
label: '评奖',
onClick: awardManage.bind(null, record),
},
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
},
];
return actions;
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
/**
* popup组件值改变事件
*/
function setFieldsValue(map) {
Object.keys(map).map((key) => {
queryParam[key] = map[key];
});
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust {
width: calc(50% - 15px);
min-width: 100px !important;
}
.query-group-split-cust {
width: 30px;
display: inline-block;
text-align: center
}
}
</style>
Loading…
Cancel
Save