diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java
index a7dba00..0c61f6d 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java
@@ -115,5 +115,7 @@ public class LwKhcl implements Serializable {
private String inBynf;
@TableField(exist = false)
private String inSsyxmc;
+ @TableField(exist = false)
+ private String bylwCjPar;
}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml
index 2a12ae6..18dd028 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml
@@ -186,6 +186,22 @@
and a.ktbg is null
+
+
+ and a.bylw_cj >= 90
+
+
+ and a.bylw_cj >= 80 and a.bylw_cj < 90
+
+
+ and a.bylw_cj >= 70 and a.bylw_cj < 80
+
+
+ and a.bylw_cj >= 60 and a.bylw_cj < 70
+
+
+ and a.bylw_cj < 60
+
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java
index f0b1e08..1f0cde9 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java
@@ -77,6 +77,7 @@ public class LwKhclXzController extends JeecgController page = new Page(pageNo, pageSize);
IPage pageList = lwKhclXzService.page(page, queryWrapper);
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java
index 8228d41..214a1cd 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java
@@ -138,4 +138,6 @@ public class LwKhclXz implements Serializable {
private String downLoadPath;
@TableField(exist = false)
private String downName;
+ @TableField(exist = false)
+ private java.lang.String bylwCjPar;
}
diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.data.ts b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.data.ts
index 94b7250..4ac1a86 100644
--- a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.data.ts
+++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.data.ts
@@ -118,24 +118,28 @@ export const columns2: BasicColumn[] = [
align: "center",
dataIndex: 'ssyxmc',
ellipsis: true,
+ width: 140
},
{
title: '校内专业',
align: "center",
dataIndex: 'ssxnzymc',
ellipsis: true,
+ width: 140
},
{
title: '学生学号',
align: "center",
dataIndex: 'xsxh',
ellipsis: true,
+ width: 120
},
{
title: '学生姓名',
align: "center",
dataIndex: 'xsxm',
ellipsis: true,
+ width: 120
},
{
title: '论文题目',
@@ -144,16 +148,27 @@ export const columns2: BasicColumn[] = [
ellipsis: true,
},
{
- title: '指导教师姓名',
+ title: '指导教师姓名[职称]',
align: "center",
dataIndex: 'zdjsxm',
ellipsis: true,
+ width: 170,
+ customRender: ({ record }) => {
+ let text = record.zdjsxm;
+ if(record.zdjszc){
+ text = text +"["+record.zdjszc+"]";
+ }else{
+ text = text +"[]";
+ }
+ return text;
+ },
},
{
title: '毕业年份',
align: "center",
dataIndex: 'bynf',
ellipsis: true,
+ width: 100
},
// {
// title: '班级',
@@ -172,6 +187,22 @@ export const columns2: BasicColumn[] = [
align: "center",
dataIndex: 'bylwCj',
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: '操作',
@@ -187,24 +218,28 @@ export const columns3: BasicColumn[] = [
align: "center",
dataIndex: 'ssyxmc',
ellipsis: true,
+ width: 140
},
{
title: '校内专业',
align: "center",
dataIndex: 'ssxnzymc',
ellipsis: true,
+ width: 140
},
{
title: '学生学号',
align: "center",
dataIndex: 'xsxh',
ellipsis: true,
+ width: 120
},
{
title: '学生姓名',
align: "center",
dataIndex: 'xsxm',
ellipsis: true,
+ width: 120
},
{
title: '论文题目',
@@ -213,41 +248,50 @@ export const columns3: BasicColumn[] = [
ellipsis: true,
},
{
- title: '指导教师姓名',
+ title: '指导教师姓名[职称]',
align: "center",
dataIndex: 'zdjsxm',
ellipsis: true,
+ width: 170,
+ customRender: ({ record }) => {
+ let text = record.zdjsxm;
+ if(record.zdjszc){
+ text = text +"["+record.zdjszc+"]";
+ }else{
+ text = text +"[]";
+ }
+ return text;
+ },
},
{
title: '毕业年份',
align: "center",
dataIndex: 'bynf',
ellipsis: true,
+ width: 100
},
- // {
- // title: '班级',
- // align: "center",
- // dataIndex: 'bj',
- // ellipsis: true,
- // },
- // {
- // title: '论文类别',
- // align: "center",
- // dataIndex: 'bylwLb',
- // ellipsis: true,
- // },
{
title: '论文成绩',
align: "center",
dataIndex: 'bylwCj',
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 = {
diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue
index 3e92045..0dabd15 100644
--- a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue
+++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue
@@ -73,12 +73,13 @@
论文成绩
-
+
全部
- 优
- 良
- 中
- 差
+ 优秀
+ 良好
+ 中等
+ 及格
+ 不及格
@@ -304,12 +305,13 @@
论文成绩
-
+
全部
- 优
- 良
- 中
- 差
+ 优秀
+ 良好
+ 中等
+ 及格
+ 不及格
diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue
index 9121cd9..1bba02d 100644
--- a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue
+++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue
@@ -73,12 +73,13 @@
论文成绩
-
+
全部
- 优
- 良
- 中
- 差
+ 优秀
+ 良好
+ 中等
+ 及格
+ 不及格
@@ -299,12 +300,13 @@
论文成绩
-
+
全部
- 优
- 良
- 中
- 差
+ 优秀
+ 良好
+ 中等
+ 及格
+ 不及格