From c9bc6e1989866c9b1958c3bfd5279e4d9bb16a6f Mon Sep 17 00:00:00 2001
From: "zhiyong.ning" <354350178@qq.com>
Date: Fri, 26 Feb 2021 17:51:39 +0800
Subject: [PATCH] =?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/dao/UserDao.java         |  2 +-
 src/main/resources/mapper/tms/StudentDao.xml        |  2 +-
 src/main/resources/mapper/tms/UserInfoDao.xml       |  4 ++--
 .../msdw/tms/service/AchievementManagementTest.java | 13 +++++--------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/msdw/tms/dao/UserDao.java b/src/main/java/com/msdw/tms/dao/UserDao.java
index 20c28b6..876d757 100644
--- a/src/main/java/com/msdw/tms/dao/UserDao.java
+++ b/src/main/java/com/msdw/tms/dao/UserDao.java
@@ -41,7 +41,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
 
     List<String> findPhoneSetTime(String phone, String checkCode,Integer types);
 
-    boolean saveCheckPhoneCode(CheckVo checkVo);
+//    boolean saveCheckPhoneCode(CheckVo checkVo);
 
     List<Integer> queryPhone(CheckVo checkVo);
 }
diff --git a/src/main/resources/mapper/tms/StudentDao.xml b/src/main/resources/mapper/tms/StudentDao.xml
index 9d14baa..349554a 100644
--- a/src/main/resources/mapper/tms/StudentDao.xml
+++ b/src/main/resources/mapper/tms/StudentDao.xml
@@ -43,7 +43,7 @@
 		AND u.isdel = 0
 		AND l.isdel = 0
 		AND s.isdel = 0
-		<if test="searchContent!=null">AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
+		<if test="searchContent!=null">AND (u.account LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
 		ORDER BY
 		lastLoginTime DESC,studentId DESC
 	</select>
diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml
index fa949fc..5ec1bd1 100644
--- a/src/main/resources/mapper/tms/UserInfoDao.xml
+++ b/src/main/resources/mapper/tms/UserInfoDao.xml
@@ -215,7 +215,7 @@
     </update>
 
     <select id="queryPersonalFileES" parameterType="com.msdw.tms.entity.UserPersonalFileEntity"
-            resultType="hashMap">
+            resultType="com.msdw.tms.entity.vo.UserProsonalEntityVo">
 		SELECT
 			personalFileId,
 			schoolId,
@@ -233,7 +233,7 @@
 			userId = #{userId}
 	</select>
     <select id="queryPersonalInfo" parameterType="com.msdw.tms.entity.UserInfoEntity"
-            resultType="hashMap">
+            resultType="com.msdw.tms.entity.vo.UserProsonalEntityVo">
         SELECT
 	        u.userId,
 	        userName,
diff --git a/src/test/java/com/msdw/tms/service/AchievementManagementTest.java b/src/test/java/com/msdw/tms/service/AchievementManagementTest.java
index 72e8d43..64f23e9 100644
--- a/src/test/java/com/msdw/tms/service/AchievementManagementTest.java
+++ b/src/test/java/com/msdw/tms/service/AchievementManagementTest.java
@@ -2,17 +2,14 @@ package com.msdw.tms.service;
 
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.dao.AchievementManagementDao;
-import com.msdw.tms.entity.ProjectEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
 import com.msdw.tms.entity.request.AchievementImportRequest;
-import com.msdw.tms.entity.vo.AchievementManagementVo;
-import com.msdw.tms.entity.vo.SearchAchievementVo;
+import com.msdw.tms.entity.vo.AchievementManagementVO;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @SpringBootTest
@@ -30,7 +27,7 @@ public class AchievementManagementTest {
     //测试新增实验记录
 //    @Test
 //    public void addReport(){
-//        AchievementManagementVo vo = new AchievementManagementVo();
+//        AchievementManagementVO vo = new AchievementManagementVO();
 //        ProjectRecordEntity entity = new ProjectRecordEntity();
 //        Date date = new Date();
 //        //用户id
@@ -86,7 +83,7 @@ public class AchievementManagementTest {
     public void daleteReport(){
         Integer reportId = 4;
         Integer recordId = 100;
-        AchievementManagementVo vo = new AchievementManagementVo();
+        AchievementManagementVO vo = new AchievementManagementVO();
         ProjectRecordEntity entity = new ProjectRecordEntity();
         entity.setRecordid(recordId);
         vo.setReportId(reportId);
@@ -116,7 +113,7 @@ public class AchievementManagementTest {
         String staingTime = "";
         String endTime = "";
         List<Integer> list = achievementManagementDao.countEducationProjectId();
-        List<AchievementManagementVo> result = achievementManagementDao.queryEducationRecord(systemId, searchContent, staingTime, endTime, month, list);
+        List<AchievementManagementVO> result = achievementManagementDao.queryEducationRecord(systemId, searchContent, staingTime, endTime, month, list);
         System.out.println(result);
     }
     //筛选查询-虚拟实验
@@ -128,7 +125,7 @@ public class AchievementManagementTest {
         String staingTime = "";
         String endTime = "";
         List<Integer> list = achievementManagementDao.countFictitiousProjectId();
-        List<AchievementManagementVo> result = achievementManagementDao.queryFictitiousRecord(systemId, searchContent, staingTime, endTime, month, list);
+        List<AchievementManagementVO> result = achievementManagementDao.queryFictitiousRecord(systemId, searchContent, staingTime, endTime, month, list);
         System.out.println(result);
     }