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 infoId; + 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 images; + //小项文件 + private List files; private List 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>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> + */ + @GetMapping("getInfogrid/{infoId}") + public ResultgetInfogrid(@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> */ Result>getSubDetailInfoByInfoId(String infoId); + /* + * + * 根据infoid查询网格实体化详情信息 + * @param infoId + * @author wk + * @date 2020-12-08 20:15 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + ResultgetInfogrid(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 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>().ok(subDictList); } + @Override + public Result getInfogrid(String infoId) { + String gridIds = baseDao.getSubInfoById(infoId); + String [] ids = gridIds.split(","); + System.out.println(ids); + return new Result().ok(ids); + } + /* * * 存info表中数据 @@ -244,6 +260,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl - + @@ -21,15 +21,15 @@ - + DELETE FROM epdc_sub_position_check_detail WHERE - INFO_ID = #{infoId} + `INFO_ID` = #{infoId} @@ -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.`INFO_ID` = #{infoId} + AND a.`INFO_ID` = #{infoId} and a.P_CHECK_ITEM_NAME = #{bigId} and a.CHECK_ITEM_NAME = #{childId} + + \ No newline at end of file