调整错误

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -88,26 +88,23 @@ public class invCardManageAction implements IMINAction {
 		cal.add(Calendar.WEEK_OF_MONTH, 0);
 		cal.set(Calendar.DAY_OF_WEEK, 2);
 		Date weekFristDate = cal.getTime();
-		String weekDate = DateUtil.format(weekFristDate,"yyyyMMdd");
 		//按时间查询
 		String time = null;
 		if("0".equals(dateFlag)) {
 			m.put("nowDate", nowDate);
 			Date  parse = new SimpleDateFormat("yyyyMMdd").parse(nowDate);
-			String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
+			String  dateString = DateUtil.getCurrentDateString();
 			time = dateString;
 		}else if("1".equals(dateFlag)) {
 			m.put("yesDate", yesDate);
 			Date  parse = new SimpleDateFormat("yyyyMMdd").parse(yesDate);
-			String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
+			String  dateString = DateUtil.getCurrentDateString();
 			time = dateString;
 		}else if("2".equals(dateFlag)) {
-			m.put("weekDate", weekDate);
-			Date  parse = new SimpleDateFormat("yyyyMMdd").parse(weekDate);
-			String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
-			Date  parseb = new SimpleDateFormat("yyyyMMdd").parse(nowDate);
-			String  dateStringb = new SimpleDateFormat("yyyy-MM-dd").format(parseb);
+			String dateString = DateUtil.getDifferentDate(-7).substring(0,8);
+			String dateStringb = DateUtil.getCurrentDateString();
 			 time = dateString.concat(" 至 ").concat(dateStringb);
+			m.put("weekDate", dateString);
 		}
 		if(!Constant.ADMINISTRATION_SYSTEM_NUMBER.equals(user.getBranchId())){
 			m.put("branchId",user.getBranchId());