Merge remote-tracking branch 'origin/wn' into ywx

sapi/src/main/java/com/xhkjedu/sapi/model/system/TUserLog.java

@@ -23,6 +23,9 @@ public class TUserLog extends BaseBean {
     //登录名
     private String loginname;
 
+    //用户类型999超管0学校管理员1教师2学生
+    private Integer usertype;
+
     //登录状态1成功2失败
     private Integer loginstate;
 
@@ -47,6 +50,21 @@ public class TUserLog extends BaseBean {
     //学校id
     private Integer schoolid;
 
+    //登录mac地址
+    private String mac;
+
+    //登录终端品牌（华为、小米、荣耀、vivo、oppo、浏览器名等）
+    private String ultypeband;
+
+    //登录终端型号（华为mate9、小米13、浏览器版本号等）
+    private String ultypemodel;
+
+    //系统版本（android、鸿蒙、荣耀系统、win等）
+    private String systemversion;
+
+    //操作系统位数
+    private String systembit;
+
     @Transient
     //截止时间
     private Integer endtime;

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -1910,6 +1910,19 @@ public class EReportGenerateService {
             }
         }
 
+        Map<String,List<Map>> answermapNew = new LinkedHashMap<>();
+        if(q.getCtype() == 4 || q.getCtype() == 5 || q.getCtype() ==6){
+            for (Map.Entry<String, List<Map>> entry : answermap.entrySet()) {
+                if(!entry.getKey().equals("未作答")){
+                    answermapNew.put(entry.getKey(),entry.getValue());
+                }
+            }
+            //判断题把“未作答”放最后
+            answermapNew.put("未作答",answermap.get("未作答"));
+        }else{
+            answermapNew.putAll(answermap);
+        }
+
         String erroroption = "";//高频错误项
         if (q.getCtype() == 1 || q.getCtype() == 2 || q.getCtype() == 4 || q.getCtype() == 5 || q.getCtype() == 6) {
             String answer = q.getAnswer();//试题正确答案
@@ -1928,7 +1941,7 @@ public class EReportGenerateService {
 
         List<Map> dafblist = new ArrayList<>();//答案分布
         Map<String, Map> dafbmap = new HashMap<>();//答案分布
-        for (Map.Entry<String, List<Map>> entry : answermap.entrySet()) {
+        for (Map.Entry<String, List<Map>> entry : answermapNew.entrySet()) {
             String key = entry.getKey();
             List<Map> students = entry.getValue();
             Map dafb = new HashMap();

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperreport/PaperReportService.java

@@ -891,8 +891,21 @@ public class PaperReportService {
             }
         }
 
+        Map<String,List<Map>> answermapNew = new LinkedHashMap<>();
+        if(ctype == 4 || ctype == 5 || ctype ==6){
+            for (Map.Entry<String, List<Map>> entry : answermap.entrySet()) {
+                if(!entry.getKey().equals("未作答")){
+                    answermapNew.put(entry.getKey(),entry.getValue());
+                }
+            }
+            //判断题把“未作答”放最后
+            answermapNew.put("未作答",answermap.get("未作答"));
+        }else{
+            answermapNew.putAll(answermap);
+        }
+
         Map<String, Map> dafbmap = new LinkedHashMap<>();// 答案分布
-        for (Map.Entry<String, List<Map>> entry : answermap.entrySet()) {
+        for (Map.Entry<String, List<Map>> entry : answermapNew.entrySet()) {
             String key = entry.getKey();
             List<Map> students = entry.getValue();
             Map dafb = new HashMap();
@@ -966,7 +979,7 @@ public class PaperReportService {
                 }
             }
 
-            //把提交学生进行分组
+            //把提交学生按学校进行分组
             Map<Integer,List<PaperRStuVo>> schoolCommitStuList = commitStuList.stream().collect(Collectors.groupingBy(PaperRStuVo :: getSchoolid));
 
             // 根据试卷知识点分析进行生成班级、学校知识点分析

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -193,6 +193,9 @@
         <if test="question.complexity!=null and question.complexity!=0">
             and q.complexity=#{question.complexity}
         </if>
+        <if test="question.year!=null and question.year!=0">
+            and FROM_UNIXTIME(q.createtime,'%Y')=#{question.year}
+        </if>
         and q.qlevel &lt; 3
         </where>
         group by q.questionid order by q.qstate,q.createtime desc
@@ -288,6 +291,9 @@
                 and qc.userid=#{question.createid}
             </if>
         </if>
+        <if test="question.year!=null and question.year!=0">
+            and FROM_UNIXTIME(q.createtime,'%Y')=#{question.year}
+        </if>
         and q.qlevel &lt; 3
         group by q.questionid order by q.createtime desc
     </select>

sstudy/src/main/resources/mapper/resource/ResourceMapper.xml

@@ -68,6 +68,9 @@
                 and rc.userid=#{resource.createid}
             </if>
         </if>
+        <if test="resource.year!=null and resource.year!=0">
+            and FROM_UNIXTIME(r.createtime,'%Y')=#{resource.year}
+        </if>
         group by r.resourceid
         <choose>
             <when test="resource.readcount!=null and resource.readcount!=0">

suser/src/main/java/com/xhkjedu/suser/model/system/TUser.java

@@ -174,4 +174,8 @@ public class TUser extends BaseBean {
     @Transient
     //登录终端型号（华为mate9、小米13等）
     private String ultypemodel;
+
+    @Transient
+    //操作系统位数
+    private String systembit;
 }

suser/src/main/java/com/xhkjedu/suser/model/system/TUserLog.java

@@ -41,18 +41,21 @@ public class TUserLog extends BaseBean {
     //登录终端设备
     private String ultype;
 
-    //登录终端品牌（华为、小米、荣耀、vivo、oppo等）
+    //登录终端品牌（华为、小米、荣耀、vivo、oppo、浏览器名等）
     private String ultypeband;
 
-    //登录终端型号（华为mate9、小米13等）
+    //登录终端型号（华为mate9、小米13、浏览器版本号等）
     private String ultypemodel;
 
     //版本号
     private String versionnum;
 
-    //系统版本（android、鸿蒙、荣耀系统等）
+    //系统版本（android、鸿蒙、荣耀系统、win等）
     private String systemversion;
 
+    //操作系统位数
+    private String systembit;
+
     //备注
     private String logtxt;
 

suser/src/main/java/com/xhkjedu/suser/service/system/UserLogService.java

@@ -54,6 +54,7 @@ public class UserLogService {
         params.put("mac", user.getMac());
         params.put("versioncode", user.getVersionnum());
         params.put("systemversion", user.getSystemversion());
+        params.put("systembit", user.getSystembit());
         params.put("usertype", userLog.getUsertype());
         params.put("device", userLog.getUltype());
         params.put("logip", userLog.getLogip());

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -369,6 +369,7 @@ public class UserService extends JedisUtil {
             result.setObj(userVo);
             //获取到用户信息后保存登录日志
             return getLogResultVo(user,result,"扫码登录",request);
+
         }else{
             result.setCode(1);
             result.setMsg("登录失败");
@@ -433,10 +434,15 @@ public class UserService extends JedisUtil {
     public void saveSyncLoginLog(TUserLog userLog, TUser user,UserVo userVo, HttpServletRequest request) {
         try {
 
-            userLog.setUserid(user.getUserid());
-            userLog.setUsername(user.getUsername());
-            userLog.setSchoolid(user.getSchoolid());
-            Integer usertype = user.getUsertype();
+            userLog.setUserid(userVo.getUserid());
+            userLog.setUsername(userVo.getUsername());
+            userLog.setSchoolid(userVo.getSchoolid());
+            userLog.setLoginname(userVo.getLoginname());
+            userLog.setSystemversion(user.getSystemversion());
+            userLog.setUltypeband(user.getUltypeband());
+            userLog.setUltypemodel(user.getUltypemodel());
+            userLog.setSystembit(user.getSystembit());
+            Integer usertype = userVo.getUsertype();
             userLog.setUsertype(usertype);
             String ultype = user.getUltype();
             if (N_Utils.isNotEmpty(ultype) && ultype.equals("p_web") && usertype != null) {