From e6610bd3bb541b8ca676404ddf02b42a9a9797d3 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Wed, 9 Dec 2020 19:01:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93=E5=8C=96=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=91=E9=AD=8F=E5=87=AF=202020-12-9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/KpiSubCheckDetailChildFormDTO.java | 10 ++-- .../SubPositionCheckDetailServiceImpl.java | 57 ++++++++----------- 2 files changed, 30 insertions(+), 37 deletions(-) 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..825c6479a 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(a.getFileType()); + 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(b.getFileType()); + imgEntity.setUrl(b.getUrl()); + fileImgDao.insert(imgEntity); + } + } } /* From a670155c4ebbb62050e48add0653a22bc80a81d9 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Wed, 9 Dec 2020 19:45:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93=E5=8C=96=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=91=E9=AD=8F=E5=87=AF=202020-12-9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SubPositionCheckDetailServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 825c6479a..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 @@ -312,7 +312,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl