diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java index 4650a58aed..834d6f9c0d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java +++ b/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 itemImgVoList = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java index 0ab02a3266..1e41967a8c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java +++ b/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 scmResultImageDtos; + private List scmResultImageDtos = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java index ae2ea4edad..485985e763 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java +++ b/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 imgUrlList; + private List imgUrlList = new ArrayList<>(); @ApiModelProperty("照片模板路径") private String imgPath; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java index 6de96440b2..4ac4eab434 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java +++ b/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 scmResultImageDtos = dto.getScmResultImageDtos(); for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) { + baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult()); - ScmVehinspectItemimgDto scmVehinspectItemimgDto = scmResultImageDto.getScmVehinspectItemimgDto(); - List imgUrlList = scmVehinspectItemimgDto.getImgUrlList(); - String imgUrl = null; - for (int i = 0; i < imgUrlList.size(); i++) { - imgUrl = imgUrlList.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; + + List itemImgVoList = scmResultImageDto.getItemImgVoList(); + + for (ScmVehinspectItemimgDto scmVehinspectItemimgDto : itemImgVoList) { + String imgUrl = ""; + List 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("保存成功"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml index 72e26a4ed7..60f7051cbf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml @@ -21,7 +21,8 @@