Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/job/controller/HrIndexController.java

@@ -147,13 +147,31 @@ public class HrIndexController {
         try{
             Map<String,Object> map = new HashMap();
 
+            SimpleDateFormat sdf = new SimpleDateFormat("MM");
+
+            Date now = new Date();
+
+            Date lastMonth1 = getLastMonth(now);
+            Date lastMonth2 = getLastMonth(lastMonth1);
+            Date lastMonth3 = getLastMonth(lastMonth2);
+            Date lastMonth4 = getLastMonth(lastMonth3);
+            Date lastMonth5 = getLastMonth(lastMonth4);
+            Date lastMonth6 = getLastMonth(lastMonth5);
+
+            String monthStr1 = sdf.format(lastMonth1);
+            String monthStr2 = sdf.format(lastMonth2);
+            String monthStr3 = sdf.format(lastMonth3);
+            String monthStr4 = sdf.format(lastMonth4);
+            String monthStr5 = sdf.format(lastMonth5);
+            String monthStr6 = sdf.format(lastMonth6);
+
             List<String> xAxisList = new ArrayList<>();
-            xAxisList.add("一月");
-            xAxisList.add("二月");
-            xAxisList.add("三月");
-            xAxisList.add("四月");
-            xAxisList.add("五月");
-            xAxisList.add("六月");
+            xAxisList.add(monthStr6+"月");
+            xAxisList.add(monthStr5+"月");
+            xAxisList.add(monthStr4+"月");
+            xAxisList.add(monthStr3+"月");
+            xAxisList.add(monthStr2+"月");
+            xAxisList.add(monthStr1+"月");
 
             map.put("xAxisList",xAxisList);
 
@@ -227,4 +245,13 @@ public class HrIndexController {
     }
 
 
+    private Date getLastMonth(Date date){
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.MONTH,-1);
+        Date lastMonth = cal.getTime();
+        return lastMonth;
+    }
+
+
 }