|
|
@ -148,6 +148,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
SysDeptDTO sysDeptDTO = ConvertUtils.sourceToTarget(entity, SysDeptDTO.class); |
|
|
|
AdminImgDTO businessDto = adminImgService.getDtoByReference(ImgConstant.DEPT_BUSINESS_CIRCULATION, id.toString()); |
|
|
|
AdminImgDTO partyDto = adminImgService.getDtoByReference(ImgConstant.DEPT_PARTY_ORGANIZATION_STRUCTURE, id.toString()); |
|
|
|
AdminImgDTO gridDeptDto = adminImgService.getDtoByReference(ImgConstant.GRID_DEPT_FRAMEWORK, id.toString()); |
|
|
|
AdminImgDTO gridAreaDto = adminImgService.getDtoByReference(ImgConstant.GRID_AREA_PARTITION, id.toString()); |
|
|
|
SysDeptInfoDTO deptInfoByDeptID = sysDeptInfoService.getDeptInfoByDeptID(id.toString()); |
|
|
|
if(deptInfoByDeptID!=null){ |
|
|
|
sysDeptDTO.setIntroduction(deptInfoByDeptID.getIntroduction()); |
|
|
@ -165,6 +167,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
if(partyDto!=null){ |
|
|
|
sysDeptDTO.setDeptPartyUrl(partyDto.getImgUrl()); |
|
|
|
} |
|
|
|
if(gridDeptDto!=null){ |
|
|
|
sysDeptDTO.setGridDeptUrl(gridDeptDto.getImgUrl()); |
|
|
|
} |
|
|
|
if(gridAreaDto!=null){ |
|
|
|
sysDeptDTO.setGridAreaUrl(gridAreaDto.getImgUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
return sysDeptDTO; |
|
|
|
} |
|
|
@ -200,7 +208,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
|
|
|
|
private void insertInfo(SysDeptDTO dto, SysDeptEntity entity) { |
|
|
|
SysDeptInfoEntity sysDeptInfoEntity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class); |
|
|
|
sysDeptInfoEntity.setDeptId(dto.getId()); |
|
|
|
sysDeptInfoEntity.setDeptId(entity.getId()); |
|
|
|
sysDeptInfoService.insert(sysDeptInfoEntity); |
|
|
|
// 插入图片表
|
|
|
|
AdminImgEntity businessImgEntity = new AdminImgEntity(); |
|
|
@ -214,6 +222,18 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
partyImgEntity.setImgUrl(dto.getDeptPartyUrl()); |
|
|
|
partyImgEntity.setReferenceId(entity.getId().toString()); |
|
|
|
adminImgService.insert(partyImgEntity); |
|
|
|
// 网格化组织架构图
|
|
|
|
AdminImgEntity gridDeptImgEntity = new AdminImgEntity(); |
|
|
|
gridDeptImgEntity.setImgType(ImgConstant.GRID_DEPT_FRAMEWORK); |
|
|
|
gridDeptImgEntity.setImgUrl(dto.getGridDeptUrl()); |
|
|
|
gridDeptImgEntity.setReferenceId(entity.getId().toString()); |
|
|
|
adminImgService.insert(gridDeptImgEntity); |
|
|
|
// 网格区域划分图上传
|
|
|
|
AdminImgEntity gridAreaImgEntity = new AdminImgEntity(); |
|
|
|
gridAreaImgEntity.setImgType(ImgConstant.GRID_AREA_PARTITION); |
|
|
|
gridAreaImgEntity.setImgUrl(dto.getGridAreaUrl()); |
|
|
|
gridAreaImgEntity.setReferenceId(entity.getId().toString()); |
|
|
|
adminImgService.insert(gridAreaImgEntity); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -259,6 +279,17 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
partyImgEntity.setImgType(ImgConstant.DEPT_PARTY_ORGANIZATION_STRUCTURE); |
|
|
|
partyImgEntity.setImgUrl(dto.getDeptPartyUrl()); |
|
|
|
partyImgEntity.setReferenceId(entity.getId().toString()); |
|
|
|
|
|
|
|
AdminImgEntity gridDeptImgEntity = new AdminImgEntity(); |
|
|
|
gridDeptImgEntity.setImgType(ImgConstant.GRID_DEPT_FRAMEWORK); |
|
|
|
gridDeptImgEntity.setImgUrl(dto.getGridDeptUrl()); |
|
|
|
gridDeptImgEntity.setReferenceId(entity.getId().toString()); |
|
|
|
|
|
|
|
AdminImgEntity gridAreaImgEntity = new AdminImgEntity(); |
|
|
|
gridAreaImgEntity.setImgType(ImgConstant.GRID_AREA_PARTITION); |
|
|
|
gridAreaImgEntity.setImgUrl(dto.getGridAreaUrl()); |
|
|
|
gridAreaImgEntity.setReferenceId(entity.getId().toString()); |
|
|
|
|
|
|
|
// 表里没有直接插入
|
|
|
|
if (sysDeptInfoDTO == null) { |
|
|
|
// 插入信息表
|
|
|
@ -268,6 +299,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
// 插入图片表
|
|
|
|
adminImgService.insert(businessImgEntity); |
|
|
|
adminImgService.insert(partyImgEntity); |
|
|
|
adminImgService.insert(gridDeptImgEntity); |
|
|
|
adminImgService.insert(gridAreaImgEntity); |
|
|
|
} else { |
|
|
|
// 更新信息表
|
|
|
|
SysDeptInfoDTO deptInfoDTO = ConvertUtils.sourceToTarget(dto, SysDeptInfoDTO.class); |
|
|
@ -276,13 +309,24 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
sysDeptInfoService.update(deptInfoDTO); |
|
|
|
// 查询图片表图片id
|
|
|
|
AdminImgDTO businessDto = adminImgService.getDtoByReference(ImgConstant.DEPT_BUSINESS_CIRCULATION, entity.getId().toString()); |
|
|
|
AdminImgDTO partyDto = adminImgService.getDtoByReference(ImgConstant.DEPT_PARTY_ORGANIZATION_STRUCTURE, entity.getId().toString()); |
|
|
|
AdminImgDTO newBusinessDto = ConvertUtils.sourceToTarget(businessImgEntity, AdminImgDTO.class); |
|
|
|
newBusinessDto.setId(businessDto.getId()); |
|
|
|
adminImgService.update(newBusinessDto); |
|
|
|
|
|
|
|
AdminImgDTO partyDto = adminImgService.getDtoByReference(ImgConstant.DEPT_PARTY_ORGANIZATION_STRUCTURE, entity.getId().toString()); |
|
|
|
AdminImgDTO newPartyDto = ConvertUtils.sourceToTarget(partyImgEntity, AdminImgDTO.class); |
|
|
|
newPartyDto.setId(partyDto.getId()); |
|
|
|
adminImgService.update(newPartyDto); |
|
|
|
|
|
|
|
AdminImgDTO gridDeptDto = adminImgService.getDtoByReference(ImgConstant.GRID_DEPT_FRAMEWORK, entity.getId().toString()); |
|
|
|
AdminImgDTO newGridDeptDto = ConvertUtils.sourceToTarget(gridDeptImgEntity, AdminImgDTO.class); |
|
|
|
newGridDeptDto.setId(gridDeptDto.getId()); |
|
|
|
adminImgService.update(newGridDeptDto); |
|
|
|
|
|
|
|
AdminImgDTO gridAreaDto = adminImgService.getDtoByReference(ImgConstant.GRID_AREA_PARTITION, entity.getId().toString()); |
|
|
|
AdminImgDTO newGridAreaDto = ConvertUtils.sourceToTarget(gridAreaImgEntity, AdminImgDTO.class); |
|
|
|
newGridAreaDto.setId(gridAreaDto.getId()); |
|
|
|
adminImgService.update(newGridAreaDto); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|