From d682fb6151d6f01222b62276f4079c35e8101194 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 20 Jul 2022 17:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E9=A1=B9=E7=9B=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BF=9D=E5=AD=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleInspectimgtempDetailsVo.java | 9 ++++++-- .../ScmVehicleInspectitemDto.java | 5 ++--- .../ScmVehicleInspectimgtempMapper.java | 2 +- .../ScmVehicleInspectimgtempMapper.xml | 2 +- .../ScmVehicleInspectimgtempService.java | 21 +++++++++++++++---- .../ScmVehicleInspectitemService.java | 4 ++-- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDetailsVo.java index 52b0f4d412..518b647bc8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDetailsVo.java @@ -26,12 +26,15 @@ package com.yxt.anrui.scm.api.scmvehicleinspectimgtemp; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui-scm(供应链)
* File: ScmVehicleInspectimgtempVo.java
@@ -53,6 +56,8 @@ public class ScmVehicleInspectimgtempDetailsVo implements Vo { @ApiModelProperty("照片名称") private String imgTitle; @ApiModelProperty("照片示例") - private String imgTempUrl; + private List imgTempUrl = new ArrayList<>(); + @JsonIgnore + private String imgUrl; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDto.java index ac013455d5..b701f3b7e7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDto.java @@ -33,7 +33,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.ArrayList; import java.util.List; /** @@ -71,9 +70,9 @@ public class ScmVehicleInspectitemDto implements Dto { private String remarks; @ApiModelProperty(value = "检查项内容") - private List inspectdetail = new ArrayList<>(); + private List inspectdetail; @ApiModelProperty(value = "照片示例") - private List inspectimgtemp = new ArrayList<>(); + private List inspectimgtemp; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.java index c3c2a07f18..440f948843 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.java @@ -52,5 +52,5 @@ public interface ScmVehicleInspectimgtempMapper extends BaseMapper selectByItemSid(@Param("sid") String sid, @Param("path") String path); + List selectByItemSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml index 892e14febd..acea36043c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml @@ -13,7 +13,7 @@ diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempService.java index 6b236221b9..b854f7d131 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempService.java @@ -34,6 +34,7 @@ import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -59,15 +60,17 @@ public class ScmVehicleInspectimgtempService extends MybatisBaseService inspectimgtemp, String sid) { inspectimgtemp.removeAll(Collections.singleton(null)); + if (!inspectimgtemp.isEmpty()) { inspectimgtemp.stream().forEach(item -> { ScmVehicleInspectimgtemp scmVehicleInspectimgtemp = new ScmVehicleInspectimgtemp(); - item.getImgTempUrl().forEach(i -> { + List imgList = new ArrayList<>(); + item.getImgTempUrl().stream().forEach(i -> { if (i.contains(fileUploadComponent.getUrlPrefix())) { - i = i.replace(fileUploadComponent.getUrlPrefix(),""); + imgList.add(i.replace(fileUploadComponent.getUrlPrefix(), "")); } }); - scmVehicleInspectimgtemp.setImgTempUrl(Joiner.on(",").join(item.getImgTempUrl())); + scmVehicleInspectimgtemp.setImgTempUrl(Joiner.on(",").join(imgList)); scmVehicleInspectimgtemp.setItemSid(sid); baseMapper.insert(scmVehicleInspectimgtemp); }); @@ -80,7 +83,17 @@ public class ScmVehicleInspectimgtempService extends MybatisBaseService selectByItemSid(String sid) { String path = fileUploadComponent.getUrlPrefix(); - return baseMapper.selectByItemSid(sid, path); + List voList = baseMapper.selectByItemSid(sid); + voList.removeAll(Collections.singleton(null)); + for (ScmVehicleInspectimgtempDetailsVo v : voList) { + List stringList = Arrays.asList(v.getImgUrl().split(",")); + List list = new ArrayList<>(); + for (int i = 0; i < stringList.size(); i++) { + list.add(fileUploadComponent.getUrlPrefix() + stringList.get(i)); + } + v.setImgTempUrl(list); + } + return voList; } public void deleteAllByItemSid(String[] sids) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemService.java index 84e1fcf129..a514f5789b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemService.java @@ -103,7 +103,7 @@ public class ScmVehicleInspectitemService extends MybatisBaseService