diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java index 388425cf4..d4cd82b02 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java @@ -125,4 +125,21 @@ public class SubPositionCheckInfoDTO implements Serializable { */ private Boolean delShow; + /** + * 新增冗余字段 父所有部门ID + */ + private String parentDeptIds; + /** + * 新增冗余字段 父所有部门名称 + */ + private String parentDeptNames; + /** + * 新增冗余字段 所有部门ID + */ + private String allDeptIds; + /** + * 新增冗余字段 所有部门名称 + */ + private String allDeptNames; + } \ 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/controller/SubPositionCheckDetailController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java index 594b73490..16b754ce8 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 @@ -119,4 +119,11 @@ public class SubPositionCheckDetailController { subPositionCheckDetailService.saveInfoDetailList(dto); return new Result(); } + @PutMapping("addDetail") + public Result updateDetail(@RequestBody KpiSubCheckDetailFormDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + subPositionCheckDetailService.saveInfoDetailList(dto); + return new Result(); + } } \ 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/SubFileImgDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubFileImgDao.java index d0202d01a..344d42e8d 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubFileImgDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubFileImgDao.java @@ -29,5 +29,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SubFileImgDao extends BaseDao { + + /* + * + * 根据详情id删除文件数据 + * @param detailId + * @author wk + * @date 2020-12-08 17:41 + * @return void + */ + void deleteByDetailId(String detailId); } \ 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 cf577b0b4..1fbbbbad2 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 @@ -17,10 +17,14 @@ package com.elink.esua.epdc.dao; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.SubPositionCheckDetailEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 阵地建设考核内容提报详情表 * @@ -29,5 +33,23 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SubPositionCheckDetailDao extends BaseDao { - + + /* + * + * 根据infoid查询考核详情 + * @param infoId + * @author wk + * @date 2020-12-08 17:32 + * @return java.util.List + */ + List selectCheckDetailByInfoId(String infoId); + + /* + * + * 根据infoid删除所有相关信息 + * @author wk + * @date 2020-12-08 17:44 + * @return void + */ + void deleteByInfoIdAfter(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/SubPositionCheckInfoEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java index c2c950478..19e604f25 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java @@ -87,5 +87,21 @@ public class SubPositionCheckInfoEntity extends BaseEpdcEntity { * 创建时间 */ private Date createdTime; + /** + * 新增冗余字段 父所有部门ID + */ + private String parentDeptIds; + /** + * 新增冗余字段 父所有部门名称 + */ + private String parentDeptNames; + /** + * 新增冗余字段 所有部门ID + */ + private String allDeptIds; + /** + * 新增冗余字段 所有部门名称 + */ + private String allDeptNames; } \ 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/SubPositionCheckDetailService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.java index a7c5e683a..e9cd14c0d 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 @@ -113,4 +113,15 @@ public interface SubPositionCheckDetailService extends BaseService list = baseDao.selectCheckDetailByInfoId(infoId); + updateDetailInfo(infoId,list,dto); + + } + /* * * 存info表中数据 @@ -190,6 +210,13 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl allDeptInfos = adminFeignClient.getDeptInfoById(deptId,"0"); + DeptLevelAndLeaderDTO deptLevelAndLeaderDto = allDeptInfos.getData(); + checkInfoEntity.setParentDeptIds(deptLevelAndLeaderDto.getParentDeptIds()); + checkInfoEntity.setParentDeptNames(deptLevelAndLeaderDto.getParentDeptNames()); + checkInfoEntity.setAllDeptIds(deptLevelAndLeaderDto.getAllDeptIds()); + checkInfoEntity.setAllDeptNames(deptLevelAndLeaderDto.getAllDeptNames()); infoDao.insert(checkInfoEntity); return checkInfoEntity.getId(); } @@ -242,6 +269,10 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl0){ @@ -253,6 +284,11 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl list, + KpiSubCheckDetailFormDTO dto){ + for (SubPositionCheckDetailEntity entity:list) { + String detailId = entity.getId(); + //根据详情id查询所有文件信息 + fileImgDao.deleteByDetailId(detailId); + //删除详情表所有相关数据 + baseDao.selectCheckDetailByInfoId(infoId); + } + //添加相关数据 + addDetailDate(infoId,dto.getInfoDetail()); + } + /* * * 拼接网格id diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubFileImgDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubFileImgDao.xml index 21a69c997..baebde9f3 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubFileImgDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubFileImgDao.xml @@ -19,5 +19,10 @@ + + DELETE FROM epdc_sub_file_img + WHERE DETAIL_ID = #{detailId} + + \ No newline at end of file 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 30478d35c..cb04de64b 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 @@ -18,5 +18,19 @@ + + + + DELETE +FROM + epdc_sub_position_check_detail +WHERE + INFO_ID = #{infoId} + + \ No newline at end of file