|
|
@@ -483,28 +483,26 @@ public class CustomerApiController extends BaseApiController{
|
|
|
* @return
|
|
|
* @throws ParseException
|
|
|
*/
|
|
|
- @SuppressWarnings("static-access")
|
|
|
@RequestMapping(value = "/customerStatistics",method = RequestMethod.GET)
|
|
|
public Result customerStatistics(String startDate,String endDate,String timeSpan,String depId,Integer pageNo, Integer pageSize) throws ParseException{
|
|
|
Result res = new Result();
|
|
|
Date sDate = null;
|
|
|
Date eDate = null;
|
|
|
- DateUtils dateUtils = new DateUtils();
|
|
|
DateFormat format = new SimpleDateFormat(AFTConstants.YYYYMMDD);
|
|
|
if(StringUtils.isNotBlank(startDate)) sDate = format.parse(startDate);
|
|
|
if(StringUtils.isNotBlank(endDate)) eDate = format.parse(endDate);
|
|
|
if(StringUtils.isBlank(startDate)&&StringUtils.isBlank(endDate)){
|
|
|
Date date = new Date();
|
|
|
if(timeSpan.equals(DateUtils.DAY_SPAN)){
|
|
|
- sDate = dateUtils.getYesterday();
|
|
|
+ sDate = DateUtils.getYesterday();
|
|
|
}else if(timeSpan.equals(DateUtils.WEEK_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastWeek(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
}else if(timeSpan.equals(DateUtils.MONTH_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastMonth(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
}else if(timeSpan.equals(DateUtils.QUARTER_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastQuarter(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
}else if(timeSpan.equals(DateUtils.YEAR_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastYear(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
}
|
|
|
}
|
|
|
res.setData(customerService.customerStatistics(sDate,eDate,depId,pageNo,pageSize));
|
|
|
@@ -523,28 +521,26 @@ public class CustomerApiController extends BaseApiController{
|
|
|
* @return
|
|
|
* @throws ParseException
|
|
|
*/
|
|
|
- @SuppressWarnings("static-access")
|
|
|
@RequestMapping(value = "/businessStatistic", method = RequestMethod.GET)
|
|
|
public Result businessStatistic(String startDate,String endDate,String timeSpan,String depId,String businessGlossoryId,Integer pageNo, Integer pageSize) throws ParseException{
|
|
|
Result res = new Result();
|
|
|
Date sDate = null;
|
|
|
Date eDate = null;
|
|
|
- DateUtils dateUtils = new DateUtils();
|
|
|
DateFormat format = new SimpleDateFormat(AFTConstants.YYYYMMDD);
|
|
|
if(StringUtils.isNotBlank(startDate)) sDate = format.parse(startDate);
|
|
|
if(StringUtils.isNotBlank(endDate)) eDate = format.parse(endDate);
|
|
|
if(StringUtils.isBlank(startDate)&&StringUtils.isBlank(endDate)){
|
|
|
Date date = new Date();
|
|
|
if(timeSpan.equals(DateUtils.DAY_SPAN)){
|
|
|
- sDate = dateUtils.getYesterday();
|
|
|
+ sDate = DateUtils.getYesterday();
|
|
|
}else if(timeSpan.equals(DateUtils.WEEK_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastWeek(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
}else if(timeSpan.equals(DateUtils.MONTH_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastMonth(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
}else if(timeSpan.equals(DateUtils.QUARTER_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastQuarter(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
}else if(timeSpan.equals(DateUtils.YEAR_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastYear(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
}
|
|
|
}
|
|
|
res.setData(customerService.businessStatistic(sDate,eDate,depId,businessGlossoryId,pageNo,pageSize));
|
|
|
@@ -563,28 +559,27 @@ public class CustomerApiController extends BaseApiController{
|
|
|
* @return
|
|
|
* @throws ParseException
|
|
|
*/
|
|
|
- @SuppressWarnings("static-access")
|
|
|
+
|
|
|
@RequestMapping(value = "/followStatistic",method = RequestMethod.GET)
|
|
|
public Result followStatistic(String startDate,String endDate,String timeSpan,String depId,String businessGlossoryId,Integer pageNo, Integer pageSize) throws ParseException{
|
|
|
Result res = new Result();
|
|
|
Date sDate = null;
|
|
|
Date eDate = null;
|
|
|
- DateUtils dateUtils = new DateUtils();
|
|
|
DateFormat format = new SimpleDateFormat(AFTConstants.YYYYMMDD);
|
|
|
if(StringUtils.isNotBlank(startDate)) sDate = format.parse(startDate);
|
|
|
if(StringUtils.isNotBlank(endDate)) eDate = format.parse(endDate);
|
|
|
if(StringUtils.isBlank(startDate)&&StringUtils.isBlank(endDate)){
|
|
|
Date date = new Date();
|
|
|
if(timeSpan.equals(DateUtils.DAY_SPAN)){
|
|
|
- sDate = dateUtils.getYesterday();
|
|
|
+ sDate = DateUtils.getYesterday();
|
|
|
}else if(timeSpan.equals(DateUtils.WEEK_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastWeek(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
}else if(timeSpan.equals(DateUtils.MONTH_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastMonth(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
}else if(timeSpan.equals(DateUtils.QUARTER_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastQuarter(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
}else if(timeSpan.equals(DateUtils.YEAR_SPAN)){
|
|
|
- sDate = dateUtils.getLastDayOfLastYear(date);
|
|
|
+ sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
}
|
|
|
}
|
|
|
res.setData(customerService.followStatistic(sDate, eDate, businessGlossoryId, depId, pageNo, pageSize));
|