diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiSubCheckDetailChildFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiSubCheckDetailChildFormDTO.java index 74221b698..79896e0c2 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiSubCheckDetailChildFormDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiSubCheckDetailChildFormDTO.java @@ -1,8 +1,10 @@ package com.elink.esua.epdc.dto.form; +import com.elink.esua.epdc.dto.SubFileImgDTO; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @@ -21,10 +23,8 @@ public class KpiSubCheckDetailChildFormDTO implements Serializable { private String pCheckItemName; //考核项子类名称 private String checkItemName; - //详情图片集合 - private String[] imageUrl; - //详情图片缩略图集合 - private String[] thumbnail; //详情文件集合 - private String[] files; + private List files; + //详情图片集合 + private List images; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java index e96b1940d..4884018de 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.*; import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; +import com.elink.esua.epdc.dto.SubFileImgDTO; import com.elink.esua.epdc.dto.SubPositionCheckDetailDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO; @@ -280,7 +281,6 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl0){ - for (int i = 0; i < imageUrl.length; i++) { - SubFileImgEntity subFileImgEntity = new SubFileImgEntity(); - subFileImgEntity.setDetailId(detailId); - subFileImgEntity.setUrl(imageUrl[i]); - subFileImgEntity.setFileType("1"); - subFileImgEntity.setThumbnail(thumbnail[i]); - fileImgDao.insert(subFileImgEntity); - } - }else { - SubFileImgEntity subFileImgEntity = new SubFileImgEntity(); - subFileImgEntity.setDetailId(detailId); - fileImgDao.insert(subFileImgEntity); - } - String[] files = dto.getFiles(); - if (files.length>0){ - for (int i = 0; i < files.length; i++) { - SubFileImgEntity subFileImgEntity = new SubFileImgEntity(); - subFileImgEntity.setDetailId(detailId); - subFileImgEntity.setFileType("2"); - subFileImgEntity.setFileName(files[i]); - fileImgDao.insert(subFileImgEntity); - } - } - else { - SubFileImgEntity subFileImgEntity = new SubFileImgEntity(); - subFileImgEntity.setDetailId(detailId); - fileImgDao.insert(subFileImgEntity); - } + List fiels = dto.getFiles(); + List images = dto.getImages(); + if (fiels.size()>0){ + for (SubFileImgDTO a:fiels) { + SubFileImgEntity imgEntity = new SubFileImgEntity(); + imgEntity.setDetailId(detailId); + imgEntity.setFileName(a.getFileName()); + imgEntity.setThumbnail(a.getThumbnail()); + imgEntity.setFileType("2"); + imgEntity.setUrl(a.getUrl()); + fileImgDao.insert(imgEntity); + } + } + if (images.size()>0){ + for (SubFileImgDTO b:images){ + SubFileImgEntity imgEntity = new SubFileImgEntity(); + imgEntity.setDetailId(detailId); + imgEntity.setFileName(b.getFileName()); + imgEntity.setThumbnail(b.getThumbnail()); + imgEntity.setFileType("1"); + imgEntity.setUrl(b.getUrl()); + fileImgDao.insert(imgEntity); + } + } } /*