作品分配绑定作品组

main
Gitea 4 months ago
parent 1cf9f04dd3
commit 156091695c
  1. 135
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/controller/UpfileGroupController.java
  2. 76
      jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPModal1.vue
  3. 75
      jeecgboot-vue3-master/src/views/anncomgrotopp/components/UpfileGroup.api.ts
  4. 58
      jeecgboot-vue3-master/src/views/anncomgrotopp/components/UpfileGroup.data.ts
  5. 279
      jeecgboot-vue3-master/src/views/anncomgrotopp/components/UpfileGroupList.vue

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.upfilegroup.controller; package org.jeecg.modules.demo.upfilegroup.controller;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -15,13 +16,21 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop;
import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService;
import org.jeecg.modules.demo.anncomgrotopp.entity.AnnComGroTopP;
import org.jeecg.modules.demo.anncomgrotopp.service.IAnnComGroTopPService;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; 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.annualcompgroup.entity.AnnualCompGroup; import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup;
import org.jeecg.modules.demo.chooseTopicPersion.entity.ChaoseTopicPersion;
import org.jeecg.modules.demo.chooseTopicPersion.service.IChaoseTopicPersionService;
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.upfile_persion.entity.UpfilePersion;
import org.jeecg.modules.demo.upfile_persion.service.IUpfilePersionService;
import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup; import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup;
import org.jeecg.modules.demo.upfilegroup.service.IUpfileGroupService; import org.jeecg.modules.demo.upfilegroup.service.IUpfileGroupService;
@ -30,6 +39,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.upfilegroupassociation.entity.UpfileGroupAssociation;
import org.jeecg.modules.demo.upfilegroupassociation.service.IUpfileGroupAssociationService;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -70,6 +81,21 @@ public class UpfileGroupController extends JeecgController<UpfileGroup, IUpfileG
@Autowired @Autowired
private IAnnualCompPointService annualCompPointService; private IAnnualCompPointService annualCompPointService;
@Autowired
private IAnnComGroTopService annComGroTopService;
@Autowired
private IUpfileGroupAssociationService upfileGroupAssociationService;
@Autowired
private IUpfilePersionService upfilePersionService;
@Autowired
private IChaoseTopicPersionService chaoseTopicPersionService;
@Autowired
private IAnnComGroTopPService annComGroTopPService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -120,6 +146,115 @@ public class UpfileGroupController extends JeecgController<UpfileGroup, IUpfileG
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
* 绑定作品组需要的分页列表查询
*
* @param upfileGroup
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "作品组-分页列表查询")
@ApiOperation(value="绑定作品组需要的分页列表-分页列表查询", notes="绑定作品组需要的分页列表-分页列表查询")
@GetMapping(value = "/bdzpzlist")
public Result<IPage<UpfileGroup>> bdzpzlist(UpfileGroup upfileGroup,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req,@RequestParam(name="xmtmid",required=true) String xmtmid) {
AnnComGroTop annComGroTop = new AnnComGroTop();
QueryWrapper<AnnComGroTop> queryWrappertop = QueryGenerator.initQueryWrapper(annComGroTop, req.getParameterMap());
queryWrappertop.eq("ann_com_p_g",xmtmid);
List<AnnComGroTop> listtop = annComGroTopService.list(queryWrappertop);
if(listtop.size()>0){
QueryWrapper<UpfileGroup> queryWrapper = QueryGenerator.initQueryWrapper(upfileGroup, req.getParameterMap());
queryWrapper.eq("annid",listtop.get(0).getAnnid());
queryWrapper.eq("ann_com_p",listtop.get(0).getAnnComP());
Page<UpfileGroup> page = new Page<UpfileGroup>(pageNo, pageSize);
IPage<UpfileGroup> pageList = upfileGroupService.page(page, queryWrapper);
return Result.OK(pageList);
}else {
return Result.OK(null);
}
}
/**
* 绑定作品组添加
*
* @param
* @return
*/
@AutoLog(value = "绑定作品组添加-添加")
@ApiOperation(value = "绑定作品组添加-添加", notes = "绑定作品组添加-添加")
// @RequiresPermissions("chooseTopicPersion:chaose_topic_persion:add")
@GetMapping(value = "/bdzpzlistadd")
public Result<String> bdzpzlistadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="xmtmid",required=true) String xmtmid,HttpServletRequest req) {
String strs[] = ids.split(",");
//根据作品组id查询该组下有哪些作品需要绑定
List<String> zpidslist = new ArrayList<>();
for (int o = 0 ; o < strs.length ; o++){
QueryWrapper<UpfileGroupAssociation> queryWrapperuga = new QueryWrapper<>();
queryWrapperuga.eq("upfile_group_id",strs[o]);
List<UpfileGroupAssociation> listuga = upfileGroupAssociationService.list(queryWrapperuga);
for (int p = 0 ; p < listuga.size() ; p++){
UpfilePersion upfilePersion = upfilePersionService.getById(listuga.get(p).getUpfileId());
QueryWrapper<ChaoseTopicPersion> queryWrapperctp1 = new QueryWrapper<>();
queryWrapperctp1.eq("bmcode",upfilePersion.getApplyCode());
List<ChaoseTopicPersion> listctp1 = chaoseTopicPersionService.list(queryWrapperctp1);
if(listctp1.size()==0){
return Result.error(upfileGroupService.getById(strs[o]).getName()+"中"+upfilePersion.getTopicName()+"未选题,绑定失败!");
}
}
if(listuga.size()>0){
List<String> zpids = listuga.stream().map(UpfileGroupAssociation::getUpfileId).collect(Collectors.toList());
zpidslist.addAll(zpids);
}
}
//去除已绑定作品id
List<String> zpidslisttemp = new ArrayList<>();
zpidslisttemp.addAll(zpidslist);
for (int h = 0 ; h < zpidslisttemp.size() ; h++){
QueryWrapper<AnnComGroTopP> queryWrappertpp = new QueryWrapper<>();
queryWrappertpp.eq("ann_com_p_g",xmtmid);
List<AnnComGroTopP> listtopp = annComGroTopPService.list(queryWrappertpp);
for (int r = 0 ; r < listtopp.size() ; r++){
if(listtopp.get(r).getBmcode().equals(upfilePersionService.getById(zpidslisttemp.get(h)).getApplyCode())){
zpidslist.remove(zpidslisttemp.get(h));
}
}
}
if(zpidslist.size()>0){
QueryWrapper<AnnComGroTop> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ann_com_p_g",xmtmid);
List<AnnComGroTop> listtop = annComGroTopService.list(queryWrapper);
for (int i = 0 ; i < zpidslist.size() ; i++){
for (int k = 0 ; k < listtop.size() ;k++){
UpfilePersion upfilePersion = upfilePersionService.getById(zpidslist.get(i));
QueryWrapper<ChaoseTopicPersion> queryWrapperctp = new QueryWrapper<>();
queryWrapperctp.eq("bmcode",upfilePersion.getApplyCode());
List<ChaoseTopicPersion> listctp = chaoseTopicPersionService.list(queryWrapperctp);
if(listtop.get(k).getTopid().equals(listctp.get(0).getTimul())){
AnnComGroTopP annComGroTopP = new AnnComGroTopP();
annComGroTopP.setAnnComGroTopid(listtop.get(k).getId());
annComGroTopP.setBmcode(upfilePersion.getApplyCode());
annComGroTopP.setAnnid(listtop.get(k).getAnnid());
annComGroTopP.setAnnComP(listtop.get(k).getAnnComP());
annComGroTopP.setAnnComPG(listtop.get(k).getAnnComPG());
annComGroTopP.setTopicName(upfilePersion.getTopicName());
annComGroTopP.setTopid(listtop.get(k).getTopid());
annComGroTopPService.save(annComGroTopP);
}
}
}
}
return Result.OK("绑定成功!");
}
/** /**
* 添加 * 添加
* *

@ -0,0 +1,76 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<AnnComGroTopPForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AnnComGroTopPForm>
</a-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import AnnComGroTopPForm from './UpfileGroupList.vue'
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '绑定作品组';
visible.value = true;
/* nextTick(() => {
registerForm.value.add();
});*/
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
registerForm.value.searchReset();
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style>
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>

