修改功能
This commit is contained in:
parent
0cf8c573a1
commit
5d4b031b5a
|
@ -115,5 +115,7 @@ public class LwKhcl implements Serializable {
|
||||||
private String inBynf;
|
private String inBynf;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String inSsyxmc;
|
private String inSsyxmc;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String bylwCjPar;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -186,6 +186,22 @@
|
||||||
<if test='lwKhcl.ktbg != null and lwKhcl.ktbg == 0'>
|
<if test='lwKhcl.ktbg != null and lwKhcl.ktbg == 0'>
|
||||||
and a.ktbg is null
|
and a.ktbg is null
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
<if test='lwKhcl.bylwCjPar != null and lwKhcl.bylwCjPar == 1'>
|
||||||
|
and a.bylw_cj >= 90
|
||||||
|
</if>
|
||||||
|
<if test='lwKhcl.bylwCjPar != null and lwKhcl.bylwCjPar == 2'>
|
||||||
|
and a.bylw_cj >= 80 and a.bylw_cj < 90
|
||||||
|
</if>
|
||||||
|
<if test='lwKhcl.bylwCjPar != null and lwKhcl.bylwCjPar == 3'>
|
||||||
|
and a.bylw_cj >= 70 and a.bylw_cj < 80
|
||||||
|
</if>
|
||||||
|
<if test='lwKhcl.bylwCjPar != null and lwKhcl.bylwCjPar == 4'>
|
||||||
|
and a.bylw_cj >= 60 and a.bylw_cj < 70
|
||||||
|
</if>
|
||||||
|
<if test='lwKhcl.bylwCjPar != null and lwKhcl.bylwCjPar == 5'>
|
||||||
|
and a.bylw_cj < 60
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,7 @@ public class LwKhclXzController extends JeecgController<LwKhclXz, ILwKhclXzServi
|
||||||
String ktbg = lwKhclXz.getKtbg();
|
String ktbg = lwKhclXz.getKtbg();
|
||||||
String zqjc = lwKhclXz.getZqjc();
|
String zqjc = lwKhclXz.getZqjc();
|
||||||
String lwzg = lwKhclXz.getLwzg();
|
String lwzg = lwKhclXz.getLwzg();
|
||||||
|
String lwcj = lwKhclXz.getBylwCjPar();
|
||||||
lwKhclXz.setKtbg(null);
|
lwKhclXz.setKtbg(null);
|
||||||
lwKhclXz.setZqjc(null);
|
lwKhclXz.setZqjc(null);
|
||||||
lwKhclXz.setLwzg(null);
|
lwKhclXz.setLwzg(null);
|
||||||
|
@ -110,6 +111,31 @@ public class LwKhclXzController extends JeecgController<LwKhclXz, ILwKhclXzServi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(StringUtils.isNotBlank(lwcj)){
|
||||||
|
try {
|
||||||
|
if(StringUtils.equals(lwcj,"1")){
|
||||||
|
queryWrapper.ge("bylw_cj",90);
|
||||||
|
}else if(StringUtils.equals(lwcj,"2")){
|
||||||
|
queryWrapper.ge("bylw_cj",80);
|
||||||
|
queryWrapper.lt("bylw_cj",90);
|
||||||
|
}else if(StringUtils.equals(lwcj,"3")){
|
||||||
|
queryWrapper.ge("bylw_cj",70);
|
||||||
|
queryWrapper.lt("bylw_cj",80);
|
||||||
|
}else if(StringUtils.equals(lwcj,"4")){
|
||||||
|
queryWrapper.ge("bylw_cj",60);
|
||||||
|
queryWrapper.lt("bylw_cj",70);
|
||||||
|
}else if(StringUtils.equals(lwcj,"5")){
|
||||||
|
queryWrapper.lt("bylw_cj",60);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Page<LwKhclXz> page = new Page<LwKhclXz>(pageNo, pageSize);
|
Page<LwKhclXz> page = new Page<LwKhclXz>(pageNo, pageSize);
|
||||||
IPage<LwKhclXz> pageList = lwKhclXzService.page(page, queryWrapper);
|
IPage<LwKhclXz> pageList = lwKhclXzService.page(page, queryWrapper);
|
||||||
|
|
|
@ -138,4 +138,6 @@ public class LwKhclXz implements Serializable {
|
||||||
private String downLoadPath;
|
private String downLoadPath;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String downName;
|
private String downName;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private java.lang.String bylwCjPar;
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,24 +118,28 @@ export const columns2: BasicColumn[] = [
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'ssyxmc',
|
dataIndex: 'ssyxmc',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 140
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '校内专业',
|
title: '校内专业',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'ssxnzymc',
|
dataIndex: 'ssxnzymc',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 140
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '学生学号',
|
title: '学生学号',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'xsxh',
|
dataIndex: 'xsxh',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '学生姓名',
|
title: '学生姓名',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'xsxm',
|
dataIndex: 'xsxm',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '论文题目',
|
title: '论文题目',
|
||||||
|
@ -144,16 +148,27 @@ export const columns2: BasicColumn[] = [
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '指导教师姓名',
|
title: '指导教师姓名[职称]',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'zdjsxm',
|
dataIndex: 'zdjsxm',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 170,
|
||||||
|
customRender: ({ record }) => {
|
||||||
|
let text = record.zdjsxm;
|
||||||
|
if(record.zdjszc){
|
||||||
|
text = text +"["+record.zdjszc+"]";
|
||||||
|
}else{
|
||||||
|
text = text +"[]";
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '毕业年份',
|
title: '毕业年份',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'bynf',
|
dataIndex: 'bynf',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 100
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// title: '班级',
|
// title: '班级',
|
||||||
|
@ -172,6 +187,22 @@ export const columns2: BasicColumn[] = [
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'bylwCj',
|
dataIndex: 'bylwCj',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 100,
|
||||||
|
customRender: ({ record }) => {
|
||||||
|
let text = record.bylwCj;
|
||||||
|
if(parseInt(text)>=90){
|
||||||
|
text = "优秀";
|
||||||
|
}else if(parseInt(text) < 90 && parseInt(text) >= 80){
|
||||||
|
text = "良好";
|
||||||
|
}else if(parseInt(text) < 80 && parseInt(text) >= 70){
|
||||||
|
text = "中等";
|
||||||
|
}else if(parseInt(text) < 70 && parseInt(text) >= 60){
|
||||||
|
text = "及格";
|
||||||
|
}else if(parseInt(text) < 60){
|
||||||
|
text = "不及格";
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
|
@ -187,24 +218,28 @@ export const columns3: BasicColumn[] = [
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'ssyxmc',
|
dataIndex: 'ssyxmc',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 140
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '校内专业',
|
title: '校内专业',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'ssxnzymc',
|
dataIndex: 'ssxnzymc',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 140
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '学生学号',
|
title: '学生学号',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'xsxh',
|
dataIndex: 'xsxh',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '学生姓名',
|
title: '学生姓名',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'xsxm',
|
dataIndex: 'xsxm',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '论文题目',
|
title: '论文题目',
|
||||||
|
@ -213,41 +248,50 @@ export const columns3: BasicColumn[] = [
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '指导教师姓名',
|
title: '指导教师姓名[职称]',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'zdjsxm',
|
dataIndex: 'zdjsxm',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 170,
|
||||||
|
customRender: ({ record }) => {
|
||||||
|
let text = record.zdjsxm;
|
||||||
|
if(record.zdjszc){
|
||||||
|
text = text +"["+record.zdjszc+"]";
|
||||||
|
}else{
|
||||||
|
text = text +"[]";
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '毕业年份',
|
title: '毕业年份',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'bynf',
|
dataIndex: 'bynf',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 100
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// title: '班级',
|
|
||||||
// align: "center",
|
|
||||||
// dataIndex: 'bj',
|
|
||||||
// ellipsis: true,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// title: '论文类别',
|
|
||||||
// align: "center",
|
|
||||||
// dataIndex: 'bylwLb',
|
|
||||||
// ellipsis: true,
|
|
||||||
// },
|
|
||||||
{
|
{
|
||||||
title: '论文成绩',
|
title: '论文成绩',
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'bylwCj',
|
dataIndex: 'bylwCj',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
width: 100,
|
||||||
|
customRender: ({ record }) => {
|
||||||
|
let text = record.bylwCj;
|
||||||
|
if(parseInt(text)>=90){
|
||||||
|
text = "优秀";
|
||||||
|
}else if(parseInt(text) < 90 && parseInt(text) >= 80){
|
||||||
|
text = "良好";
|
||||||
|
}else if(parseInt(text) < 80 && parseInt(text) >= 70){
|
||||||
|
text = "中等";
|
||||||
|
}else if(parseInt(text) < 70 && parseInt(text) >= 60){
|
||||||
|
text = "及格";
|
||||||
|
}else if(parseInt(text) < 60){
|
||||||
|
text = "不及格";
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// title: '终稿查重相似率',
|
|
||||||
// align: "center",
|
|
||||||
// dataIndex: 'ccjgxsl',
|
|
||||||
// ellipsis: true,
|
|
||||||
// },
|
|
||||||
];
|
];
|
||||||
// 高级查询数据
|
// 高级查询数据
|
||||||
export const superQuerySchema = {
|
export const superQuerySchema = {
|
||||||
|
|
|
@ -73,12 +73,13 @@
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="bylwCj">
|
<a-form-item name="bylwCj">
|
||||||
<template #label><span title="论文成绩">论文成绩</span></template>
|
<template #label><span title="论文成绩">论文成绩</span></template>
|
||||||
<a-select placeholder="请选择论文成绩" v-model:value="queryParam2.bylwCj">
|
<a-select placeholder="请选择论文成绩" v-model:value="queryParam2.bylwCjPar">
|
||||||
<a-select-option value="">全部</a-select-option>
|
<a-select-option value="">全部</a-select-option>
|
||||||
<a-select-option value="优">优</a-select-option>
|
<a-select-option value="1">优秀</a-select-option>
|
||||||
<a-select-option value="良">良</a-select-option>
|
<a-select-option value="2">良好</a-select-option>
|
||||||
<a-select-option value="中">中</a-select-option>
|
<a-select-option value="3">中等</a-select-option>
|
||||||
<a-select-option value="差">差</a-select-option>
|
<a-select-option value="4">及格</a-select-option>
|
||||||
|
<a-select-option value="5">不及格</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
@ -304,12 +305,13 @@
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="bylwCj">
|
<a-form-item name="bylwCj">
|
||||||
<template #label><span title="论文成绩">论文成绩</span></template>
|
<template #label><span title="论文成绩">论文成绩</span></template>
|
||||||
<a-select placeholder="请选择论文成绩" v-model:value="queryParam.bylwCj">
|
<a-select placeholder="请选择论文成绩" v-model:value="queryParam.bylwCjPar">
|
||||||
<a-select-option value="">全部</a-select-option>
|
<a-select-option value="">全部</a-select-option>
|
||||||
<a-select-option value="优">优</a-select-option>
|
<a-select-option value="1">优秀</a-select-option>
|
||||||
<a-select-option value="良">良</a-select-option>
|
<a-select-option value="2">良好</a-select-option>
|
||||||
<a-select-option value="中">中</a-select-option>
|
<a-select-option value="3">中等</a-select-option>
|
||||||
<a-select-option value="差">差</a-select-option>
|
<a-select-option value="4">及格</a-select-option>
|
||||||
|
<a-select-option value="5">不及格</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
|
@ -73,12 +73,13 @@
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="bylwCj">
|
<a-form-item name="bylwCj">
|
||||||
<template #label><span title="论文成绩">论文成绩</span></template>
|
<template #label><span title="论文成绩">论文成绩</span></template>
|
||||||
<a-select placeholder="请选择论文成绩" v-model:value="queryParam2.bylwCj">
|
<a-select placeholder="请选择论文成绩" v-model:value="queryParam2.bylwCjPar">
|
||||||
<a-select-option value="">全部</a-select-option>
|
<a-select-option value="">全部</a-select-option>
|
||||||
<a-select-option value="优">优</a-select-option>
|
<a-select-option value="1">优秀</a-select-option>
|
||||||
<a-select-option value="良">良</a-select-option>
|
<a-select-option value="2">良好</a-select-option>
|
||||||
<a-select-option value="中">中</a-select-option>
|
<a-select-option value="3">中等</a-select-option>
|
||||||
<a-select-option value="差">差</a-select-option>
|
<a-select-option value="4">及格</a-select-option>
|
||||||
|
<a-select-option value="5">不及格</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
@ -299,12 +300,13 @@
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="bylwCj">
|
<a-form-item name="bylwCj">
|
||||||
<template #label><span title="论文成绩">论文成绩</span></template>
|
<template #label><span title="论文成绩">论文成绩</span></template>
|
||||||
<a-select placeholder="请选择论文成绩" v-model:value="queryParam.bylwCj">
|
<a-select placeholder="请选择论文成绩" v-model:value="queryParam.bylwCjPar">
|
||||||
<a-select-option value="">全部</a-select-option>
|
<a-select-option value="">全部</a-select-option>
|
||||||
<a-select-option value="优">优</a-select-option>
|
<a-select-option value="1">优秀</a-select-option>
|
||||||
<a-select-option value="良">良</a-select-option>
|
<a-select-option value="2">良好</a-select-option>
|
||||||
<a-select-option value="中">中</a-select-option>
|
<a-select-option value="3">中等</a-select-option>
|
||||||
<a-select-option value="差">差</a-select-option>
|
<a-select-option value="4">及格</a-select-option>
|
||||||
|
<a-select-option value="5">不及格</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
Loading…
Reference in New Issue