elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

数字平台 项目管理列表、导出

master
syc 3 years ago
parent
afedc08ea3
commit
ee839d8a0c
6 changed files with 42 additions and 35 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. 12
      epmet-gateway/pom.xml
  2. 2
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java
  3. 4
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java
  4. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
  5. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java
  6. 54
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

12
epmet-gateway/pom.xml
View File

@ -284,8 +284,8 @@
<gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri>
<!-- <gateway.routes.epmet-job-server.uri>http://localhost:8084</gateway.routes.epmet-job-server.uri>-->
<!-- 8、用户模块 -->
<!-- <gateway.routes.epmet-user-server.uri>http://localhost:8087</gateway.routes.epmet-user-server.uri>-->
<gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>
<gateway.routes.epmet-user-server.uri>http://localhost:8087</gateway.routes.epmet-user-server.uri>
<!-- <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>-->
<!-- 9、新模块结构demo -->
<gateway.routes.epmet-demo-server.uri>lb://epmet-demo-server</gateway.routes.epmet-demo-server.uri>
<!-- 10、运营端客户定制化服务 -->
@ -324,11 +324,11 @@
<!-- 21、居民端党群e事 -->
<gateway.routes.resi-hall-server.uri>lb://resi-hall-server</gateway.routes.resi-hall-server.uri>
<!-- 22、政府工作端议题管理 -->
<!-- <gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>-->
<gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
<gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>
<!-- <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>-->
<!-- 23、政府工作端项目管理 -->
<!-- <gateway.routes.gov-project-server.uri>http://localhost:8102</gateway.routes.gov-project-server.uri>-->
<gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
<gateway.routes.gov-project-server.uri>http://localhost:8102</gateway.routes.gov-project-server.uri>
<!-- <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>-->
<!-- 24、公共服务 -->
<gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
<!--<gateway.routes.common-service-server.uri>http://localhost:8103</gateway.routes.common-service-server.uri>-->

2
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java
View File

@ -43,7 +43,7 @@ public class OrgProjectListFormDTO extends PageFormDTO implements Serializable {
private List<String> firstIdList;
private List<String> secondIdList;
/**
* 事件状态 待处理 pending，结案closed
* 事件状态 处理中 pending，已结案 closed
*/
private String status;
/**

4
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java
View File

@ -91,10 +91,10 @@ public class OrgProjectListResultDTO implements Serializable {
* 图片url集合
*/
private List<FileDTO> urlList;
private List<String> imageList;
private String imageUrl;
/**
* 状态 待处理 pending，结案closed
* 状态 处理中 pending，已结案 closed
*/
private String status;
}

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
View File

@ -409,7 +409,7 @@ public class ProjectController {
@PostMapping("orgprojectexport")
public void orgProjectExport(@LoginUser TokenDto tokenDto, @RequestBody OrgProjectListFormDTO formDTO, HttpServletResponse response) throws IOException {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
formDTO.setUserId(tokenDto.getUserId());
formDTO.setIsPage(false);
ExcelWriter excelWriter = null;
formDTO.setPageNo(NumConstant.ONE);

3
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java
View File

@ -113,8 +113,7 @@ public class OrgProjectListExcel {
*/
@ExcelProperty(value = "图片")
@ColumnWidth(30)
@ExcelCollection(name = "图片")
private List<String> imageList;
private String imageUrl;
/**
* 状态 处理中 pending，已结案 closed

54
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
View File

@ -3471,39 +3471,47 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
//3.封装数据
//3-1.查询分类信息
/*IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO();
IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO();
dictFormDto.setCustomerId(formDTO.getCustomerId());
Result<List<IssueProjectCategoryDictDTO>> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto);
Result<List<IssueProjectCategoryDictDTO>> categoryRes = govIssueOpenFeignClient.coutomerCategoryList(dictFormDto);
if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常");
}
Map<String, String> categoryMap = categoryRes.getData().stream().collect(Collectors.toMap(IssueProjectCategoryDictDTO::getId, IssueProjectCategoryDictDTO::getCategoryName));
*///3-2.封装数据
//3-2.封装数据
for (OrgProjectListResultDTO dto : list) {
//分类名称
/*dto.setFirstName(categoryMap.get(dto.getFirstId()));
dto.setSecondName(categoryMap.get(dto.getSecondId()));*/
//工作人员基础信息
/*CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId());
if (null != staffInfo) {
dto.setStaffName(staffInfo.getRealName());
dto.setMobile(staffInfo.getMobile());
}*/
//拼接网格名
/*if (StringUtils.isNoneBlank(dto.getGridId())) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
if (null != gridInfo) {
dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath());
dto.setFirstName(categoryMap.get(dto.getFirstId()));
dto.setSecondName(categoryMap.get(dto.getSecondId()));
try {
//工作人员基础信息
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId());
if (null != staffInfo) {
dto.setStaffName(staffInfo.getRealName());
dto.setMobile(staffInfo.getMobile());
}
} else {
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null != agencyInfo) {
dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName());
//拼接网格名
if (StringUtils.isNoneBlank(dto.getGridId())) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
if (null != gridInfo) {
dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath());
}
} else {
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null != agencyInfo) {
dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName());
}
}
}*/
} catch (Exception e) {
log.warn("获取组织/网格缓存失败");
}
if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) {
List<String> imageList = dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList());
dto.setImageList(imageList);
//String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),String.valueOf((char)10));
String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),"\n");
System.out.println(imageUrl
);
dto.setImageUrl(imageUrl);
}
}

Write Preview
Loading…
Cancel
Save