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 01/15] =?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 { List findPhoneSetTime(String phone, String checkCode,Integer types); - boolean saveCheckPhoneCode(CheckVo checkVo); +// boolean saveCheckPhoneCode(CheckVo checkVo); List 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 - AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%')) + AND (u.account LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%')) ORDER BY lastLoginTime DESC,studentId DESC 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 @@ SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM - hr_experimental_report her where hpm.projectId = her.projectId ) as number + tms_project_record her where hpm.projectId = her.projectId ) as number FROM hr_project_management hpm WHERE systemId = #{systemId} AND hpm.isdel = 0 AND hpm.projectPermissions = @@ -380,7 +380,7 @@ SELECT et.id,et.experimental_class_name as experimentalClassName,et.experimental_name as experimentalName,et.project_id as projectId, pm.projectName,pm.projectPermissions,et.creation_time as creationTime,(SELECT count(*) FROM - hr_experimental_report her where et.project_id = her.projectId ) as number + tms_project_record her where et.project_id = her.projectId ) as number FROM tms_experimental_teaching et,hr_project_management pm WHERE user_id = #{userId} AND et.project_id = pm.projectId From f451c7724a7c96701d6eaeb3068fc38d2bc8a95a Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Tue, 2 Mar 2021 14:28:56 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E7=AB=AF=E5=AE=9E=E9=AA=8C=E4=BA=BA=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/dao/ClassTeachingDao.java | 3 ++ .../impl/ClassTeachingServiceImpl.java | 29 +++++++++++++++++-- .../impl/ExperimentalTeachingServiceImpl.java | 10 +++++++ .../resources/mapper/tms/ClassTeachingDao.xml | 10 ++++++- .../mapper/tms/ExperimentalTeachingDao.xml | 3 +- 5 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java b/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java index d0c1029..5cbc435 100644 --- a/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java +++ b/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java @@ -23,4 +23,7 @@ public interface ClassTeachingDao { void updateSurplusTimeLe(ProjectRecordVo recordVo); void updateSurplusTimeGt(ProjectRecordVo recordVo); + + + int updateExperimentalNumber(Integer number, Integer id); } diff --git a/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java index db7039c..fbf1d69 100644 --- a/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java @@ -2,24 +2,32 @@ package com.msdw.tms.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.msdw.tms.common.utils.Constant; import com.msdw.tms.common.utils.PageUtils; import com.msdw.tms.dao.ClassTeachingDao; +import com.msdw.tms.dao.ExperimentalTeachingDao; import com.msdw.tms.entity.BroadcastEntity; import com.msdw.tms.entity.ExperimentalTeachingEntity; import com.msdw.tms.entity.ProjectRecordEntity; +import com.msdw.tms.entity.vo.ExperimentalTeachingVO; import com.msdw.tms.entity.vo.ProjectRecordVo; import com.msdw.tms.service.ClassTeachingService; import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -public class ClassTeachingServiceImpl implements ClassTeachingService { +public class ClassTeachingServiceImpl extends ServiceImpl implements ClassTeachingService { @Autowired private ClassTeachingDao classMapper; + + @Autowired + private ClassTeachingDao classTeachingDao; + @Override public ExperimentalTeachingEntity queryInvitationcode(ExperimentalTeachingEntity experimentEntity) { ExperimentalTeachingEntity ex = classMapper.queryInvitationCode(experimentEntity); @@ -44,8 +52,23 @@ public class ClassTeachingServiceImpl implements ClassTeachingService { this.classMapper.updateSurplusTimeUp(recordVo);//倒计时：设定距离实验开始的剩余时间 this.classMapper.updateSurplusTimeLe(recordVo); this.classMapper.updateSurplusTimeGt(recordVo); - IPage schoolRecord = this.classMapper.getByClassRecord(page1, recordVo); - PageUtils pageUtils = new PageUtils(schoolRecord); +// IPage schoolRecord = this.classMapper.getByClassRecord(page1, recordVo); +// PageUtils pageUtils = new PageUtils(schoolRecord); + ExperimentalTeachingVO vo = new ExperimentalTeachingVO(); + BeanUtils.copyProperties(recordVo,vo); + ExperimentalTeachingDao userDao = this.getBaseMapper(); + IPage list = userDao.queryExperimentalTeaching(page1, vo); + for (int i = 0; i < list.getRecords().size(); i++) { + Integer number = list.getRecords().get(i).getExperimentalNumber(); + Integer id = list.getRecords().get(i).getId(); + //读取另一个表，将数据更新进 tms_experimental_teaching + int isTure = classTeachingDao.updateExperimentalNumber(number,id); + if(isTure < 0){ + return null; + } + } + + PageUtils pageUtils = new PageUtils(list); return pageUtils; } diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java index 1265737..0e6843f 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java @@ -36,6 +36,16 @@ public class ExperimentalTeachingServiceImpl extends ServiceImpl page1 = new Page<>(page, size); ExperimentalTeachingDao userDao = this.getBaseMapper(); IPage list = userDao.queryExperimentalTeaching(page1, vo); + for (int i = 0; i < list.getRecords().size(); i++) { + Integer number = list.getRecords().get(i).getExperimentalNumber(); + Integer id = list.getRecords().get(i).getId(); + //读取另一个表，将数据更新进 tms_experimental_teaching + int isTure = classTeachingDao.updateExperimentalNumber(number,id); + if(isTure < 0){ + return null; + } + } + PageUtils pageUtils = new PageUtils(list); return pageUtils; } diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml index 17756c1..3265d03 100644 --- a/src/main/resources/mapper/tms/ClassTeachingDao.xml +++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml @@ -13,7 +13,8 @@ surplus_time, experiment_duration, experimental_name, - experimental_number, + (select count(*) + from tms_project_record WHERE projectId = project_id) as experimental_number, start_time, stop_time, `status`, @@ -109,4 +110,11 @@ + + + UPDATE tms_experimental_teaching + SET experimental_number = #{number} + WHERE + id = #{id} + \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml index 3891647..05c0745 100644 --- a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml +++ b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml @@ -10,7 +10,8 @@ experimental_name, project_id, project_name, - experimental_number, + (select count(*) + from tms_project_record WHERE projectId = project_id) as experimental_number, experiment_duration, type, start_time, From b868abe4c98c84c75b6ae502bded5deedc65c832 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Tue, 2 Mar 2021 17:52:21 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=88=86=E9=92=9F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/service/impl/ProjectRecordServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index 22da5fb..211960c 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -75,11 +75,11 @@ public class ProjectRecordServiceImpl extends ServiceImpl Date: Wed, 3 Mar 2021 10:15:04 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=9D=87=E5=88=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/dao/AchievementManagementDao.java | 5 +- .../AchievementManagementServiceImpl.java | 76 ++++++++++--------- .../mapper/tms/AchievementManagementDao.xml | 4 + 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index 08ff0f9..d0f8240 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -51,6 +51,9 @@ public interface AchievementManagementDao extends BaseMapper queryEvaluationReport(Page tPage, String searchContant, Integer projectId); + //实验成绩管理查看成绩 统计平均分 + String getAVG(Integer projectId); + List queryAchievement(@Param("ids") List ids); List queryFictitiousRecord(Integer systemId, String searchContant, String startingtime, String endtime, Integer month, List projectIds); @@ -71,5 +74,5 @@ public interface AchievementManagementDao extends BaseMapper queryPythonTest(Integer eventId); - void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment); + void updateSignatrue(Integer isSignature, Integer signatureId, Integer reportId, String comment); } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index 97bd1e8..f4cab69 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.util.*; + @Slf4j @Service public class AchievementManagementServiceImpl extends ServiceImpl implements AchievementManagementService { @@ -58,39 +59,39 @@ public class AchievementManagementServiceImpl extends ServiceImpl score = baseMapper.getScore(userScoreVO); - obj.put("score",score); - obj.put("experimentalReportEntity",experimentalReportEntity1); + obj.put("score", score); + obj.put("experimentalReportEntity", experimentalReportEntity1); List tradingJudgmentPointsIds = baseMapper.queryTradingJudgmentPointsId(reportId); Integer size = tradingJudgmentPointsIds.size(); - for (int i = 0;i judgmentPointsRuleList = baseMapper.getUserAnswers(tradingJudgmentPointsId); - map.put("judgmentPointsRuleList"+i,judgmentPointsRuleList); + map.put("judgmentPointsRuleList" + i, judgmentPointsRuleList); } - obj.put("userAnswersList",map); - return R.ok().put("data",obj); + obj.put("userAnswersList", map); + return R.ok().put("data", obj); } @Override public R getTeacher(Integer projectId) { String name = baseMapper.getTeacher(projectId); - return R.ok().put("name",name); + return R.ok().put("name", name); } @Override - public List list(ResultsVo vo,Integer page,Integer size) { + public List list(ResultsVo vo, Integer page, Integer size) { List list = achievementManagementDao.list(vo); return list; } @Override - public List reportList(ResultsVo vo,Integer page,Integer size) { + public List reportList(ResultsVo vo, Integer page, Integer size) { List reportList = achievementManagementDao.reportList(vo); return reportList; } @Override - public List newList(ResultsVo vo,Integer page,Integer size) { + public List newList(ResultsVo vo, Integer page, Integer size) { List newList = achievementManagementDao.newList(vo); return newList; } @@ -152,20 +153,20 @@ public class AchievementManagementServiceImpl extends ServiceImpl data = achievementManagementDao.queryPythonTest(eventId); map.put("data", data); } report.setUserName(userName); - map.put("report",report); - map.put("record",record); - return R.ok().put("data",map); + map.put("report", report); + map.put("record", record); + return R.ok().put("data", map); } @Override @@ -176,12 +177,17 @@ public class AchievementManagementServiceImpl extends ServiceImpl tPage = new Page<>(page,size); - IPage data = achievementManagementDao.queryEvaluationReport(tPage,searchContant,projectId); + public R queryEvaluationReport(String searchContant, Integer projectId, Integer page, Integer size) { + Page tPage = new Page<>(page, size); + IPage data = achievementManagementDao.queryEvaluationReport(tPage, searchContant, projectId); + + + String avg = achievementManagementDao.getAVG(projectId); + + PageUtils result = new PageUtils(data); - return R.ok().put("data",result); + return R.ok().put("data", result).put("avg", avg); } @Override @@ -190,10 +196,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl list = new ArrayList<>(); String[] split = ids.split(","); - for (int i = 0;i achievement = achievementManagementDao.queryAchievement(list); + List achievement = achievementManagementDao.queryAchievement(list); //2.加载模板流数据 ClassPathResource resource = new ClassPathResource("excel-template/川大成绩管理实验记录导出模板.xlsx"); @@ -205,7 +211,7 @@ public class AchievementManagementServiceImpl extends ServiceImpl fictitious; @@ -213,14 +219,16 @@ public class AchievementManagementServiceImpl extends ServiceImpl vo = new ArrayList<>(); List educationResult = achievementManagementDao.countEducationProjectId();//获取教学实验的主键id List fictitiousResult = achievementManagementDao.countFictitiousProjectId();//获取教学实验的主键id - if (projectPermissions==null){projectPermissions=-9999;} - if (projectPermissions==0){//只查询练习项目 + if (projectPermissions == null) { + projectPermissions = -9999; + } + if (projectPermissions == 0) {//只查询练习项目 fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult); vo = fictitious; - }else if (projectPermissions==1){//只查询考核项目 + } else if (projectPermissions == 1) {//只查询考核项目 education = achievementManagementDao.queryEducationRecord(systemId, searchContant, startingtime, endtime, month, educationResult); vo = education; - }else {//查询练习+考核项目 + } else {//查询练习+考核项目 if (educationResult.size() == 0) { if (fictitiousResult.size() > 0) { fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult); @@ -245,10 +253,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl + + - + SELECT + r.reportId, + re.recordId, + sch.schoolName, + s.workNumber, + u.userName, + re.score, + re.submitTime, + r.eventId + FROM + tms_experimental_report r + INNER JOIN tms_experimental_teaching t ON t.id = r.projectId + INNER JOIN student s ON s.studentId = r.studentId + INNER JOIN school sch ON sch.schoolId = s.schoolId + INNER JOIN hr_user_info u ON u.userId = s.userId + INNER JOIN tms_project_record re ON re.projectId = t.project_id + WHERE + t.id = r.projectId + and r.eventId = re.recordId + AND r.projectId = #{projectId} + AND r.isdel = 0 + AND t.is_del = 0 + AND u.isdel = 0 + + AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%') + OR u.userName LIKE CONCAT('%',#{searchContant},'%') ) + + GROUP BY r.reportId DESC - From 082afc11bd23f3bc7f1ce573308e601e81d80d46 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Wed, 3 Mar 2021 16:06:40 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=A0=E9=99=A4=EF=BC=8C=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=95=B0=E9=87=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msdw/tms/api/AchievementManagementApi.java | 7 ++++++- .../AchievementManagementController.java | 17 +++++++++++++++-- .../msdw/tms/dao/AchievementManagementDao.java | 6 +++++- .../service/AchievementManagementService.java | 5 ++++- .../impl/AchievementManagementServiceImpl.java | 14 ++++++++++++-- .../mapper/tms/AchievementManagementDao.xml | 17 +++++++++++++---- 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java index ac17681..8d9fff4 100644 --- a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java +++ b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java @@ -54,7 +54,7 @@ public interface AchievementManagementApi { // R updateScore(@ApiParam(value = "recordid和score") ProjectRecordEntity entity); @ApiOperation(value = "删除实验报告",notes = "根据实验记录主键reportId和实验报告主键recordId删除实验报告") - R deleteReport(@ApiParam(value = "实验记录主键",required = true) Integer reportId); + R deleteReport(@ApiParam(value = "实验记录主键",required = true) Integer reportId,@ApiParam(value = "实验报告主键",required = true) @RequestParam Integer recordId); @ApiOperation(value = "班级实验报告列表查询",notes = "班级实验报告列表查询") R queryEvaluationReport(@ApiParam(value = "搜索内容（学校名称/学生姓名）",required = false) String searchContant, @@ -78,4 +78,9 @@ public interface AchievementManagementApi { @ApiOperation(value = "发布成绩",notes = "发布成绩--修改教师签名") R updateSignatrue(@ApiParam(value = "实验报告主键reportId + 是否使用教师签名isSignature + 教师签名id signatureId + 教师评语comment") ExperimentalReportEntity entity); + + @ApiOperation(value = "成绩管理删除项目",notes = "将项目管理表isdel置1") + R deleteReportByProjectId(@ApiParam(value = "项目id",required = true) Integer projectId); + + } diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 066e934..932bf2f 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -193,8 +194,8 @@ public class AchievementManagementController implements AchievementManagementApi */ @Override @PostMapping("/deleteReport") - public R deleteReport(@RequestParam Integer reportId){ - R result = service.deleteReport(reportId); + public R deleteReport(@RequestParam Integer reportId,@RequestParam Integer recordId){ + R result = service.deleteReport(reportId,recordId); return result; } @@ -263,4 +264,16 @@ public class AchievementManagementController implements AchievementManagementApi service.updateSignatrue(entity); return R.ok(); } + + + /** + * 删除成绩管理中的项目 + * @param projectId + * @return + */ + @Override + @PostMapping("/deleteReportById") + public R deleteReportByProjectId(@RequestParam Integer projectId) { + return service.deleteReportByProjectId(projectId); + } } diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index 08ff0f9..83b5ab9 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -16,6 +16,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.poi.ss.formula.functions.T; +import java.util.ArrayList; import java.util.List; @Mapper @@ -47,7 +48,7 @@ public interface AchievementManagementDao extends BaseMapper queryEvaluationReport(Page tPage, String searchContant, Integer projectId); @@ -72,4 +73,7 @@ public interface AchievementManagementDao extends BaseMapper queryPythonTest(Integer eventId); void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment); + + + void deleteReportById(Integer projectId); } diff --git a/src/main/java/com/msdw/tms/service/AchievementManagementService.java b/src/main/java/com/msdw/tms/service/AchievementManagementService.java index 761809e..ebeb83d 100644 --- a/src/main/java/com/msdw/tms/service/AchievementManagementService.java +++ b/src/main/java/com/msdw/tms/service/AchievementManagementService.java @@ -9,6 +9,7 @@ import com.msdw.tms.entity.ResultsEntity; import com.msdw.tms.entity.vo.ResultsVo; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; public interface AchievementManagementService extends IService { @@ -30,7 +31,7 @@ public interface AchievementManagementService extends IService UPDATE tms_project_record tpr,hr_experimental_report tcr SET tpr.isdel = 1, tcr.isdel = 1 - WHERE tpr.recordId = tcr.eventId AND tcr.reportId = #{reportId} + WHERE tpr.recordId = #{recordId} AND tcr.reportId = #{reportId} UPDATE tms_experimental_report @@ -359,8 +359,9 @@ + + + + UPDATE hr_project_management + SET hr_project_management.isdel = 1 + WHERE hr_project_management.projectId = #{projectId} + + \ No newline at end of file From 17adf2bfea5914e889e9fd9d91ad93d5d2b322c4 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Wed, 3 Mar 2021 16:31:26 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81..?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/msdw/tms/dao/AchievementManagementDao.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index 08ff0f9..d8120c3 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -47,7 +47,7 @@ public interface AchievementManagementDao extends BaseMapper queryEvaluationReport(Page tPage, String searchContant, Integer projectId); @@ -72,4 +72,6 @@ public interface AchievementManagementDao extends BaseMapper queryPythonTest(Integer eventId); void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment); + + void deleteReportById(Integer projectId); } From 4c1bd6d6f765f3aafaf3f6f7250fd6d6947f259c Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Wed, 3 Mar 2021 17:56:15 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86:?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=BB=BF=E7=9C=9F=E5=AE=9E=E9=AA=8C=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/api/AchievementManagementApi.java | 2 ++ .../controller/AchievementManagementController.java | 11 +++++++++++ .../com/msdw/tms/dao/AchievementManagementDao.java | 3 +++ .../tms/service/AchievementManagementService.java | 3 +++ .../impl/AchievementManagementServiceImpl.java | 7 +++++++ .../resources/mapper/tms/AchievementManagementDao.xml | 9 +++++++++ 6 files changed, 35 insertions(+) diff --git a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java index 8d9fff4..3a43f0e 100644 --- a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java +++ b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java @@ -83,4 +83,6 @@ public interface AchievementManagementApi { R deleteReportByProjectId(@ApiParam(value = "项目id",required = true) Integer projectId); + @ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理") + R getImitationAchievement(@ApiParam(value = "projectId", required = false) Integer projectId); } diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 932bf2f..1d4e48f 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -3,6 +3,7 @@ package com.msdw.tms.controller; import com.msdw.tms.api.AchievementManagementApi; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.*; +import com.msdw.tms.entity.vo.AchievementManagementVO; import com.msdw.tms.entity.vo.ResultsVo; import com.msdw.tms.service.AchievementManagementService; import com.msdw.tms.service.ProjectRecordService; @@ -276,4 +277,14 @@ public class AchievementManagementController implements AchievementManagementApi public R deleteReportByProjectId(@RequestParam Integer projectId) { return service.deleteReportByProjectId(projectId); } + + /** + * 成绩管理:虚拟仿真实验成绩管理 + */ + @Override + @GetMapping("/getImitationAchievement") + public R getImitationAchievement(@RequestParam(required = true) Integer projectId) { + List result = service.getImitationAchievement(projectId); + return R.ok().put("data", result); + } } diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index d8120c3..959ce8a 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -74,4 +74,7 @@ public interface AchievementManagementDao extends BaseMapper getImitationAchievement(Integer projectId); } diff --git a/src/main/java/com/msdw/tms/service/AchievementManagementService.java b/src/main/java/com/msdw/tms/service/AchievementManagementService.java index ebeb83d..2aad068 100644 --- a/src/main/java/com/msdw/tms/service/AchievementManagementService.java +++ b/src/main/java/com/msdw/tms/service/AchievementManagementService.java @@ -6,6 +6,7 @@ import com.msdw.tms.entity.ExperimentalReportEntity; import com.msdw.tms.entity.ExperimentalTeachingEntity; import com.msdw.tms.entity.ReportEntity; import com.msdw.tms.entity.ResultsEntity; +import com.msdw.tms.entity.vo.AchievementManagementVO; import com.msdw.tms.entity.vo.ResultsVo; import javax.servlet.http.HttpServletResponse; @@ -44,4 +45,6 @@ public interface AchievementManagementService extends IService getImitationAchievement(Integer projectId); } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index 9c0a6a9..5b51925 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -292,4 +292,11 @@ public class AchievementManagementServiceImpl extends ServiceImpl getImitationAchievement(Integer projectId) { + List list = achievementManagementDao.getImitationAchievement(projectId); + + return list; + } + } diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 44aeaa4..7a50e76 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -482,4 +482,13 @@ WHERE hr_project_management.projectId = #{projectId} + + \ No newline at end of file From 0710ea54a6f6b463aab0a95c9147cddd00e36918 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Thu, 4 Mar 2021 10:37:05 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vo/AchievementManagementVO.java | 8 +++--- .../mapper/tms/AchievementManagementDao.xml | 27 ++++++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java b/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java index 91bc8bd..5c87f50 100644 --- a/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java @@ -32,7 +32,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity { //提交时间 private String submitTime; -//=========================================================== 返回参数 + //=========================================================== 返回参数 //项目名称 private String projectName; @@ -46,7 +46,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity { private String creationTime; //类型（1虚拟仿真，2教学实验） - private Integer type; + private Integer type; // private Integer projectPermissions; //创建时间 @@ -55,6 +55,8 @@ public class AchievementManagementVO extends ExperimentalReportEntity { //实验记录id（tms_experimental_report主键） private Integer recordId; + private Integer reportId; + //老师签名 存放路径 private String signatureUrl; //签名名称 @@ -72,7 +74,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity { //平台id private Integer systemId; -//=========================================================== python实验数据 + //=========================================================== python实验数据 //判分点id private Integer codeId; //判分点-得分 diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 7a50e76..b629038 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -84,7 +84,8 @@ UPDATE tms_project_record tpr,hr_experimental_report tcr SET tpr.isdel = 1, tcr.isdel = 1 - WHERE tpr.recordId = #{recordId} AND tcr.reportId = #{reportId} + WHERE tpr.recordId = #{recordId} + AND tcr.reportId = #{reportId} UPDATE tms_experimental_report @@ -483,12 +484,24 @@ \ No newline at end of file From d85a6a57890eaa207c7d30deccfaecb1bd8d72f3 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Thu, 4 Mar 2021 11:16:21 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=95=99=E5=B8=88=E7=AB=AF=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20=E5=AD=A6=E7=94=9F=E7=AB=AF=E6=9B=B4=E6=94=B9=E5=AE=9E?= =?UTF-8?q?=E9=AA=8C=E8=AE=B0=E5=BD=95=E4=B8=8D=E5=88=A4=E6=96=ADisdel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/api/AchievementManagementApi.java | 4 +++ .../AchievementManagementController.java | 10 +++++++ .../tms/dao/AchievementManagementDao.java | 2 ++ .../service/AchievementManagementService.java | 2 ++ .../AchievementManagementServiceImpl.java | 5 ++++ .../mapper/tms/AchievementManagementDao.xml | 26 ++++++++++++++++--- .../resources/mapper/tms/ProjectRecordDao.xml | 6 +++-- 7 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java index 3a43f0e..92d05d4 100644 --- a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java +++ b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java @@ -85,4 +85,8 @@ public interface AchievementManagementApi { @ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理") R getImitationAchievement(@ApiParam(value = "projectId", required = false) Integer projectId); + + @ApiOperation(value = "成绩管理:实验教学成绩管理", notes = "成绩管理:实验教学成绩管理") + R getTeachAchievement(@RequestParam(required = true) Integer id); + } diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 1d4e48f..05a12ef 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -287,4 +287,14 @@ public class AchievementManagementController implements AchievementManagementApi List result = service.getImitationAchievement(projectId); return R.ok().put("data", result); } + + /** + * 成绩管理:实验教学成绩管理 + */ + @Override + @GetMapping("/getTeachAchievement") + public R getTeachAchievement(@RequestParam(required = true) Integer id) { + List result = service.getTeachAchievement(id); + return R.ok().put("data", result); + } } diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index 959ce8a..27286ba 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -77,4 +77,6 @@ public interface AchievementManagementDao extends BaseMapper getImitationAchievement(Integer projectId); + + List getTeachAchievement(Integer id); } diff --git a/src/main/java/com/msdw/tms/service/AchievementManagementService.java b/src/main/java/com/msdw/tms/service/AchievementManagementService.java index 2aad068..b3a8ea7 100644 --- a/src/main/java/com/msdw/tms/service/AchievementManagementService.java +++ b/src/main/java/com/msdw/tms/service/AchievementManagementService.java @@ -47,4 +47,6 @@ public interface AchievementManagementService extends IService getImitationAchievement(Integer projectId); + + List getTeachAchievement(Integer id); } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index 5b51925..a51cf8c 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -299,4 +299,9 @@ public class AchievementManagementServiceImpl extends ServiceImpl getTeachAchievement(Integer id) { + return achievementManagementDao.getTeachAchievement(id); + } + } diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index b629038..669e2a1 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -82,10 +82,9 @@ - UPDATE tms_project_record tpr,hr_experimental_report tcr - SET tpr.isdel = 1, tcr.isdel = 1 - WHERE tpr.recordId = #{recordId} - AND tcr.reportId = #{reportId} + UPDATE tms_project_record tpr,tms_experimental_report ter + SET tpr.isdel = 1, ter.isdel = 1 + WHERE tpr.recordId = #{recordId} AND ter.reportId = #{reportId} UPDATE tms_experimental_report @@ -504,4 +503,23 @@ AND re.isdel = 0; + + \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index 07900c6..b45954e 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -58,7 +58,8 @@ INNER JOIN hr_project_management t ON t.projectId = c.projectId INNER JOIN tms_project_record r ON r.recordId = c.recordId WHERE c.userId = #{userId} - and r.isdel = 0 +-- 教师端逻辑删除，学生端不做判断 +-- and r.isdel = 0 and projectPermissions = #{projectPermissions} and t.systemId = #{systemId} GROUP BY c.recordId desc @@ -82,7 +83,8 @@ LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id WHERE tpr.userId = #{pro.userid} - AND tpr.isdel = #{pro.isdel} +-- 教师端逻辑删除，学生端不做判断(下面这行删掉报错，用>=来表示不管0，1都让通过) + AND tpr.isdel >= #{pro.isdel} AND tp.projectPermissions !=0 AND ter.eventId = tpr.recordId From 72ddb4a59bd87dd1dfb9b76db9c9d7a886981896 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Thu, 4 Mar 2021 11:45:03 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=92=8C=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/controller/ClassTeachingController.java | 13 ++++++++++--- .../service/impl/ClassTeachingServiceImpl.java | 16 +++++++++++++++- .../mapper/tms/ExperimentalTeachingDao.xml | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java index d6fe70b..9117b41 100644 --- a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java +++ b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java @@ -54,9 +54,16 @@ public class ClassTeachingController implements ClassTeachingApi { if (!StringUtils.isEmpty(condition)) { recordVo.setCondition(condition); } - if (!StringUtils.isEmpty(month)) { + // 设置固定时间(当自定义时间为空时) + if (!StringUtils.isEmpty(month) && StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) { recordVo.setMonth(month); - } else { + } + // 设置自定义时间 + if (!StringUtils.isEmpty(startTime) || !StringUtils.isEmpty(endTime)) { + recordVo.setStartTime(startTime); + recordVo.setEndTime(endTime); + } + /*else { recordVo.setMonth(null); if (!StringUtils.isEmpty(startTime)) { recordVo.setStartTime(startTime); @@ -64,7 +71,7 @@ public class ClassTeachingController implements ClassTeachingApi { if (!StringUtils.isEmpty(endTime)) { recordVo.setEndTime(endTime); } - } + }*/ recordVo.setSchoolId(schoolId); PageUtils page1 = classTeachingService.queryClassRecord(page, size, recordVo); return R.ok().put("page", page1); diff --git a/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java index fbf1d69..096dc12 100644 --- a/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java @@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.concurrent.locks.Lock; + @Service public class ClassTeachingServiceImpl extends ServiceImpl implements ClassTeachingService { @@ -55,7 +57,19 @@ public class ClassTeachingServiceImpl extends ServiceImpl schoolRecord = this.classMapper.getByClassRecord(page1, recordVo); // PageUtils pageUtils = new PageUtils(schoolRecord); ExperimentalTeachingVO vo = new ExperimentalTeachingVO(); - BeanUtils.copyProperties(recordVo,vo); + // 状态 + vo.setStatus(recordVo.getStatus()); + // 月份 + vo.setMonth(recordVo.getMonth()); + // 学校 + vo.setSchoolId(recordVo.getSchoolId()); + // 开始时间 + vo.setStartTime(recordVo.getStartTime()); + // 结束时间 + vo.setStopTime(recordVo.getEndTime()); + // 查询条件 + vo.setSearchContent(recordVo.getCondition()); + // BeanUtils.copyProperties(recordVo,vo); ExperimentalTeachingDao userDao = this.getBaseMapper(); IPage list = userDao.queryExperimentalTeaching(page1, vo); for (int i = 0; i < list.getRecords().size(); i++) { diff --git a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml index 05c0745..84d123d 100644 --- a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml +++ b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml @@ -39,7 +39,7 @@ AND creation_time between #{exp.startTime} and #{exp.stopTime} - AND (project_name like concat('%',#{exp.searchContent},'%') or experimental_class_name like concat('%',#{exp.searchContent},'%') ) + AND (experimental_name like concat('%',#{exp.searchContent},'%') or experimental_class_name like concat('%',#{exp.searchContent},'%') ) AND DATE_SUB(CURDATE(), INTERVAL #{exp.month} month ) <= date(creation_time) From e62fb12487183ffcc910d12484b9fc78c9b9b69b Mon Sep 17 00:00:00 2001 From: "zhiyong.ning" <354350178@qq.com> Date: Thu, 4 Mar 2021 11:48:49 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/StudentDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/mapper/tms/StudentDao.xml b/src/main/resources/mapper/tms/StudentDao.xml index 349554a..a91bcac 100644 --- a/src/main/resources/mapper/tms/StudentDao.xml +++ b/src/main/resources/mapper/tms/StudentDao.xml @@ -44,8 +44,7 @@ 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},'%')) - ORDER BY - lastLoginTime DESC,studentId DESC + ORDER BY studentId DESC