yinzuomei 3 years ago
parent
commit
f54b3ec42d
  1. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java
  2. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

5
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java

@ -118,5 +118,8 @@ public class IssueProjectCategoryDictDTO implements Serializable {
* 颜色
*/
private String colour;
/**
* 颜色
*/
private String color;
}

1
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@ -659,7 +659,6 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
List<IcEventCategoryAnalysisResDTO> result = new ArrayList<>();
for (IssueProjectCategoryDictDTO dict : res.getData()) {
IcEventCategoryAnalysisResDTO resultDto = ConvertUtils.sourceToTarget(dict, IcEventCategoryAnalysisResDTO.class);
resultDto.setColor(dict.getColour());
resultDto.setTotal(MapUtils.isNotEmpty(resMap) && resMap.containsKey(dict.getCategoryCode()) ? resMap.get(dict.getCategoryCode()).getTotal() : NumConstant.ZERO);
result.add(resultDto);
}

Loading…
Cancel
Save