|
|
|
@ -47,7 +47,8 @@ public class DealDataJob {
|
|
|
|
|
Date date = new Date(); |
|
|
|
|
String curDate = sdf1.format(date); |
|
|
|
|
String name = dealDataService.customName(); |
|
|
|
|
if (name != null && name.contains("华夏学院")) { |
|
|
|
|
if (name != null |
|
|
|
|
&& (name.contains(Constant.CUSTOM_NAME_HUAXIA) || name.contains(Constant.CUSTOM_NAME_GUANGSHANG))) { |
|
|
|
|
dealDataService.proEnergy2(curDate); |
|
|
|
|
} else { |
|
|
|
|
dealDataService.proEnergy(curDate); //yyyy-MM-dd HH:00:00
|
|
|
|
@ -141,7 +142,8 @@ public class DealDataJob {
|
|
|
|
|
Date date = new Date(); |
|
|
|
|
String curDate = sdf1.format(date); |
|
|
|
|
String name = dealDataService.customName(); |
|
|
|
|
if (name != null && name.contains("华夏学院")) { |
|
|
|
|
if (name != null |
|
|
|
|
&& (name.contains(Constant.CUSTOM_NAME_HUAXIA) || name.contains(Constant.CUSTOM_NAME_GUANGSHANG))) { |
|
|
|
|
dealDataService.proEnergySum2(curDate); |
|
|
|
|
} else { |
|
|
|
|
dealDataService.proEnergySum(curDate); |
|
|
|
|