From 5d15dde821e18906ba7fe0ebf6dc3a5651a808ef Mon Sep 17 00:00:00 2001
From: pd <2776455882@qq.com>
Date: Tue, 21 Jul 2020 14:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E9=AA=8C=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E8=AF=A6=E6=83=85=E6=9C=89=E5=85=B3=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            | 14 +++++++-------
 .../com/yipin/liuwanr/mapper/AssesmentMapper.java  |  3 ++-
 .../liuwanr/mapper/ExperimentalClassMapper.java    |  4 ++--
 .../mapper/TeacherProjectAndCourseMapper.java      |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5e5840..0fbc240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.yipin</groupId>
@@ -149,15 +149,15 @@
 		</dependency>
 		<!--读取excel文件 -->
 		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi</artifactId>
-		    <version>3.17</version>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.17</version>
 		</dependency>
 		<!--导出excel文件 -->
 		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi-ooxml</artifactId>
-		    <version>3.17</version>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.17</version>
 		</dependency>
 		<!-- mybatis分页插件 -->
 		<dependency>
diff --git a/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java b/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
index 40a371a..d122cb6 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
@@ -32,7 +32,8 @@ public interface AssesmentMapper {
 		 * 查询项目权限为考核的项目
 		 * @return
 		 */
-		@Select("select projectId,projectName,projectPermissions,founder,creationTime from hr_project_management where isdel=0 and projectPermissions=1 AND systemId in (SELECT systemId FROM course WHERE courseId=#{courseId})")
+		@Select("select projectId,projectName,projectPermissions,founder,creationTime from hr_project_management " +
+				" where isdel=0 and projectPermissions=1 AND systemId in (SELECT systemId FROM course WHERE courseId=#{courseId})")
 		List<Project_Management> queryGetByAssesmentProject(Integer courseId);
 
 		
diff --git a/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java
index 76c1951..6c02983 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java
@@ -85,11 +85,11 @@ public interface ExperimentalClassMapper {
 	 */
 	@Select({"<script>",
 		"select s.studentId,studentName,studentNumber,gradeName,className from experimental_class_student st,student s,class c,grade g,professional p"
-				+ "where st.studentId=s.studentId and s.classId=c.classId and c.gradeId=g.gradeId and s.professionalId=p.professionalId and st.experimentalClassId=#{experimentalClassId} ",
+				+ " where st.studentId=s.studentId and s.classId=c.classId and c.gradeId=g.gradeId and s.professionalId=p.professionalId and st.experimentalClassId=#{experimentalClassId} ",
 				" <if test='professionalId!=null'>and stu.professionalId = #{professionalId} </if>",
 				" <if test='classId !=null'>and stu.classId = #{classId} </if>",
 				" <if test='studentNameNumber !=null'>and (stu.studentNumber like CONCAT('%',#{studentNameNumber},'%') or stu.studentName like CONCAT('%',#{studentNameNumber},'%'))</if>",
-				"GROUP BY stu.studentId",
+				"GROUP BY st.studentId",
 	"</script> "})
 	List<Student> getExperimentalClassDetails(Student student);
 	
diff --git a/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java b/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java
index 75138eb..ea484aa 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/TeacherProjectAndCourseMapper.java
@@ -31,7 +31,7 @@ public interface TeacherProjectAndCourseMapper {
 	 * @return
 	 */
 	@Select({"<script>",
-	      "select projectId,projectName,isExperiment,isAttendance from  hr_project_management  WHERE isdel=0 and projectPermissions=0 and p.state=1",
+	      "select projectId,projectName,isExperiment,isAttendance from  hr_project_management  WHERE isdel=0 and projectPermissions=0 and state=1",
 	      "<if test='isExperiment!=null'> and isExperiment=0</if>",
 	      "<if test='isAttendance!=null'> and isAttendance=0</if>",
 	      "<foreach collection='systemIds' item='systemId' open='and systemId in(' separator=',' close=')'>" + "#{systemId} " + "</foreach> ",