fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/OrderPossessUserController.java

@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
 
 /**
  * 【请填写功能名称】Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-06-25
  */
@@ -50,7 +50,6 @@ public class OrderPossessUserController extends BaseController {
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public AjaxResult<OrderPossessUserVo> list(OrderPossessUserQueryBo bo) {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserStudyRecordController.java

@@ -3,9 +3,12 @@ package com.zhongzheng.controller.user;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordEditBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import lombok.RequiredArgsConstructor;
@@ -42,14 +45,18 @@ public class UserStudyRecordController extends BaseController {
 
     private final IUserStudyRecordService iUserStudyRecordService;
 
+    private final WxTokenService wxTokenService;
+
     /**
      * 查询用户学习记录列表
      */
     @ApiOperation("查询用户学习记录列表")
     @GetMapping("/list")
     public TableDataInfo<UserStudyRecordVo> list(UserStudyRecordQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         startPage();
-        List<UserStudyRecordVo> list = iUserStudyRecordService.queryList(bo);
+        List<UserStudyRecordVo> list = iUserStudyRecordService.selectList(bo);
         return getDataTable(list);
     }
 
@@ -71,6 +78,8 @@ public class UserStudyRecordController extends BaseController {
     @Log(title = "用户学习记录", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody UserStudyRecordAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(iUserStudyRecordService.insertByAddBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionSimulateService.java

@@ -23,7 +23,7 @@ public interface IQuestionSimulateService extends IService<QuestionSimulate> {
 	 */
 	QuestionSimulateVo queryById(Long simulateId);
 
-
+	QuestionSimulateVo queryByBankId(Long simulateId);
 
 	/**
 	 * 查询列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionSimulateServiceImpl.java

@@ -46,6 +46,12 @@ public class QuestionSimulateServiceImpl extends ServiceImpl<QuestionSimulateMap
 
     @Override
     public QuestionSimulateVo queryById(Long simulateId){
+        QuestionSimulate db = this.baseMapper.selectById(simulateId);
+        return BeanUtil.toBean(db, QuestionSimulateVo.class);
+    }
+
+    @Override
+    public QuestionSimulateVo queryByBankId(Long simulateId) {
         Map<String,Object> param = new HashMap<>();
         Long bandId = 2L;
         param.put("bandId",bandId);
@@ -96,10 +102,12 @@ public class QuestionSimulateServiceImpl extends ServiceImpl<QuestionSimulateMap
         }
         QuestionSimulateAddBo bo = new QuestionSimulateAddBo();
         bo.setBankId(bandId);
-
-
-        QuestionSimulate db = this.baseMapper.selectById(simulateId);
-        return BeanUtil.toBean(db, QuestionSimulateVo.class);
+        bo.setType1Ids(type1_ids);
+        bo.setType2Ids(type2_ids);
+        bo.setType3Ids(type3_ids);
+        bo.setType4Ids(type4_ids);
+        this.insertByAddBo(bo);
+        return null;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserStudyRecord.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -54,4 +55,9 @@ private static final long serialVersionUID=1L;
     /** 结束时间 */
     private Long endTime;
 
+    private String coverUrl;
+
+    
+    private String courseName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
+import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
+
+import java.util.List;
 
 /**
  * 用户学习记录Mapper接口
@@ -11,4 +15,6 @@ import com.zhongzheng.modules.user.domain.UserStudyRecord;
  */
 public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
 
+    List<UserStudyRecordVo> selectList(UserStudyRecordQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -28,6 +28,8 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 	 */
 	List<UserStudyRecordVo> queryList(UserStudyRecordQueryBo bo);
 
+	List<UserStudyRecordVo> selectList(UserStudyRecordQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入用户学习记录
 	 * @param bo 用户学习记录新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +31,9 @@ import java.util.stream.Collectors;
 @Service
 public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMapper, UserStudyRecord> implements IUserStudyRecordService {
 
+    @Autowired
+    private UserStudyRecordMapper userStudyRecordMapper;
+
     @Override
     public UserStudyRecordVo queryById(Long recordId){
         UserStudyRecord db = this.baseMapper.selectById(recordId);
@@ -48,6 +52,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<UserStudyRecordVo> selectList(UserStudyRecordQueryBo bo) {
+        return userStudyRecordMapper.selectList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserStudyRecordVo.java

@@ -48,5 +48,9 @@ public class UserStudyRecordVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+	@ApiModelProperty("课程名称")
+	private String courseName;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -14,7 +14,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studyDuration" column="study_duration"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
-    </resultMap>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="courseName" column="course_name"/>
 
+    </resultMap>
 
+    <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo"  resultMap="UserStudyRecordResult">
+        SELECT
+            us.*,
+            c.cover_url,
+            c.course_name
+        FROM
+            user_study_record us
+                LEFT JOIN course c ON us.course_id = c.course_id
+        WHERE
+        STATUS = 1
+        <if test="userId != null and userId != ''">
+            AND  us.user_id = #{userId}
+        </if>
+        GROUP BY
+            course_id
+        ORDER BY
+            us.record_id DESC
+    </select>
 </mapper>