记得上下班打卡 | git大法好,push需谨慎

Commit 633b1f66 authored by 张国柄's avatar 张国柄

~api:藏品列表系统时间优化;

parent 107d9b1f
...@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
import java.util.Map; import java.util.Map;
@ApiSupport(order = 142000) @ApiSupport(order = 142000)
...@@ -55,7 +56,8 @@ public class GoblinUserDigitalArtworkController { ...@@ -55,7 +56,8 @@ public class GoblinUserDigitalArtworkController {
pageSize = pageSize < 1 ? 5 : (pageSize > 5 ? 5 : pageSize); pageSize = pageSize < 1 ? 5 : (pageSize > 5 ? 5 : pageSize);
String currentUid = CurrentUtil.getCurrentUid(); String currentUid = CurrentUtil.getCurrentUid();
GoblinUserDigitalArtworkPageVo page = goblinUserDigitalArtworkService.page(currentUid, pageNum, pageSize); GoblinUserDigitalArtworkPageVo page = goblinUserDigitalArtworkService.page(currentUid, pageNum, pageSize);
return ResponseDto.success(page.setReceivedList(goblinUserDigitalArtworkService.getArtworkListFromTransfer(currentUid))); List<GoblinUserDigitalArtworkTransferListVo> artworkListFromTransfer = goblinUserDigitalArtworkService.getArtworkListFromTransfer(currentUid);
return ResponseDto.success(page.setSystime(LocalDateTime.now()).setReceivedList(artworkListFromTransfer));
} }
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
......
...@@ -119,7 +119,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr ...@@ -119,7 +119,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
} }
listVoPagedResult.setList(list).setTotal(artworkNum, pageSize); listVoPagedResult.setList(list).setTotal(artworkNum, pageSize);
pageVo.setArtworkNum((int) artworkNum).setPagedResult(listVoPagedResult).setSystime(LocalDateTime.now()); pageVo.setArtworkNum((int) artworkNum).setPagedResult(listVoPagedResult);
} }
return pageVo; return pageVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment