youxiw2000 / trash · Commits

Commit c645e844438ed04d7aa2eec392a57cd4ee12e432

Authored by liujun001
1 parent ae6c31ea
build: skipped

Changes

Inline Side-by-side
Showing 1 changed file with 10 additions and 3 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @c645e84
... ... @@ -49,6 +49,8 @@ import org.springframework.web.util.HtmlUtils;
49 49  
50 50 import javax.annotation.Resource;
51 51 import java.text.SimpleDateFormat;
  52 +import java.time.LocalTime;
  53 +import java.time.format.DateTimeFormatter;
52 54 import java.util.*;
53 55 import java.util.concurrent.TimeUnit;
54 56 import java.util.stream.Collectors;
... ... @@ -173,7 +175,6 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
173 175  
174 176 @Override
175 177 public OrderDetailVo queryOrderDetail(String id) {
176   -
177 178 GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId());
178 179 OrderDetailVo orderDetailVo = null;
179 180 if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())
... ... @@ -211,6 +212,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
211 212 BeanUtils.copyProperties(orderVo, vo);
212 213 // 获取图片
213 214 List<GarOrderImage> imageAll = new ArrayList<>();
  215 +
214 216 List<GarOrderImage> currentImageList = garOrderImageService.list(new LambdaQueryWrapper<GarOrderImage>()
215 217 .eq(GarOrderImage::getGarOrderId, orderId)
216 218 .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue()));
... ... @@ -220,8 +222,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
220 222 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue().equals(image.getGarOrderImageType())) {
221 223 vo.getCurrentImages().add(image.getGarOrderImageUrl());
222 224 }
  225 +
223 226 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
224   - vo.getPutOnImages().add(image.getGarOrderImageUrl());
  227 + SimpleDateFormat date = new SimpleDateFormat("HHmmss");
  228 + String imageDate = date.format(image.getGarCreateTime());
  229 + vo.getPutOnImages().add(image.getGarOrderImageUrl()+imageDate);
225 230 }
226 231 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
227 232 vo.getPutDownImages().add(image.getGarOrderImageUrl());
... ... @@ -285,7 +290,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
285 290 vo.getCurrentImages().add(image.getGarOrderImageUrl());
286 291 }
287 292 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
288   - vo.getPutOnImages().add(image.getGarOrderImageUrl());
  293 + SimpleDateFormat date = new SimpleDateFormat("HHmmss");
  294 + String imageDate = date.format(image.getGarCreateTime());
  295 + vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate);
289 296 }
290 297 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
291 298 vo.getPutDownImages().add(image.getGarOrderImageUrl());
... ...