From fdf5990086e5e589d09ced712709db1e7f4387b0 Mon Sep 17 00:00:00 2001
From: "zhiyong.ning" <354350178@qq.com>
Date: Thu, 11 Mar 2021 14:20:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/msdw/tms/entity/vo/StudentVo.java | 2 ++
src/main/resources/mapper/tms/StudentDao.xml | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/msdw/tms/entity/vo/StudentVo.java b/src/main/java/com/msdw/tms/entity/vo/StudentVo.java
index 648238d..e1daa44 100644
--- a/src/main/java/com/msdw/tms/entity/vo/StudentVo.java
+++ b/src/main/java/com/msdw/tms/entity/vo/StudentVo.java
@@ -40,6 +40,8 @@ public class StudentVo extends StudentEntity {
private String schoolAppellationName;
//绑定所属院校id
private Integer schoolAppellationId;
+ //学生学号
+ private String workNumber;
//token
private String token;
}
diff --git a/src/main/resources/mapper/tms/StudentDao.xml b/src/main/resources/mapper/tms/StudentDao.xml
index a91bcac..e421705 100644
--- a/src/main/resources/mapper/tms/StudentDao.xml
+++ b/src/main/resources/mapper/tms/StudentDao.xml
@@ -29,8 +29,8 @@
u.disableAccount,
u.lastLoginTime,
s.roleId,
- s.workNumber,
- s.isdel ,
+ s.workNumber as workNumber,
+ s.isdel,
s.studentId
FROM
hr_user_info u,
@@ -43,7 +43,7 @@
AND u.isdel = 0
AND l.isdel = 0
AND s.isdel = 0
- AND (u.account LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))
+ AND (l.schoolName LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%'))
ORDER BY studentId DESC
From 3f4facffba2b6982d46668e33b9f1eafdc0e228f Mon Sep 17 00:00:00 2001
From: "jiakun.lin"
Date: Thu, 11 Mar 2021 16:53:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=99=9A=E4=BB=BF=E5=AE=9E=E9=AA=8C?=
=?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E9=AA=8C=E5=AF=BC=E5=87=BAbug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/mapper/tms/ProjectRecordDao.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml
index f327ea5..8495e51 100644
--- a/src/main/resources/mapper/tms/ProjectRecordDao.xml
+++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml
@@ -107,8 +107,9 @@
FROM tms_project_record tpr
LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id
+ LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
WHERE tpr.userId = #{userid}
- AND tpr.isdel = #{isdel}
+ AND ter.eventId = tpr.recordId
AND tpr.projectId = tet.project_id
AND tp.projectPermissions != 0
ORDER BY
@@ -185,8 +186,10 @@
recordState
FROM tms_project_record tpr
LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+ LEFT JOIN tms_experimental_report re ON re.eventId = tpr.recordId
WHERE tpr.userId = #{userid}
- AND tpr.isdel = #{isdel}
+-- 注释掉报错，>=表示是否删除都导出
+ AND tpr.isdel >= #{isdel}
AND tp.projectPermissions = 0