|
@@ -129,12 +129,9 @@ public class MaterialImageInfoController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
@GetMapping(value = "/getImageList")
|
|
|
public Result<List<MaterialImageInfo>> getImageList(MaterialImageInfo MaterialImageInfo,
|
|
|
- HttpServletRequest req) {
|
|
|
+ HttpServletRequest req) {
|
|
|
Result<List<MaterialImageInfo>> result = new Result<>();
|
|
|
QueryWrapper<MaterialImageInfo> queryWrapper = QueryGenerator.initQueryWrapper(MaterialImageInfo, req.getParameterMap());
|
|
|
List<MaterialImageInfo> list = MaterialImageInfoService.list(queryWrapper);
|
|
@@ -144,21 +141,30 @@ public class MaterialImageInfoController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@GetMapping(value = "/getDetail")
|
|
|
public Result<MaterialImageInfo> getDetail(String id) {
|
|
|
Result<MaterialImageInfo> result = new Result<>();
|
|
|
MaterialImageInfo materialImageInfo = MaterialImageInfoService.getById(id);
|
|
|
if (!Check.isNull(materialImageInfo)) {
|
|
|
- MaterialInfo materialmInfo = materialInfoService.getById(materialImageInfo.getVideoId());
|
|
|
- if (!Check.isNull(materialmInfo)) {
|
|
|
- materialImageInfo.setVideoUrl(materialmInfo.getUrl());
|
|
|
+ QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
|
|
|
+ materialInfoQueryWrapper.eq("code", materialImageInfo.getVideoId());
|
|
|
+ materialInfoQueryWrapper.orderByDesc("create_time");
|
|
|
+ materialInfoQueryWrapper.last("limit 1");
|
|
|
+ MaterialInfo materialInfo = materialInfoService.getOne(materialInfoQueryWrapper);
|
|
|
+ if (!Check.isNull(materialInfo)) {
|
|
|
+ materialImageInfo.setVideoUrl(materialInfo.getUrl());
|
|
|
|
|
|
}
|
|
|
+ if (!Check.isNull(materialImageInfo.getAuditorId())) {
|
|
|
+ String auditorName = materialInfoMapper.selectUserNameById(materialImageInfo.getAuditorId());
|
|
|
+ materialImageInfo.setAuditorName(auditorName);
|
|
|
|
|
|
- String auditorName = materialInfoMapper.selectUserNameById(materialImageInfo.getAuditorId());
|
|
|
- materialImageInfo.setAuditorName(auditorName);
|
|
|
+ }
|
|
|
|
|
|
+ if (!Check.isNull(materialImageInfo.getUserId())) {
|
|
|
+ String userName = materialInfoMapper.selectUserNameById(materialImageInfo.getUserId());
|
|
|
+ materialImageInfo.setUserName(userName);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
result.setSuccess(true);
|