yangdamao 1 jaar geleden
bovenliggende
commit
6feedcab72

+ 3 - 1
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1927,7 +1927,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<SysTask> list = iSysTaskService.list(new LambdaQueryWrapper<SysTask>()
                 .eq(SysTask::getSysUserId, userId)
                 .eq(SysTask::getStatus, 1)
-                .eq(SysTask::getTaskType, 2));
+                .eq(SysTask::getTaskType, 2)
+                .orderByDesc(SysTask::getCreateTime));
         if (CollectionUtils.isEmpty(list)){
             return new ArrayList<>();
         }
@@ -1938,6 +1939,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             vo.setTaskStatus(item.getTaskStatus());
             vo.setCreateSysUserId(item.getSysUserId());
             vo.setTaskPath(item.getTaskPath());
+            vo.setTaskTime(item.getCreateTime());
             return vo;
         }).collect(Collectors.toList());
         return collect;

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserDownloadVo.java

@@ -24,6 +24,9 @@ public class UserDownloadVo implements Serializable {
     @ApiModelProperty("下载路径")
     private String taskPath;
 
+    @ApiModelProperty("下载时间")
+    private Long taskTime;
+
     private Long createSysUserId;
 
 }

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -893,7 +893,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_business cb ON g.business_id = cb.id
                 LEFT JOIN major m ON g.major_id = m.id
         WHERE up.`status` != -1 AND up.current_status = 1
-        <if test="userId != null and userId !='' ">
+        <if test="userId != null ">
             AND up.user_id = #{userId}
         </if>
         <if test="uploadStartTime != null and uploadStartTime !=''">