diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index 5b964700..74b2b543 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -704,10 +704,7 @@ public class DepotItemController { Map map = new HashMap(); String message = "成功"; try { - Date date = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); - String dateString = formatter.format(date); - List list = Tools.getSixMonth(dateString); + List list = Tools.getLastMonths(6); map.put("monthList", list); List buyPriceList = new ArrayList(); for(String month: list) { diff --git a/src/main/java/com/jsh/erp/utils/Tools.java b/src/main/java/com/jsh/erp/utils/Tools.java index 3902ef1c..4ac93806 100644 --- a/src/main/java/com/jsh/erp/utils/Tools.java +++ b/src/main/java/com/jsh/erp/utils/Tools.java @@ -155,6 +155,27 @@ public class Tools { return new SimpleDateFormat("yyyy-MM").format(cal.getTime()); } + + /** + * 获取当前月份的前6个月(含当前月) + * @param size 月数 + * @return + */ + public static List getLastMonths(int size) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + Calendar c = Calendar.getInstance(); + c.setTime(new Date()); + List list = new ArrayList(size); + for (int i=0;i