|
|
|
@@ -463,7 +463,7 @@ public class WxEnergyController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation("费用区间自动时间") |
|
|
|
@PostMapping("periodAutoTimes") |
|
|
|
public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { |
|
|
|
public ResultData periodAutoTimes(@RequestBody WxEnergyFeesTime record) { |
|
|
|
List<Date> dateList = wxEnergyService.findLastTimeEndGroup(record); |
|
|
|
if (null != dateList && dateList.size() > 1 ) { |
|
|
|
return new ResultData(Result.ERROR,"所选店铺表类型最近一次结束时间不相同,不能一起增加"); |
|
|
|
@@ -473,9 +473,14 @@ public class WxEnergyController extends BaseController { |
|
|
|
//之前没有的话,就从年月第一天开始 |
|
|
|
start = DateUtils.stringToDate(record.getPeriod()+"01", DateUtils.DATE_PATTERN_NOSPACE); |
|
|
|
}else { |
|
|
|
//开始时间取接受时间后的一天 |
|
|
|
start = DateUtils.getTimeAfterDays(1, dateList.get(0)); |
|
|
|
start = DateUtils.getDayBegin(start); |
|
|
|
Date _d = dateList.get(0); |
|
|
|
if (null != _d) { |
|
|
|
//开始时间取接受时间后的一天 |
|
|
|
start = DateUtils.getTimeAfterDays(1, _d); |
|
|
|
start = DateUtils.getDayBegin(start); |
|
|
|
}else { |
|
|
|
start = DateUtils.stringToDate(record.getPeriod()+"01", DateUtils.DATE_PATTERN_NOSPACE); |
|
|
|
} |
|
|
|
} |
|
|
|
Date end = DateUtils.getTimeAfterMonths(1, start); |
|
|
|
Map retMap = new HashMap(); |
|
|
|
|