Browse Source

碳足迹报告与碳足迹证书权限过滤bug修复,相关功能优化

qingyuan_dev_new
xiachao 1 year ago
parent
commit
f8f940b5bb
  1. 21
      modules/carbon-track/src/main/java/com/thing/carbontrack/certification/service/impl/IotCarbonCertificateServiceImpl.java
  2. 2
      modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonResultReport.java

21
modules/carbon-track/src/main/java/com/thing/carbontrack/certification/service/impl/IotCarbonCertificateServiceImpl.java

@ -50,19 +50,6 @@ public class IotCarbonCertificateServiceImpl extends BaseServiceImpl<IotCarbonCe
@Override
public QueryWrapper getWrapper(Map<String, Object> params) {
String companyName = MapUtils.getString(params, "companyName");
List<Long> tenantCodes =
tenantDetailService
.list(
QueryWrapper.create()
.like(
SysTenantDetailEntity::getName,
companyName,
StringUtils::isNotBlank))
.stream()
.map(SysTenantDetailEntity::getId)
.toList();
String productName = MapUtils.getString(params, "productName");
String certificationOrg = MapUtils.getString(params, "certificationOrg");
Integer shared = MapUtils.getInteger(params, "shared");
@ -78,12 +65,8 @@ public class IotCarbonCertificateServiceImpl extends BaseServiceImpl<IotCarbonCe
StringUtils::isNotBlank)
.in(
IotCarbonCertificateEntity::getTenantCode,
tenantCodes,
CollectionUtils.isNotEmpty(tenantCodes))
.eq(
IotCarbonCertificateEntity::getTenantCode,
-1,
Objects.nonNull(companyName) && CollectionUtils.isEmpty(tenantCodes))
List.of(UserContext.getTenantCode()),
CollectionUtils.isNotEmpty( List.of(UserContext.getTenantCode())))
.eq(IotCarbonCertificateEntity::getShared, shared, Objects::nonNull);
return queryWrapper;
}

2
modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonResultReport.java

@ -88,6 +88,6 @@ public class IotCarbonResultReport {
if (Objects.isNull(value)) {
return null;
}
return value.multiply(BigDecimal.valueOf(100)).divide(count, 1, RoundingMode.HALF_UP);
return value.multiply(BigDecimal.valueOf(100)).divide(count, 4, RoundingMode.HALF_UP);
}
}
Loading…
Cancel
Save