@ -0,0 +1,75 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/upfilegroup/upfileGroup/bdzpzlist',
save='/upfilegroup/upfileGroup/bdzpzlistadd',
edit='/upfilegroup/upfileGroup/edit',
deleteOne = '/upfilegroup/upfileGroup/delete',
deleteBatch = '/upfilegroup/upfileGroup/deleteBatch',
importExcel = '/upfilegroup/upfileGroup/importExcel',
exportXls = '/upfilegroup/upfileGroup/exportXls',
queryCompId = '/annualcompgroup/annualCompGroup/queryCompId',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
*
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
* @param handleSuccess
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.get({ url: url, params }, { isTransformResponse: false });
}
export const queryCompId = (params) => defHttp.get({ url: Api.queryCompId, params }, { successMessageMode: 'none' });

@ -0,0 +1,58 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '年度',
align: "center",
dataIndex: 'annid_dictText'
},
{
title: '年度比赛',
align: "center",
dataIndex: 'annalComp_dictText'
},
{
title: '年度比赛项目',
align: "center",
dataIndex: 'annComP_dictText'
},
{
title: '作品组名称',
align: "center",
dataIndex: 'name'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: "作品组名称",
field: 'name',
component: 'Input',
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '作品组名称',
field: 'name',
component: 'Input',
dynamicRules: ({model,schema}) => {
return [
{ required: true, message: '请输入作品组名称!'},
];
},
},
// TODO 主键隐藏字段,目前写死为ID
{
label: '',
field: 'id',
component: 'Input',
show: false,
},
];

