上传代码

src/main/java/com/msdw/tms/api/ProjectRcordControllerApi.java

@@ -17,6 +17,10 @@ public interface ProjectRcordControllerApi {
     R list( Integer page,  Integer size,Integer month,String startTime,String endTime,
             Integer recordState,String condition);
 
+    @ApiOperation(value = "科大用户端虚拟仿真实验记录",notes = "用户端虚拟仿真实验记录")
+    R kdRecord(Integer page,Integer size,Integer userId,Integer projectPermissions,Integer systemId);
+
+
     @ApiOperation(value = "用户端虚拟仿真实验记录",notes = "用户端虚拟仿真实验记录")
     R queryUserRecord(Integer page,Integer size,Integer userId,Integer projectPermissions,Integer systemId);
 

src/main/java/com/msdw/tms/controller/ProjectRecordController.java

@@ -68,6 +68,20 @@ public class ProjectRecordController implements ProjectRcordControllerApi {
         return R.ok().put("data", page1);
     }
 
+    /**
+     * 科大用户端虚拟仿真实验记录
+     * @param page
+     * @param size
+     * @param
+     * @return
+     */
+    @Override
+    @GetMapping("/user/kdRecord")
+    public R kdRecord(@RequestParam Integer page,@RequestParam Integer size,@RequestParam Integer userId,@RequestParam Integer projectPermissions,@RequestParam Integer systemId){
+        PageUtils page1 = projectRecordService.getByKDUserRecord(page,size,userId,projectPermissions,systemId);
+        return R.ok().put("data", page1);
+    }
+
     /**
      * 用户端教学实验记录
      * @param page

src/main/java/com/msdw/tms/dao/ProjectRecordDao.java

@@ -23,6 +23,8 @@ import java.util.List;
 @Mapper
 public interface ProjectRecordDao extends BaseMapper<ProjectRecordEntity> {
 
+    IPage<ProjectRecordVo> getByKDUserRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity,Integer projectPermissions);
+
     IPage<GetByUserRecordResp> getByUserRecord(Page page, @Param("userId") Integer userId, @Param("projectPermissions") Integer projectPermissions,@Param("systemId") Integer systemId);
 
     IPage<ProjectRecordVo> getByUserExperimentRecord(Page page, @Param("pro") ProjectRecordEntity projectRecordEntity);

src/main/java/com/msdw/tms/service/ProjectRecordService.java

@@ -16,6 +16,7 @@ import java.util.List;
  * @date 2020-08-19 16:07:02
  */
 public interface ProjectRecordService extends IService<ProjectRecordEntity> {
+    PageUtils getByKDUserRecord(Integer page,Integer size,Integer userId,Integer projectPermissions,Integer systemId);
 
     PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions,Integer systemId);
 

src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java

@@ -37,6 +37,21 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
     private ProjectRecordDao baseMapper;
 
 
+    @Override
+    public PageUtils getByKDUserRecord(Integer page,Integer size,Integer userId,Integer projectPermissions,Integer systemId) {
+
+        ProjectRecordEntity projectRecord = new ProjectRecordEntity().setUserid(userId);
+
+        //分页对象
+        Page<T> page1 = new Page<>(page, size);
+
+        IPage<ProjectRecordVo> projectRecordVos = this.baseMapper.getByKDUserRecord(page1,projectRecord,projectPermissions);
+
+        PageUtils questionsPage = new PageUtils(projectRecordVos);
+
+        return questionsPage;
+    }
+
     @Override
     public PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions,Integer systemId) {
 

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -22,7 +22,7 @@
     </insert>
 
 
-    <!--
+    <select id="getByKDUserRecord"  resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
         SELECT
             her.reportId as reportId,
             her.projectId,
@@ -42,7 +42,9 @@
         AND
             tp.projectPermissions = #{projectPermissions}
             order by her.creationTime desc
-    -->
+    </select>
+
+
     <select id="getByUserRecord" resultType="com.msdw.tms.entity.resp.GetByUserRecordResp"
             parameterType="java.lang.Integer">
         SELECT projectName,