From 25716f79d52ea60242ff0b888e1a2204cd6130e2 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 9 Dec 2020 15:24:59 +0800
Subject: [PATCH] =?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/dto/SubPositionCheckDetailDTO.java   |  2 +-
 .../dto/result/SubDetailDictResultDTO.java    |  6 +++
 .../SubPositionCheckDetailController.java     | 13 ++++++
 .../epdc/dao/SubPositionCheckDetailDao.java   | 11 ++++-
 .../entity/SubPositionCheckDetailEntity.java  |  2 +-
 .../SubPositionCheckDetailService.java        |  9 ++++
 .../SubPositionCheckDetailServiceImpl.java    | 46 ++++++++++++++-----
 .../mapper/SubPositionCheckDetailDao.xml      | 19 ++++++--
 8 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckDetailDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckDetailDTO.java
index 40ea52f47..d9a53c1e2 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckDetailDTO.java
@@ -41,7 +41,7 @@ public class SubPositionCheckDetailDTO implements Serializable {
     /**
      * 信息表关系ID
      */
-	private String infｏId;
+	private String infoId;
 
     /**
      * 考核项描述
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java
index 570dbcd94..26bd1941b 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java
@@ -16,5 +16,11 @@ public class SubDetailDictResultDTO implements Serializable {
     private static final long serialVersionUID = -1L;
     private String id;
     private String label;
+    //小项描述
+    private String describe;
+    //小项图片
+    private List<SubDetailDictChildImageResultDTO> images;
+    //小项文件
+    private List<SubDetailDictChildImageResultDTO> files;
     private List<SubDetailDictChildResultDTO> childDiction;
 }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java
index 5270d53c3..2d9da2d09 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java
@@ -148,4 +148,17 @@ public class SubPositionCheckDetailController {
     public Result<List<SubDetailDictResultDTO>>getSubDetailInfoByInfoId(@PathVariable("infoId") String infoId){
         return subPositionCheckDetailService.getSubDetailInfoByInfoId(infoId);
     }
+
+    /*
+     *
+     * 根据infoid查询网格实体化详情信息
+     * @param infoId
+     * @author wk
+     * @date 2020-12-08 18:37
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.SubDetailDictResultDTO>>
+     */
+    @GetMapping("getInfogrid/{infoId}")
+    public Result<String[]>getInfogrid(@PathVariable("infoId") String infoId){
+        return subPositionCheckDetailService.getInfogrid(infoId);
+    }
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java
index 042d02b6b..595b80731 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java
@@ -53,7 +53,7 @@ public interface SubPositionCheckDetailDao extends BaseDao<SubPositionCheckDetai
      * @date 2020-12-08 17:44
      * @return void
      */
-    void deleteByInfｏIdAfter(String infoId);
+    void deleteByInfoIdAfter(String infoId);
 
     /*
      *
@@ -66,4 +66,13 @@ public interface SubPositionCheckDetailDao extends BaseDao<SubPositionCheckDetai
     KpiSubCheckDetailResultDTO selectCheckDetailFiles(@Param("infoId") String infoId,
                                                       @Param("bigId")String bigId,
                                                       @Param("childId") String childId);
+    /*
+     *
+     * 根据infoid查询关联网格
+     * @param infoId
+     * @author wk
+     * @date 2020-12-09 14:47
+     * @return java.lang.String[]
+     */
+    String  getSubInfoById(String infoId);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckDetailEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckDetailEntity.java
index 5789e1308..b4fea8b31 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckDetailEntity.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckDetailEntity.java
@@ -41,7 +41,7 @@ public class SubPositionCheckDetailEntity extends BaseEpdcEntity {
     /**
      * 信息表关系ID
      */
-	private String infｏId;
+	private String infoId;
 
     /**
      * 考核项描述
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java
index 3ba009509..a10aa937a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java
@@ -135,4 +135,13 @@ public interface SubPositionCheckDetailService extends BaseService<SubPositionCh
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.SubDetailDictResultDTO>>
      */
     Result<List<SubDetailDictResultDTO>>getSubDetailInfoByInfoId(String infoId);
+    /*
+     *
+     * 根据infoid查询网格实体化详情信息
+     * @param infoId
+     * @author wk
+     * @date 2020-12-08 20:15
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.SubDetailDictResultDTO>>
+     */
+    Result<String[]>getInfogrid(String infoId);
 }
\ No newline at end of file
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 c53868051..e96b1940d 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
@@ -193,18 +193,34 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         for (SubDetailDictResultDTO entity:subDictList) {
                 String bigId =   entity.getId(); //大项id
             List<SubDetailDictChildResultDTO> childList = entity.getChildDiction();
-            for (SubDetailDictChildResultDTO a: childList) {
-                String childId =   a.getId();
-                KpiSubCheckDetailResultDTO detailInfo =  baseDao.selectCheckDetailFiles(infoId,bigId,childId);
-                a.setDescribe(detailInfo.getCheckDescribe());
-                a.setImages(detailInfo.getImages());
-                a.setFiles(detailInfo.getFiles());
+            if (childList.size()>0){
+                for (SubDetailDictChildResultDTO a: childList) {
+                    String childId =   a.getId();
+                    KpiSubCheckDetailResultDTO detailInfo =  baseDao.selectCheckDetailFiles(infoId,bigId,childId);
+                    a.setDescribe(detailInfo.getCheckDescribe());
+                    a.setImages(detailInfo.getImages());
+                    a.setFiles(detailInfo.getFiles());
+                }
+            }else if (childList.size() == 0){
+                KpiSubCheckDetailResultDTO detailInfo =  baseDao.selectCheckDetailFiles(infoId,bigId,"");
+                entity.setDescribe(detailInfo.getCheckDescribe());
+                entity.setImages(detailInfo.getImages());
+                entity.setFiles(detailInfo.getFiles());
             }
 
+
         }
         return new Result<List<SubDetailDictResultDTO>>().ok(subDictList);
     }
 
+    @Override
+    public Result<String[]> getInfogrid(String infoId) {
+      String gridIds =  baseDao.getSubInfoById(infoId);
+      String [] ids =    gridIds.split(",");
+        System.out.println(ids);
+        return new Result<String[]>().ok(ids);
+    }
+
     /*
      * 
      * 存info表中数据
@@ -244,6 +260,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         checkInfoEntity.setParentDeptNames(deptLevelAndLeaderDto.getParentDeptNames());
         checkInfoEntity.setAllDeptIds(deptLevelAndLeaderDto.getAllDeptIds());
         checkInfoEntity.setAllDeptNames(deptLevelAndLeaderDto.getAllDeptNames());
+        checkInfoEntity.setCreatedTime(date);
         infoDao.insert(checkInfoEntity);
         return checkInfoEntity.getId();
     }
@@ -261,10 +278,12 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         //一个infoid对应多个详情
         for (KpiSubCheckDetailChildFormDTO dto:detailList) {
             SubPositionCheckDetailEntity entity = new SubPositionCheckDetailEntity();
-            entity.setInfｏId(infoId);
-            entity.setCheckDescribe(dto.getDesribe());
+            entity.setInfoId(infoId);
+            String d =dto.getDesribe();
+            System.out.println(d);
+            entity.setCheckDescribe(d);
             entity.setPCheckItemName(dto.getPCheckItemName());
-            entity.setCheckDescribe(dto.getCheckItemName());
+            entity.setCheckItemName(dto.getCheckItemName());
             insert(entity);
           String detailId =  entity.getId();
           //进行图片和文件存储
@@ -339,6 +358,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         entity.setCheckTime(sdf1.format(date));
         entity.setProcessCode("1");
         entity.setProcessName("提交");
+        entity.setInfoId(infoId);
         logDao.insert(entity);
     }
 
@@ -359,7 +379,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
            //根据详情id查询所有文件信息
             fileImgDao.deleteByDetailId(detailId);
             //删除详情表所有相关数据
-            baseDao.selectCheckDetailByInfoId(infoId);
+            baseDao.deleteByInfoIdAfter(infoId);
         }
         //添加相关数据
         addDetailDate(infoId,dto.getInfoDetail());
@@ -378,8 +398,9 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         for (int i = 0; i < ids.length; i++) {
             if (i == 0){
                 gridIds = ids[i];
+            }else {
+                gridIds =  gridIds +","+ ids[i];
             }
-            gridIds =  gridIds +","+ ids[i];
         }
         return gridIds;
     }
@@ -398,8 +419,9 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
           String name =  res.getData().getName();
             if (i == 0){
                 gridNames = name;
+            }else{
+                gridNames =  gridNames +","+ name;
             }
-            gridNames =  gridNames +","+ name;
         }
         return gridNames;
     }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
index 08f4a3e1d..5e9b0a461 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
@@ -5,7 +5,7 @@
 
     <resultMap type="com.elink.esua.epdc.entity.SubPositionCheckDetailEntity" id="subPositionCheckDetailMap">
         <result property="id" column="ID"/>
-        <result property="infｏId" column="INFＯ_ID"/>
+        <result property="infoId" column="INFＯ_ID"/>
         <result property="checkDescribe" column="CHECK_DESCRIBE"/>
         <result property="pCheckItemName" column="P_CHECK_ITEM_NAME"/>
         <result property="checkItemName" column="CHECK_ITEM_NAME"/>
@@ -21,15 +21,15 @@
     <select id="selectCheckDetailByInfoId" resultMap="subPositionCheckDetailMap">
         SELECT * FROM epdc_sub_position_check_detail
         WHERE DEL_FLAG = 0
-        and `INFＯ_ID` =#{infoId}
+        and `INFO_ID` =#{infoId}
     </select>
 
-    <delete id="deleteByInfｏIdAfter">
+    <delete id="deleteByInfoIdAfter">
         DELETE
 FROM
 	epdc_sub_position_check_detail
 WHERE
-	INFＯ_ID = #{infoId}
+	`INFO_ID` = #{infoId}
     </delete>
 
     <resultMap id="detailFilesId" type="com.elink.esua.epdc.dto.result.KpiSubCheckDetailResultDTO" >
@@ -66,10 +66,19 @@ WHERE
         LEFT JOIN  epdc_sub_file_img c on a.ID = c.DETAIL_ID AND c.DEL_FLAG = 0 and c.FILE_TYPE = '2'
     WHERE
         a.DEL_FLAG = 0
-        AND a.`INFＯ_ID` = #{infoId}
+        AND a.`INFO_ID` = #{infoId}
         and a.P_CHECK_ITEM_NAME = #{bigId}
 	    and a.CHECK_ITEM_NAME = #{childId}
     </select>
 
+    <select id="getSubInfoById" resultType="java.lang.String">
+    SELECT
+        GRID_IDS
+    FROM
+        epdc_sub_position_check_info
+    WHERE
+        ID = #{infoId}
+    </select>
+
 
 </mapper>
\ No newline at end of file