验车检查表修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -22,6 +23,6 @@ public class ScmResultImageDto implements Dto {
     private String remarks;
 
     @ApiModelProperty("相关图片")
-    private ScmVehinspectItemimgDto scmVehinspectItemimgDto;
+    private List<ScmVehinspectItemimgDto> itemImgVoList = new ArrayList<>();
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -14,6 +15,6 @@ public class ScmVehinspectItemResultImageDto implements Dto {
     private String vehInspectSid;
 
     @ApiModelProperty("检验结果及相关照片")
-    private List<ScmResultImageDto> scmResultImageDtos;
+    private List<ScmResultImageDto> scmResultImageDtos = new ArrayList<>();
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -16,7 +17,7 @@ public class ScmVehinspectItemimgDto implements Dto {
     @ApiModelProperty("照片路径")
     private String imgUrl;
     @ApiModelProperty("照片路径集合")
-    private List<String> imgUrlList;
+    private List<String> imgUrlList = new ArrayList<>();
     @ApiModelProperty("照片模板路径")
     private String imgPath;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@@ -109,14 +109,20 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
         }
         List<ScmResultImageDto> scmResultImageDtos = dto.getScmResultImageDtos();
         for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) {
+
             baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult());
-            ScmVehinspectItemimgDto scmVehinspectItemimgDto = scmResultImageDto.getScmVehinspectItemimgDto();
-            List<String> imgUrlList = scmVehinspectItemimgDto.getImgUrlList();
-            String imgUrl = null;
-            for (int i = 0; i < imgUrlList.size(); i++) {
-                imgUrl = imgUrlList.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
+
+            List<ScmVehinspectItemimgDto> itemImgVoList = scmResultImageDto.getItemImgVoList();
+
+            for (ScmVehinspectItemimgDto scmVehinspectItemimgDto : itemImgVoList) {
+                String imgUrl = "";
+                List<String> imgUrlList = scmVehinspectItemimgDto.getImgUrlList();
+                for (String s : imgUrlList) {
+                    imgUrl = s.replace(fileUploadComponent.getUrlPrefix(), "") + ",";
+                }
+                scmVehinspectItemimgDto.setImgUrl(imgUrl);
+                scmVehinspectItemimgService.updateByMainSid(scmVehinspectItemimgDto.getMainSid(), scmVehinspectItemimgDto.getImgUrl(), scmVehinspectItemimgDto.getImgTitle());
             }
-            scmVehinspectItemimgService.updateByMainSid(scmResultImageDto.getSid(), imgUrl, scmVehinspectItemimgDto.getImgTitle());
         }
         return rb.success().setMsg("保存成功");
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml

@@ -21,7 +21,8 @@
 
     <select id="getInfoByMainSid"
             resultType="com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo">
-        SELECT imgTitle,
+        SELECT sid as mainSid,
+               imgTitle,
                imgUrl,
                imgPath
         FROM scm_vehinspect_itemimg
@@ -47,6 +48,6 @@
         update scm_vehinspect_itemimg
         set imgTitle =#{imgTitle},
             imgUrl   =#{imgUrl}
-        where sid = #{sid}
+        where mainSid = #{sid}
     </update>
 </mapper>