验车项目管理保存修复

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(供应链) <br/>
  * File: ScmVehicleInspectimgtempVo.java <br/>
@@ -53,6 +56,8 @@ public class ScmVehicleInspectimgtempDetailsVo implements Vo {
     @ApiModelProperty("照片名称")
     private String imgTitle;
     @ApiModelProperty("照片示例")
-    private String imgTempUrl;
+    private List<String> imgTempUrl = new ArrayList<>();
+    @JsonIgnore
+    private String imgUrl;
 
 }

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<ScmVehicleInspectdetailDto> inspectdetail = new ArrayList<>();
+    private List<ScmVehicleInspectdetailDto> inspectdetail;
 
     @ApiModelProperty(value = "照片示例")
-    private List<ScmVehicleInspectimgtempDto> inspectimgtemp = new ArrayList<>();
+    private List<ScmVehicleInspectimgtempDto> inspectimgtemp;
 
 }

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<ScmVehicleIns
 
     void deleteByItemSid(String dtoSid);
 
-    List<ScmVehicleInspectimgtempDetailsVo> selectByItemSid(@Param("sid") String sid, @Param("path") String path);
+    List<ScmVehicleInspectimgtempDetailsVo> selectByItemSid(@Param("sid") String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml

@@ -13,7 +13,7 @@
 
     <select id="selectByItemSid"
             resultType="com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo">
-        select concat(#{path}, st.imgTempUrl) as imgTempUrl, st.imgTitle
+        select st.imgTempUrl as imgUrl, st.imgTitle
         from scm_vehicle_inspectimgtemp st
         where itemSid = #{sid}
     </select>

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<ScmVehic
 
     public void save(List<ScmVehicleInspectimgtempDto> inspectimgtemp, String sid) {
         inspectimgtemp.removeAll(Collections.singleton(null));
+
         if (!inspectimgtemp.isEmpty()) {
             inspectimgtemp.stream().forEach(item -> {
                 ScmVehicleInspectimgtemp scmVehicleInspectimgtemp = new ScmVehicleInspectimgtemp();
-                item.getImgTempUrl().forEach(i -> {
+                List<String> 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<ScmVehic
 
     public List<ScmVehicleInspectimgtempDetailsVo> selectByItemSid(String sid) {
         String path = fileUploadComponent.getUrlPrefix();
-        return baseMapper.selectByItemSid(sid, path);
+        List<ScmVehicleInspectimgtempDetailsVo> voList = baseMapper.selectByItemSid(sid);
+        voList.removeAll(Collections.singleton(null));
+        for (ScmVehicleInspectimgtempDetailsVo v : voList) {
+            List<String> stringList = Arrays.asList(v.getImgUrl().split(","));
+            List<String> 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) {

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<ScmVehicleI
         if (StringUtils.isBlank(dtoSid)) {
             ScmVehicleInspectitem scmVehicleInspectitem = new ScmVehicleInspectitem();
             BeanUtil.copyProperties(dto, scmVehicleInspectitem, "sid");
-            if ("1".equals(scmVehicleInspectitem.getIsImg())) {//上传图片
+            if (scmVehicleInspectitem.getIsImg()==1) {//上传图片
                 scmVehicleInspectimgtempService.save(inspectimgtemp, scmVehicleInspectitem.getSid());
             }
             scmVehicleInspectdetailService.save(inspectdetail, scmVehicleInspectitem.getSid());
@@ -120,7 +120,7 @@ public class ScmVehicleInspectitemService extends MybatisBaseService<ScmVehicleI
             scmVehicleInspectdetailService.save(inspectdetail, scmVehicleInspectitem.getSid());
             //是否有照片，若有，则删除照片，再新增，若没有则直接删除
             scmVehicleInspectimgtempService.deleteByItemSid(dtoSid);
-            if ("1".equals(scmVehicleInspectitem.getIsImg())) {
+            if (scmVehicleInspectitem.getIsImg()==1) {
                 scmVehicleInspectimgtempService.save(inspectimgtemp, scmVehicleInspectitem.getSid());
             }
             baseMapper.updateById(scmVehicleInspectitem);