diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index c3533414..1a21da5f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -550,17 +550,19 @@ public class CasesServiceImpl implements ICasesService { @Override public List majorTypes() { List major_type = sysDictionaryDao.findByKey("major_type"); - String hql="select majorId from CasesMajorType group by majorId"; - List listByHql = casesDao.findListByHql(hql); + String hql="select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId"; + List listByHql = casesDao.findListByHql(hql); List dictItems = new ArrayList<>(); for (DictItem d:major_type) { - for (String s:listByHql) { + for (Object[] objs:listByHql) { + String s=(String)objs[0]; if(d.getCode().equals(s)){ + d.setExplanation(objs[1].toString()); dictItems.add(d); } } } - return dictItems; + return dictItems; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseHRBPAuditDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseHRBPAuditDto.java index 4988da00..d94391e0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseHRBPAuditDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseHRBPAuditDto.java @@ -44,6 +44,9 @@ public class CourseHRBPAuditDto{ /**审核人*/ private String auditUser; + + /**实际审核人id*/ + private String auditAid; /** * 是否转发 1表未转发 2表已转发() diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseHRBPAudit.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseHRBPAudit.java index 3a4aed80..69fd9594 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseHRBPAudit.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseHRBPAudit.java @@ -73,6 +73,12 @@ public class CourseHRBPAudit extends IdEntity { @Column(name = "audit_user") private String auditUser; + + /** + * 审核人id + */ + @Column(name = "audit_aid",length=20) + private String auditAid; /** * 是否转发 1表未转发 2表已转发(转发审核中),3教师审核完成，6表公开课审核 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseAuditServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseAuditServiceImpl.java index 120c27f5..8ca30278 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseAuditServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseAuditServiceImpl.java @@ -165,6 +165,7 @@ public class CourseAuditServiceImpl implements ICourseAuditService{ UpdateBuilder.create("status", pass? CourseHRBPAudit.STATUS_PASS:CourseHRBPAudit.STATUS_NOPASS), UpdateBuilder.create("auditRemark", remark), UpdateBuilder.create("auditUser", name), + UpdateBuilder.create("auditAid", aid), UpdateBuilder.create("auditTime", now) ); //更新课程的转审状态，并把转审的信息置为空,这会的状态还未审核通过 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java index 6c974a0f..ca209468 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java @@ -49,6 +49,7 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService { dto.setToAid(hrbp.getToAid()); dto.setToInfo(hrbp.getToInfo()); dto.setAuditUser(hrbp.getAuditUser()); + dto.setAuditAid(hrbp.getAuditAid()); dto.setToName(hrbp.getToName()); dto.setToRemark(hrbp.getToRemark()); dto.setAddTime(hrbp.getAddTime()); @@ -78,6 +79,9 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService { if(StringUtils.isNotBlank(info.getToAid())) { query.addFilter(FieldFilters.eq("a.toAid",info.getToAid())); } + if(StringUtils.isNotBlank(info.getAuditAid())) { + query.addFilter(FieldFilters.eq("a.auditAid",info.getAuditAid())); + } //审核状态 if(info.getStatus()!=null) { if(info.getStatus()==9) { @@ -182,6 +186,10 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService { query.addFilter(FieldFilters.eq("a.aid",info.getAid())); } + if(StringUtils.isNotBlank(info.getAuditAid())) { + query.addFilter(FieldFilters.eq("a.auditAid",info.getAuditAid())); + } + if(userType==1) { //教师审核，只会必须有过转么的 query.addFilter(FieldFilters.gt("a.forward",CourseHRBPAudit.FORWARD_NONE)); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 0c6aefa8..0b9a803b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -882,6 +882,7 @@ public class CourseServiceImpl implements ICourseService { UpdateBuilder.create("status", pass? CourseHRBPAudit.STATUS_PASS:CourseHRBPAudit.STATUS_NOPASS), UpdateBuilder.create("auditRemark", remark), UpdateBuilder.create("auditUser", name), + UpdateBuilder.create("auditAid", aid), UpdateBuilder.create("auditTime", now), UpdateBuilder.create("forward", from) ); @@ -889,6 +890,8 @@ public class CourseServiceImpl implements ICourseService { courseHRBPAuditDao.updateMultiFieldById(auditId, UpdateBuilder.create("status", pass? CourseHRBPAudit.STATUS_PASS:CourseHRBPAudit.STATUS_NOPASS), UpdateBuilder.create("auditRemark", remark), + UpdateBuilder.create("auditUser", name), + UpdateBuilder.create("auditAid", aid), UpdateBuilder.create("auditTime", now) ); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java index 2b852840..f90990fe 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java @@ -132,7 +132,7 @@ public class AloneExamExtendApi extends ApiBaseController { } try { - + //PageList rs=aloneExamService. return success(null); }catch(Exception e) { return error("考试统计错误",e.getMessage(),null); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java index bdfcf39d..0d37f7d5 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java @@ -1,9 +1,12 @@ package com.xboe.module.exam.service; import java.util.List; +import java.util.Map; import com.xboe.common.OrderCondition; import com.xboe.common.PageList; +import com.xboe.module.exam.dto.TestUserDto; +import com.xboe.module.exam.dto.TestUserQuery; import com.xboe.module.exam.entity.AloneExam; import com.xboe.module.exam.entity.AloneExamAnswer; import com.xboe.module.exam.vo.AloneExamQuery; @@ -138,4 +141,20 @@ public interface IAloneExamService { * */ List findAnswer(String aloneId); + /** + * 统计答卷情况 + * @param testId + * @return + * @throws Exception + */ + Map statByTestId(String testId) throws Exception; + + /** + * 查询答卷情况 + * @param params + * @return + * @throws Exception + */ + PageList findTestUserAnswers(TestUserQuery params) throws Exception; + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index 9dac7f3d..1d3cdbcb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -87,41 +87,41 @@ public class PortalConsoleApi extends ApiBaseController{ } } //检查是否是教师,并计算用户的类型,修改于220507 -// Teacher t = teacherService.get(account.getId()); -// int utype=1,ttype=0; -// //本地判断是否是管理员 -// if(user.getUserType()!=null && user.getUserType()==3) { -// utype=3; -// } -// //判断是否是老师 -// if(t!=null && (t.getDeleted()==null || !t.getDeleted())) { -// ttype=2; -// } -// if(utype==3) { -// if(ttype==2) { -// utype=5;//是管理员，又是教师 -// } -// }else { -// if(ttype==2) { -// utype=2; -// } -// } + Teacher t = teacherService.get(account.getId()); + int utype=1,ttype=0; + //本地判断是否是管理员 + if(user.getUserType()!=null && user.getUserType()==3) { + utype=3; + } + //判断是否是老师 + if(t!=null && (t.getDeleted()==null || !t.getDeleted())) { + ttype=2; + } + if(utype==3) { + if(ttype==2) { + utype=5;//是管理员，又是教师 + } + }else { + if(ttype==2) { + utype=2; + } + } //以下是使用的接口数据判断身份 - int utype=1;//仅仅是学员 - if(userData!=null) { - - if(userData.getTeacher()) { - utype=2; - } - if(userData.getAdminType()>0) { - if(utype==2) { - utype=5;//是管理员，又是教师 - }else { - utype=3; - } - } - } +// int utype=1;//仅仅是学员 +// if(userData!=null) { +// +// if(userData.getTeacher()) { +// utype=2; +// } +// if(userData.getAdminType()>0) { +// if(utype==2) { +// utype=5;//是管理员，又是教师 +// }else { +// utype=3; +// } +// } +// } map.put("aid",account.getId()); map.put("sysId",user.getSysId());