Merge remote-tracking branch 'origin/feature/subCheck' into feature/subCheck

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<SubFileImgDTO> files;
+    //详情图片集合
+    private List<SubFileImgDTO> images;
 }

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 BaseServiceImpl<SubPositi
             SubPositionCheckDetailEntity entity = new SubPositionCheckDetailEntity();
             entity.setInfoId(infoId);
             String d =dto.getDesribe();
-            System.out.println(d);
             entity.setCheckDescribe(d);
             entity.setPCheckItemName(dto.getPCheckItemName());
             entity.setCheckItemName(dto.getCheckItemName());
@@ -304,37 +304,30 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
     @Transactional(rollbackFor = Exception.class)
      void addSubFileImage(String detailId,KpiSubCheckDetailChildFormDTO dto){
         //获取 图片地址 和文件地址
-      String[]  imageUrl = dto.getImageUrl();
+        List<SubFileImgDTO>  fiels = dto.getFiles();
-      String[]  thumbnail = dto.getThumbnail();
+        List<SubFileImgDTO> images = dto.getImages();
-      if (imageUrl.length>0){
+        if (fiels.size()>0){
-          for (int i = 0; i < imageUrl.length; i++) {
+            for (SubFileImgDTO a:fiels) {
-              SubFileImgEntity subFileImgEntity = new SubFileImgEntity();
+                SubFileImgEntity  imgEntity = new SubFileImgEntity();
-              subFileImgEntity.setDetailId(detailId);
+                imgEntity.setDetailId(detailId);
-              subFileImgEntity.setUrl(imageUrl[i]);
+                imgEntity.setFileName(a.getFileName());
-              subFileImgEntity.setFileType("1");
+                imgEntity.setThumbnail(a.getThumbnail());
-              subFileImgEntity.setThumbnail(thumbnail[i]);
+                imgEntity.setFileType("2");
-              fileImgDao.insert(subFileImgEntity);
+                imgEntity.setUrl(a.getUrl());
-          }
+                fileImgDao.insert(imgEntity);
-      }else {
+            }
-          SubFileImgEntity subFileImgEntity = new SubFileImgEntity();
+        }
-          subFileImgEntity.setDetailId(detailId);
+        if (images.size()>0){
-          fileImgDao.insert(subFileImgEntity);
+            for (SubFileImgDTO b:images){
-      }
+                SubFileImgEntity  imgEntity = new SubFileImgEntity();
-      String[]  files = dto.getFiles();
+                imgEntity.setDetailId(detailId);
-      if (files.length>0){
+                imgEntity.setFileName(b.getFileName());
-          for (int i = 0; i < files.length; i++) {
+                imgEntity.setThumbnail(b.getThumbnail());
-              SubFileImgEntity subFileImgEntity = new SubFileImgEntity();
+                imgEntity.setFileType("1");
-              subFileImgEntity.setDetailId(detailId);
+                imgEntity.setUrl(b.getUrl());
-              subFileImgEntity.setFileType("2");
+                fileImgDao.insert(imgEntity);
-              subFileImgEntity.setFileName(files[i]);
+            }
-              fileImgDao.insert(subFileImgEntity);
+        }
-          }
-      }
-      else {
-          SubFileImgEntity subFileImgEntity = new SubFileImgEntity();
-          subFileImgEntity.setDetailId(detailId);
-          fileImgDao.insert(subFileImgEntity);
-      }
     }
 
     /*