Browse Source

修改编译

wanghui 8 years ago
parent
commit
005b783536

+ 1 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -205,7 +205,7 @@ public class WebpageController extends BaseController {
 		List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
 		List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
 		if (userPartner != null && userPartner.size() >= 6) {
-			int index = (int) new Random().nextInt(userPartner.size() - 5);
+			int index = new Random().nextInt(userPartner.size() - 5);
 			reuserPartner.add(userPartner.get(index));
 			reuserPartner.add(userPartner.get(index + 1));
 			reuserPartner.add(userPartner.get(index + 2));
@@ -637,5 +637,4 @@ public class WebpageController extends BaseController {
 			modelview.addObject("banners", banners);
 		}
 	}
-
 }

+ 1 - 0
src/main/java/com/goafanti/customer/bo/UserDetailBo.java

@@ -3,6 +3,7 @@ package com.goafanti.customer.bo;
 import com.goafanti.common.model.User;
 
 public class UserDetailBo extends User{
+	private static final long serialVersionUID = -1468630204351166937L;
 	private String createTimes;
 
 	public String getCreateTimes() {

+ 16 - 21
src/main/java/com/goafanti/customer/controller/CustomerApiController.java

@@ -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));