登录返回性别，校园样式

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolStypeService.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -110,6 +111,23 @@ public class SchoolStypeService {
 
     //根据学校id获取列表
     public List <TSchoolStype> listAll2(TSchoolStype stype) {
-        return schoolStypeMapper.findAll2(stype);
+        List<TSchoolStype> lst = schoolStypeMapper.findAll2(stype);
+        List<TSchoolStype> rtnlst = new ArrayList<>();
+        //获取学校样式，如果学校未设置使用default设置的内容
+        Map<String,List<TSchoolStype>> map = lst.stream().collect(Collectors.groupingBy(TSchoolStype :: getSchooltype,Collectors.toList()));
+        for(Map.Entry<String, List<TSchoolStype>> entry : map.entrySet()){
+            List<TSchoolStype> maplist = entry.getValue();
+            if(maplist.size() == 1){
+                rtnlst.add(maplist.get(0));
+            }else if(maplist.size()>1){
+                for(TSchoolStype s : maplist){
+                    if(!s.getSchooldomain().equals("default")){
+                        rtnlst.add(s);
+                        break;
+                    }
+                }
+            }
+        }
+        return rtnlst;
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentController.java

@@ -73,14 +73,6 @@ public class EPaperStudentController {
         return new ResultVo(0, "成功获取学生试卷", list);
     }
 
-    //学生开始考试(web)
-    @PostMapping("/spw")
-    public ResultVo startPaperForWeb(@RequestBody EPaperStudent eps) {
-        N_Utils.validation(new Object[]{eps.getEpsid(), "学生试卷id", 1});
-        EPaperStudentVo psvo = ePaperStudentService.startPaperForWeb(eps);
-        return new ResultVo(0, "成功获取学生试卷", psvo);
-    }
-
     //提交单题
     @PostMapping("/scq")
     public ResultVo saveCommitQuestion(@RequestBody EPaperStudentQuestion sq) {
@@ -106,7 +98,15 @@ public class EPaperStudentController {
         }
     }
 
-    //提交试卷--网页端
+    //学生开始考试(web)
+    @PostMapping("/spw")
+    public ResultVo startPaperForWeb(@RequestBody EPaperStudent eps) {
+        N_Utils.validation(new Object[]{eps.getEpsid(), "学生试卷id", 1});
+        EPaperStudentVo psvo = ePaperStudentService.startPaperForWeb(eps);
+        return new ResultVo(0, "成功获取学生试卷", psvo);
+    }
+
+    //提交试卷(web)
     @PostMapping("/scpw")
     public ResultVo saveCommitPaperWeb(@RequestBody PaperStudentWebVo ps) {
         try {

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -434,7 +434,7 @@ public class EPaperStudentService {
                 q.setAnswertype(1);
 
                 //获取该试题正确答案(根据题号区分)
-                PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getQn().equals(q.getQn())).findFirst().orElse(null);
+                PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEptqid().equals(q.getEptqid())).findFirst().orElse(null);
 
                 setCommitQuestion(q,anvo);
                 if(q.getChecked() == 2){

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/EPaperStudentVo.java

@@ -21,8 +21,12 @@ public class EPaperStudentVo {
 
     private Integer esid;//考试科目id
 
+    private Integer gradeid;//年级
+
     private Integer classid;//班级id
 
+    private String classname;//班级名称
+
     private Integer studentid;//学生id
 
     private String subjectid;//科目id
@@ -43,6 +47,8 @@ public class EPaperStudentVo {
 
     private Double pscore;//试卷总分
 
+    private String hearfile;//听力文件
+
     //试题集合
     private List<EPaperQtype> qtypelist;
 }

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -51,10 +51,10 @@
     <!--考试试卷基本信息-->
     <select id="getExamSubjectByEpsid" resultType="com.xhkjedu.sexam.vo.paperstudent.EPaperStudentVo">
         select ps.epsid,ps.examid,ps.esid,ps.classid,ps.studentid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,
-               e.examname,ps.epid,p.ptype,p.pnum,p.pscore
+               e.examname,e.gradeid,ps.epid,p.ptype,p.pnum,p.pscore,p.hearfile,s.classname
         from e_paper_student ps left join e_subject es on ps.esid=es.esid
-        left join e_base e on ps.examid=e.examid
-        left join e_paper p on ps.epid=p.epid
+        left join e_base e on ps.examid=e.examid left join e_paper p on ps.epid=p.epid
+        left join t_class s on ps.classid=s.classid
         where ps.epsid=#{epsid}
     </select>
     <!--学生试卷题库（android）-->

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 登录 -->
     <select id="getUserByLoginname" resultType="com.xhkjedu.suser.vo.system.UserVo">
-        select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,
+        select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,u.usersex,
         u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime,u.userlock
         ,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate,s.schooldomain
         ,c.cloudcode,c.stuweb
@@ -13,7 +13,7 @@
     </select>
     <!-- 手机号登录 -->
     <select id="getUserByPhone" resultType="com.xhkjedu.suser.vo.system.UserVo">
-        select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,
+        select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,u.usersex,
             u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime,u.userlock
              ,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate,s.schooldomain
              ,c.cloudcode,c.stuweb