|
@@ -63,7 +63,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
*/
|
|
*/
|
|
private void setDefaultValue(ReportHotelProjectDetail reportHotelProjectDetail) {
|
|
private void setDefaultValue(ReportHotelProjectDetail reportHotelProjectDetail) {
|
|
reportHotelProjectDetail.setCreator(AppContext.getContext().getAccountId());
|
|
reportHotelProjectDetail.setCreator(AppContext.getContext().getAccountId());
|
|
- // todo 其他默认的属性
|
|
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -159,7 +159,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_COST_INFO, queryReportHotelProjectDetailDTO.getCostInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_COST_INFO, queryReportHotelProjectDetailDTO.getCostInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getCostDescription())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getCostDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_COST_DESCRIPTION, queryReportHotelProjectDetailDTO.getCostDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_COST_DESCRIPTION, queryReportHotelProjectDetailDTO.getCostDescription());
|
|
}
|
|
}
|
|
@@ -172,7 +172,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PUBLIC_AREA_POWER_USAGE, queryReportHotelProjectDetailDTO.getPublicAreaPowerUsage());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PUBLIC_AREA_POWER_USAGE, queryReportHotelProjectDetailDTO.getPublicAreaPowerUsage());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getPowerUsageDescription())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getPowerUsageDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_POWER_USAGE_DESCRIPTION, queryReportHotelProjectDetailDTO.getPowerUsageDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_POWER_USAGE_DESCRIPTION, queryReportHotelProjectDetailDTO.getPowerUsageDescription());
|
|
}
|
|
}
|
|
@@ -181,7 +181,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY, queryReportHotelProjectDetailDTO.getAirConditionerEfficiency());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY, queryReportHotelProjectDetailDTO.getAirConditionerEfficiency());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY_EXPLAIN, queryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY_EXPLAIN, queryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain());
|
|
}
|
|
}
|
|
@@ -190,7 +190,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENV_INFO, queryReportHotelProjectDetailDTO.getEnvInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENV_INFO, queryReportHotelProjectDetailDTO.getEnvInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getEnvDescription())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getEnvDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENV_DESCRIPTION, queryReportHotelProjectDetailDTO.getEnvDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENV_DESCRIPTION, queryReportHotelProjectDetailDTO.getEnvDescription());
|
|
}
|
|
}
|
|
@@ -199,7 +199,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_INFO, queryReportHotelProjectDetailDTO.getEnergyWorkOrderInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_INFO, queryReportHotelProjectDetailDTO.getEnergyWorkOrderInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_DESCRIPTION, queryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_DESCRIPTION, queryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription());
|
|
}
|
|
}
|
|
@@ -208,7 +208,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_INFO, queryReportHotelProjectDetailDTO.getPlatformRuntimeInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_INFO, queryReportHotelProjectDetailDTO.getPlatformRuntimeInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getPlatformRuntimeDescription())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getPlatformRuntimeDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_DESCRIPTION, queryReportHotelProjectDetailDTO.getPlatformRuntimeDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_DESCRIPTION, queryReportHotelProjectDetailDTO.getPlatformRuntimeDescription());
|
|
}
|
|
}
|
|
@@ -217,7 +217,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ALARM_DEAL_INFO, queryReportHotelProjectDetailDTO.getAlarmDealInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ALARM_DEAL_INFO, queryReportHotelProjectDetailDTO.getAlarmDealInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getAlarmDealDescription())) {
|
|
if (StringUtils.isNotEmpty(queryReportHotelProjectDetailDTO.getAlarmDealDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ALARM_DEAL_DESCRIPTION, queryReportHotelProjectDetailDTO.getAlarmDealDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ALARM_DEAL_DESCRIPTION, queryReportHotelProjectDetailDTO.getAlarmDealDescription());
|
|
}
|
|
}
|
|
@@ -257,7 +257,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_COST_INFO, pageQueryReportHotelProjectDetailDTO.getCostInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_COST_INFO, pageQueryReportHotelProjectDetailDTO.getCostInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getCostDescription())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getCostDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_COST_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getCostDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_COST_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getCostDescription());
|
|
}
|
|
}
|
|
@@ -270,7 +270,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PUBLIC_AREA_POWER_USAGE, pageQueryReportHotelProjectDetailDTO.getPublicAreaPowerUsage());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PUBLIC_AREA_POWER_USAGE, pageQueryReportHotelProjectDetailDTO.getPublicAreaPowerUsage());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getPowerUsageDescription())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getPowerUsageDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_POWER_USAGE_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getPowerUsageDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_POWER_USAGE_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getPowerUsageDescription());
|
|
}
|
|
}
|
|
@@ -279,7 +279,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY, pageQueryReportHotelProjectDetailDTO.getAirConditionerEfficiency());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY, pageQueryReportHotelProjectDetailDTO.getAirConditionerEfficiency());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY_EXPLAIN, pageQueryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_AIR_CONDITIONER_EFFICIENCY_EXPLAIN, pageQueryReportHotelProjectDetailDTO.getAirConditionerEfficiencyExplain());
|
|
}
|
|
}
|
|
@@ -288,7 +288,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENV_INFO, pageQueryReportHotelProjectDetailDTO.getEnvInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENV_INFO, pageQueryReportHotelProjectDetailDTO.getEnvInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getEnvDescription())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getEnvDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENV_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getEnvDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENV_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getEnvDescription());
|
|
}
|
|
}
|
|
@@ -297,7 +297,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_INFO, pageQueryReportHotelProjectDetailDTO.getEnergyWorkOrderInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_INFO, pageQueryReportHotelProjectDetailDTO.getEnergyWorkOrderInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ENERGY_WORK_ORDER_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getEnergyWorkOrderDescription());
|
|
}
|
|
}
|
|
@@ -306,7 +306,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_INFO, pageQueryReportHotelProjectDetailDTO.getPlatformRuntimeInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_INFO, pageQueryReportHotelProjectDetailDTO.getPlatformRuntimeInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getPlatformRuntimeDescription())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getPlatformRuntimeDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getPlatformRuntimeDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_PLATFORM_RUNTIME_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getPlatformRuntimeDescription());
|
|
}
|
|
}
|
|
@@ -315,7 +315,7 @@ public class ReportHotelProjectDetailServiceImpl extends ServiceImpl<ReportHotel
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ALARM_DEAL_INFO, pageQueryReportHotelProjectDetailDTO.getAlarmDealInfo());
|
|
queryWrapper.eq(ReportHotelProjectDetail.PROP_ALARM_DEAL_INFO, pageQueryReportHotelProjectDetailDTO.getAlarmDealInfo());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
|
|
+
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getAlarmDealDescription())) {
|
|
if (StringUtils.isNotEmpty(pageQueryReportHotelProjectDetailDTO.getAlarmDealDescription())) {
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ALARM_DEAL_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getAlarmDealDescription());
|
|
queryWrapper.like(ReportHotelProjectDetail.PROP_ALARM_DEAL_DESCRIPTION, pageQueryReportHotelProjectDetailDTO.getAlarmDealDescription());
|
|
}
|
|
}
|