Merge remote-tracking branch 'origin/main'

main
王家东 3 months ago
commit c8d81da298
  1. 6
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java
  2. 4
      jeecgboot-vue3-master/src/api/demo/depart.ts
  3. 12
      jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts
  4. 10
      jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue

@ -383,14 +383,14 @@ public class AnnualCompGroupController extends JeecgController<AnnualCompGroup,
//queryWrapperagt.eq("ann_com_gro_topid",xmtmid);
queryWrapperagt.in("annid", annualids);
queryWrapperagt.in("ann_com_p", annualcpids);
List<AnnComGroTopP> listact = annComGroTopPService.list(queryWrapperagt);
String str = "";
annComGroTopPService.remove(queryWrapperagt);
/* String str = "";
for (int i = 0; i < listact.size(); i++) {
str = str + listact.get(i).getBmcode() + ",";
}
if (str != "") {
queryWrapperup.notIn("apply_code", str.split(","));
}
}*/
List<UpfilePersion> listup = upfilePersionService.list(queryWrapperup);
//作品的年度比赛项目必须和组的年度比赛项目相同才可以分配作品
for (int o = 0; o < listup.size(); o++) {

@ -10,6 +10,6 @@ enum Api {
// Get personal center-basic settings
export const pageSchoolApi = () => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_SCHOOL });
export const pageDepartmentApi = (orgCode: string) => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_DEPARTMENT, params: { orgCode } });
export const getZjsybsjs = () => defHttp.get({ url: Api.PAGE_ZJSYBSJS });
export const getXsfxbg = () => defHttp.get({ url: Api.PAGE_XSFXBG });
export const getZjsybsjs = (params = { recreateFlag: false }) => defHttp.get({ url: Api.PAGE_ZJSYBSJS, params });
export const getXsfxbg = (params = { recreateFlag: false }) => defHttp.get({ url: Api.PAGE_XSFXBG, params });

@ -17,8 +17,16 @@ enum Api {
}
export const zdfpzp = () => {
let url = Api.zdfpzp;
return defHttp.get({ url: url}, { isTransformResponse: false });
createConfirm({
iconType: 'warning',
title: '确认自动分配作品',
content: '会清空已分配作品,重新进行分配',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.get({ url: Api.zdfpzp}, { isTransformResponse: true });
}
});
}
/**

@ -1,5 +1,5 @@
<template>
<div class="expert">
<div class="expert" v-show="loading">
<a-row :gutter="[16, 16]" type="flex" justify="space-between">
<a-col :md="24" :xl="12">
<a-row :gutter="[16, 16]" type="flex" justify="space-between">
@ -9,6 +9,7 @@
<div class="text">
历史参与评分的年度比赛项目数
</div>
<div style="color: rgba(0, 0, 0, 0.45);cursor: pointer;" @click="reset">重新生成报告</div>
<Icon icon="mainHome-time|svg" :size="20" />
</div>
<div class="center">
@ -144,6 +145,13 @@ const data = ref<ob>({
getZjsybsjs().then(res => {
Object.assign(data.value, res)
})
const loading = ref(true)
function reset() {
loading.value = false
getZjsybsjs({ recreateFlag: true }).then(res => {
Object.assign(data.value, res)
}).finally(() => { loading.value = true })
}
</script>
<style lang="less" scoped>

Loading…
Cancel
Save