elink-star
/
esua-epdc-cloud
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【pc端 -新增网格实体化详情】【回显数据接口】魏凯 2020-12-9

feature/dangjian
weikai 5 years ago
parent
615aba76ac
commit
25716f79d5
8 changed files with 88 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckDetailDTO.java
  2. 6
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java
  3. 13
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java
  4. 11
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java
  5. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckDetailEntity.java
  6. 9
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java
  7. 46
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java
  8. 19
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckDetailDTO.java
View File

@ -41,7 +41,7 @@ public class SubPositionCheckDetailDTO implements Serializable {
/**
* 信息表关系ID
*/
private String infｏId;
private String infoId;
/**
* 考核项描述

6
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java
View File

@ -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;
}

13
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java
View File

@ -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);
}
}

11
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java
View File

@ -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);
}

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckDetailEntity.java
View File

@ -41,7 +41,7 @@ public class SubPositionCheckDetailEntity extends BaseEpdcEntity {
/**
* 信息表关系ID
*/
private String infｏId;
private String infoId;
/**
* 考核项描述

9
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java
View File

@ -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);
}

46
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java
View File

@ -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;
}

19
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckDetailDao.xml
View File

@ -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>
Write Preview
Loading…
Cancel
Save