From d3d59e8e457ab525c67e917a12c73b35196b10a8 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 1 Mar 2021 09:58:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/msdw/tms/entity/UserInfoEntity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/msdw/tms/entity/UserInfoEntity.java b/src/main/java/com/msdw/tms/entity/UserInfoEntity.java index a0f2a63..095478d 100644 --- a/src/main/java/com/msdw/tms/entity/UserInfoEntity.java +++ b/src/main/java/com/msdw/tms/entity/UserInfoEntity.java @@ -17,7 +17,8 @@ public class UserInfoEntity { //用户姓名 private String userName; //用户账号 - @Pattern(regexp = "/^[1-9]([0-9]{1,5})?$/", message = "账号只能为数字！") + //@Pattern(regexp = "/^[1-9]([0-9]{1,5})?$/", message = "账号只能为数字！") + @Pattern(regexp = "^[0-9a-zA-Z]*$",message = "账号只能为数字或字母！") private String account; //用户密码 private String password; From 1753d5e4999b282497c27c2555f559f0af94b48a Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Mon, 1 Mar 2021 14:16:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/service/impl/ProjectRecordServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 8343694..22da5fb 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -75,10 +75,11 @@ public class ProjectRecordServiceImpl extends ServiceImpl Date: Mon, 1 Mar 2021 17:19:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=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 --- src/main/resources/mapper/tms/AchievementManagementDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 8b21be1..098e3c2 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -359,7 +359,7 @@ SELECT id,title,links,isdel FROM tms_broadcast + + + 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 5/6] =?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 6/6] =?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 + +