From 65c08982f3a2f0c93efd8ba01f286e62fdafb5a4 Mon Sep 17 00:00:00 2001
From: pengfei_liu <pengfei_liu@xinyan.com>
Date: Wed, 14 Oct 2020 14:22:37 +0800
Subject: [PATCH] =?UTF-8?q?#=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=8F=96=E5=89=8D6?=
 =?UTF-8?q?=E4=B8=AA=E6=9C=88=E6=97=A5=E6=9C=9F=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotItemController.java   |  5 +----
 src/main/java/com/jsh/erp/utils/Tools.java    | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 52a26e5f..306c36af 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -706,10 +706,7 @@ public class DepotItemController {
         Map<String, Object> map = new HashMap<String, Object>();
         String message = "成功";
         try {
-            Date date = new Date();
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
-            String dateString = formatter.format(date);
-            List<String> list = Tools.getSixMonth(dateString);
+            List<String> list = Tools.getLastMonths(6);
             map.put("monthList", list);
             List<BigDecimal> buyPriceList = new ArrayList<BigDecimal>();
             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<String> getLastMonths(int size) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        List<String> list = new ArrayList(size);
+        for (int i=0;i<size;i++) {
+            c.setTime(new Date());
+            c.add(Calendar.MONTH, -i);
+            Date m = c.getTime();
+            list.add(sdf.format(m));
+        }
+        Collections.reverse(list);
+        return list;
+    }
+
     /**
      * 获取当前月份的前6个月(含当前月)
      * @param date