错题收藏 修改，小程序第一次自动保存头像

nbjk-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -120,7 +120,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
                 UserInfo userInfoGetByOpenId = userService.getStudentByOpenId(openid);
                 if (userInfoGetByUnionId == null ) {
                     UserInfo userInfo = new UserInfo();
-                    userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
+                    userInfo.setHeadImage("https://mmbiz.qpic.cn/sz_mmbiz_jpg/U1q0AYGzob5AbSPdqDs1tbOATPL8gJfbiaaJbCf0a7ibzBAyca1eoDvFgzGQc6GeuG1icBiaqevcFW1k5no8accn0A/640?wx_fmt=jpeg");
                     userInfo.setNickName(RandomNameUtils.generateName());
                     userInfo.setXcxOpenid(openid);
                     userInfo.setUnionId(identification);

nbjk-service/src/main/java/com/miaxis/question/domain/QuestionWrong.java

@@ -1,5 +1,6 @@
 package com.miaxis.question.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
@@ -12,6 +13,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
+
+import java.sql.Timestamp;
+
 /**
  * wrong对象 question_wrong
  *
@@ -21,7 +25,7 @@ import lombok.Data;
 @Data
 @TableName("question_wrong")
 @ApiModel(value = "QuestionWrong", description = "wrong对象 question_wrong")
-public class QuestionWrong extends BaseBusinessEntity{
+public class QuestionWrong {
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
@@ -48,6 +52,14 @@ public class QuestionWrong extends BaseBusinessEntity{
     @ApiModelProperty(value = "考试科目（1、2、3、4）")
     private Integer km;
 
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
+    private Timestamp createTime;
 
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS" )
+    @ApiModelProperty(value = "更新时间" ,hidden = true)
+    private Timestamp updateTime;
 
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionWrongYunDTO.java

@@ -1,6 +1,5 @@
 package com.miaxis.question.dto;
 
-import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

nbjk-service/src/main/java/com/miaxis/question/mapper/QuestionCollectionMapper.java

@@ -22,8 +22,6 @@ public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection>
      */
     List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
 
-    List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
-
     List<QuestionColIdDateVo> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
 
     Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);

nbjk-service/src/main/java/com/miaxis/question/mapper/QuestionWrongMapper.java

@@ -20,9 +20,7 @@ public interface QuestionWrongMapper extends BaseMapper<QuestionWrong> {
      * @param questionWrong wrong
      * @return wrong集合
      */
-    public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
-
-    List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
+    List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
 
     Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
 

nbjk-service/src/main/java/com/miaxis/question/service/IQuestionCollectionService.java

@@ -24,8 +24,6 @@ public interface IQuestionCollectionService extends IService<QuestionCollection>
      */
     List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
 
-    List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
-
     List<QuestionColIdDateVo> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
 
     Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);

nbjk-service/src/main/java/com/miaxis/question/service/IQuestionWrongService.java

@@ -23,9 +23,7 @@ public interface IQuestionWrongService extends IService<QuestionWrong>{
      * @param questionWrong wrong
      * @return wrong集合
      */
-    public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
-
-    List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
+    List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
 
     List<QuestionWrongIdDateVo> selectWrongIdByUserId(QuestionWrongListDTO dto);
 

nbjk-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -40,11 +40,6 @@ public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectio
     }
 
 
-    @Override
-    public List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto) {
-        return questionCollectionMapper.selectCollectionByUserId(dto);
-    }
-
     @Override
     public List<QuestionColIdDateVo> selectCollectionIdByUserId(QuestionCollectionListDTO dto) {
         return questionCollectionMapper.selectCollectionIdByUserId(dto);

nbjk-service/src/main/java/com/miaxis/question/service/impl/QuestionWrongServiceImpl.java

@@ -33,10 +33,6 @@ public class QuestionWrongServiceImpl extends ServiceImpl<QuestionWrongMapper, Q
         return questionWrongMapper.selectQuestionWrongList(questionWrong);
     }
 
-    @Override
-    public List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto) {
-        return questionWrongMapper.selectWrongByUserId(dto);
-    }
 
     @Override
     public List<QuestionWrongIdDateVo> selectWrongIdByUserId(QuestionWrongListDTO dto) {

nbjk-service/src/main/resources/mapper/question/QuestionCollectionMapper.xml

@@ -26,17 +26,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectCollectionByUserId" resultType="com.miaxis.question.domain.QuestionInfo">
-
-        select q1.* from question_info q1 join question_collection q2 on q1.id = q2.question_id
-        <where>
-            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
-            <if test="km != null and km!='' "> and q2.km = #{km}</if>
-        </where>
-        order by q2.create_time asc
-
-    </select>
-
 
     <select id="selectCollectionIdByUserId" resultType="com.miaxis.question.vo.QuestionColIdDateVo">
 

nbjk-service/src/main/resources/mapper/question/QuestionWrongMapper.xml

@@ -26,15 +26,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="selectWrongByUserId" resultType="com.miaxis.question.domain.QuestionInfo">
-
-        select q1.* from question_info q1 join question_wrong q2 on q1.id = q2.question_id
-        <where>
-            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
-            <if test="km != null and km!='' "> and q2.km = #{km}</if>
-        </where>
-        order by q2.create_time
-    </select>
 
     <select id="selectWrongIdByUserId" resultType="com.miaxis.question.vo.QuestionWrongIdDateVo">