@ -0,0 +1,279 @@
<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="name">
<a-input placeholder="请输入作品组名称" v-model:value="queryParam.name"></a-input>
</a-form-item>
</a-col>
<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"></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>
<!--省市区字段回显插槽-->
</BasicTable>
<!-- 表单区域 -->
</div>
</template>
<script lang="ts" name="upfilegroup-upfileGroup" setup>
import { ref, reactive,defineExpose } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './UpfileGroup.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,saveOrUpdate } from './UpfileGroup.api';
import { useRouter } from 'vue-router';
import {getValueType} from "../../../utils";
import {useMessage} from "../../../hooks/web/useMessage";
import { useRoute } from 'vue-router';
const { createMessage } = useMessage();
const confirmLoading = ref<boolean>(false);
const emit = defineEmits(['register', 'ok']);
const route = useRoute();
const router = useRouter();
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: list,
columns,
canResize:false,
useSearchForm: false,
showActionColumn:false,
beforeFetch: (params) => {
return Object.assign(params, {xmtmid:route.query.id});
},
},
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);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 绑定作品事件
*/
function zpzbdzp(record) {
let id= record.id;
router.push({ path: '/upfilegroupassociation/UpfileGroupAssociationList', query: {id} })
}
/**
* 批量删除事件
*/
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),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
},{
label: '绑定作品',
popConfirm: {
title: '是否确认绑定作品',
confirm: zpzbdzp.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();
}
/**
* 提交数据
*/
async function submitForm() {
let srk = selectedRowKeys.value.toString();
if(srk==""||srk==null){
createMessage.warning("请选择至少一条进行绑定");
}else{
await saveOrUpdate({ids:selectedRowKeys.value.toString(),xmtmid:route.query.id}, false)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
}
defineExpose({
submitForm,
searchReset,
});
</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