专家--比赛详情

dev
王家东 5 months ago
parent bd85be3824
commit be8f8e23e7
  1. 52
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
  2. 3
      jeecgboot-vue3-master/src/views/comp/Comp.api.ts
  3. 273
      jeecgboot-vue3-master/src/views/comp/CompListZJ.vue

@ -19,7 +19,11 @@ import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.comp.entity.Comp; import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService; 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.comptype.service.ICompTypeService; import org.jeecg.modules.demo.comptype.service.ICompTypeService;
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.entity.SysRole;
import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysDepartService;
@ -49,6 +53,9 @@ public class CompController extends JeecgController<Comp, ICompService> {
@Autowired @Autowired
private ICompService compService; private ICompService compService;
@Autowired
private ICompExpService compExpService;
@Autowired @Autowired
private ICompTypeService compTypeService; private ICompTypeService compTypeService;
@ -63,6 +70,9 @@ public class CompController extends JeecgController<Comp, ICompService> {
@Autowired @Autowired
private ISysUserRoleService iSysUserRoleService; private ISysUserRoleService iSysUserRoleService;
@Autowired
private IExpertService expertService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -126,8 +136,8 @@ public class CompController extends JeecgController<Comp, ICompService> {
* @param req * @param req
* @return * @return
*/ */
//@AutoLog(value = "比赛专家-分页列表查询") //@AutoLog(value = "分页列表查询")
@ApiOperation(value = "比赛专家-分页列表查询", notes = "比赛专家-分页列表查询") @ApiOperation(value = "分页列表查询", notes = "分页列表查询")
@GetMapping(value = "/listSTU") @GetMapping(value = "/listSTU")
public Result<IPage<Comp>> listSTU(Comp compExp, public Result<IPage<Comp>> listSTU(Comp compExp,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -140,6 +150,44 @@ public class CompController extends JeecgController<Comp, ICompService> {
} }
/**
* 分页列表查询
*
* @param compExp
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "比赛专家-分页列表查询")
@ApiOperation(value = "比赛专家-分页列表查询", notes = "比赛专家-分页列表查询")
@GetMapping(value = "/listZJ")
public Result<IPage<Comp>> listZJ(Comp compExp,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Comp> queryWrapper = QueryGenerator.initQueryWrapper(compExp, 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.in("id",compIdListss);
Page<Comp> page = new Page<Comp>(pageNo, pageSize);
IPage<Comp> pageList = compService.page(page, queryWrapper);
return Result.OK(pageList);
}
/** /**
* 添加 * 添加
* *

@ -13,6 +13,7 @@ enum Api {
importExcel = '/comp/comp/importExcel', importExcel = '/comp/comp/importExcel',
exportXls = '/comp/comp/exportXls', exportXls = '/comp/comp/exportXls',
getCompType = 'CompType/compType/getlist', getCompType = 'CompType/compType/getlist',
listZJ = '/comp/comp/listZJ',
} }
/** /**
@ -33,6 +34,8 @@ export const getImportUrl = Api.importExcel;
export const list = (params) => defHttp.get({ url: Api.list, params }); export const list = (params) => defHttp.get({ url: Api.list, params });
export const listSTU = (params) => defHttp.get({ url: Api.listSTU, params }); export const listSTU = (params) => defHttp.get({ url: Api.listSTU, params });
export const listZJ = (params) => defHttp.get({ url: Api.listZJ, params });
/** /**
* *
* @param params * @param params

@ -0,0 +1,273 @@
<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-col :lg="8">
<a-form-item label="比赛名称" name="compName">
<a-input placeholder="请输入比赛名称" v-model:value="queryParam.compName" />
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="比赛负责人" name="compAdmin">
<j-select-user-by-dept placeholder="请选择比赛负责人" v-model:value="queryParam.compAdmin" />
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="8">
<a-form-item label="比赛类型" name="compTypeId">
<j-popup
placeholder="请选择比赛类型"
v-model:value="queryParam.compTypeId"
code="comptype"
:fieldConfig="[{ source: 'type_name', target: 'compTypeId' }]"
:multi="true"
:setFieldsValue="setFieldsValue"
/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col>
</span>
</a-col>
</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" />-->
<!-- 删除-->
<!-- </a-menu-item>-->
</a-menu>
</template>
<!-- <a-button-->
<!-- >批量操作-->
<!-- <Icon icon="mdi:chevron-down" />-->
<!-- </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>
<!-- 表单区域 -->
<CompModal ref="registerModal" @success="handleSuccess" :comp-types="compType" />
</div>
</template>
<script lang="ts" name="comp-comp" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './Comp.data';
import { listZJ, deleteOne, batchDelete, getImportUrl, getExportUrl, getCompType } from './Comp.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import CompModal from './components/CompModal.vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUserByDept from '/@/components/Form/src/jeecg/components/JSelectUserByDept.vue';
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,
columns,
canResize: false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: (params) => {
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 },
});
//
const compType = ref([]);
(async function () {
compType.value = await getCompType({});
})();
/**
* 新增事件
*/
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);
}
/**
* 删除事件
*/
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) {
return [
/* {
label: '编辑',
onClick: handleEdit.bind(null, record),
},*/
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
];
}
/**
* 查询
*/
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