diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
index cd35a12..561c0ad 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
@@ -29,5 +29,5 @@
 
     void addStaffList(@Param("list") List<MeterStaffImport> list);
 
-    List<MeterWorkbenchResponse> meterStaffStatistic();
+    List<MeterWorkbenchResponse> meterStaffStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime);
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
index cd35a12..561c0ad 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
@@ -29,5 +29,5 @@
 
     void addStaffList(@Param("list") List<MeterStaffImport> list);
 
-    List<MeterWorkbenchResponse> meterStaffStatistic();
+    List<MeterWorkbenchResponse> meterStaffStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
index 75e5d51..4ac3c2e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.meter.MeterWorkbenchResponse;
 import com.casic.missiles.dto.meter.TrainPlanDetailResponse;
 import com.casic.missiles.model.MeterTrainPlan;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,5 +23,5 @@
 
     Long selectMaxTrainPlanNo();
 
-    List<MeterWorkbenchResponse> meterTrainStatistic();
+    List<MeterWorkbenchResponse> meterTrainStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime);
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
index cd35a12..561c0ad 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
@@ -29,5 +29,5 @@
 
     void addStaffList(@Param("list") List<MeterStaffImport> list);
 
-    List<MeterWorkbenchResponse> meterStaffStatistic();
+    List<MeterWorkbenchResponse> meterStaffStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
index 75e5d51..4ac3c2e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.meter.MeterWorkbenchResponse;
 import com.casic.missiles.dto.meter.TrainPlanDetailResponse;
 import com.casic.missiles.model.MeterTrainPlan;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,5 +23,5 @@
 
     Long selectMaxTrainPlanNo();
 
-    List<MeterWorkbenchResponse> meterTrainStatistic();
+    List<MeterWorkbenchResponse> meterTrainStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
index 5ba1df4..a2296ac 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
@@ -97,15 +97,17 @@
     <select id="meterStaffStatistic" resultType="com.casic.missiles.dto.meter.MeterWorkbenchResponse">
         SELECT
             DATE_FORMAT( work_date, '%Y-%m' ) AS `date`,
-        COUNT( 1 ) AS `count`
-            FROM
-                meter_staff
-            WHERE
-                is_del = 0
-            GROUP BY
-                DATE_FORMAT( work_date, '%Y-%m' )
-            ORDER BY
-                DATE_FORMAT( work_date, '%Y-%m' )
+            COUNT( 1 ) AS `count`
+        FROM
+            meter_staff
+        WHERE
+            is_del = 0
+          and DATE_FORMAT( work_date, '%Y-%m' ) &gt;= #{startTime}
+          and DATE_FORMAT( work_date, '%Y-%m' ) &lt;= #{endTime}
+        GROUP BY
+            DATE_FORMAT( work_date, '%Y-%m' )
+        ORDER BY
+            DATE_FORMAT( work_date, '%Y-%m' )
     </select>
 
     <select id="getMaxNo" resultType="java.lang.Long">

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
index cd35a12..561c0ad 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
@@ -29,5 +29,5 @@
 
     void addStaffList(@Param("list") List<MeterStaffImport> list);
 
-    List<MeterWorkbenchResponse> meterStaffStatistic();
+    List<MeterWorkbenchResponse> meterStaffStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
index 75e5d51..4ac3c2e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.meter.MeterWorkbenchResponse;
 import com.casic.missiles.dto.meter.TrainPlanDetailResponse;
 import com.casic.missiles.model.MeterTrainPlan;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,5 +23,5 @@
 
     Long selectMaxTrainPlanNo();
 
-    List<MeterWorkbenchResponse> meterTrainStatistic();
+    List<MeterWorkbenchResponse> meterTrainStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
index 5ba1df4..a2296ac 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
@@ -97,15 +97,17 @@
     <select id="meterStaffStatistic" resultType="com.casic.missiles.dto.meter.MeterWorkbenchResponse">
         SELECT
             DATE_FORMAT( work_date, '%Y-%m' ) AS `date`,
-        COUNT( 1 ) AS `count`
-            FROM
-                meter_staff
-            WHERE
-                is_del = 0
-            GROUP BY
-                DATE_FORMAT( work_date, '%Y-%m' )
-            ORDER BY
-                DATE_FORMAT( work_date, '%Y-%m' )
+            COUNT( 1 ) AS `count`
+        FROM
+            meter_staff
+        WHERE
+            is_del = 0
+          and DATE_FORMAT( work_date, '%Y-%m' ) &gt;= #{startTime}
+          and DATE_FORMAT( work_date, '%Y-%m' ) &lt;= #{endTime}
+        GROUP BY
+            DATE_FORMAT( work_date, '%Y-%m' )
+        ORDER BY
+            DATE_FORMAT( work_date, '%Y-%m' )
     </select>
 
     <select id="getMaxNo" resultType="java.lang.Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
index 4777ff8..a4535ac 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
@@ -53,6 +53,8 @@
             meter_train_plan
         WHERE
             is_del = 0
+          and DATE_FORMAT( train_time, '%Y-%m' ) &gt;= #{startTime}
+          and DATE_FORMAT( train_time, '%Y-%m' ) &lt;= #{endTime}
         GROUP BY
             DATE_FORMAT( train_time, '%Y-%m' )
         ORDER BY

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
index cd35a12..561c0ad 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java
@@ -29,5 +29,5 @@
 
     void addStaffList(@Param("list") List<MeterStaffImport> list);
 
-    List<MeterWorkbenchResponse> meterStaffStatistic();
+    List<MeterWorkbenchResponse> meterStaffStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
index 75e5d51..4ac3c2e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.meter.MeterWorkbenchResponse;
 import com.casic.missiles.dto.meter.TrainPlanDetailResponse;
 import com.casic.missiles.model.MeterTrainPlan;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,5 +23,5 @@
 
     Long selectMaxTrainPlanNo();
 
-    List<MeterWorkbenchResponse> meterTrainStatistic();
+    List<MeterWorkbenchResponse> meterTrainStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
index 5ba1df4..a2296ac 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
@@ -97,15 +97,17 @@
     <select id="meterStaffStatistic" resultType="com.casic.missiles.dto.meter.MeterWorkbenchResponse">
         SELECT
             DATE_FORMAT( work_date, '%Y-%m' ) AS `date`,
-        COUNT( 1 ) AS `count`
-            FROM
-                meter_staff
-            WHERE
-                is_del = 0
-            GROUP BY
-                DATE_FORMAT( work_date, '%Y-%m' )
-            ORDER BY
-                DATE_FORMAT( work_date, '%Y-%m' )
+            COUNT( 1 ) AS `count`
+        FROM
+            meter_staff
+        WHERE
+            is_del = 0
+          and DATE_FORMAT( work_date, '%Y-%m' ) &gt;= #{startTime}
+          and DATE_FORMAT( work_date, '%Y-%m' ) &lt;= #{endTime}
+        GROUP BY
+            DATE_FORMAT( work_date, '%Y-%m' )
+        ORDER BY
+            DATE_FORMAT( work_date, '%Y-%m' )
     </select>
 
     <select id="getMaxNo" resultType="java.lang.Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
index 4777ff8..a4535ac 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
@@ -53,6 +53,8 @@
             meter_train_plan
         WHERE
             is_del = 0
+          and DATE_FORMAT( train_time, '%Y-%m' ) &gt;= #{startTime}
+          and DATE_FORMAT( train_time, '%Y-%m' ) &lt;= #{endTime}
         GROUP BY
             DATE_FORMAT( train_time, '%Y-%m' )
         ORDER BY
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java
index de1cfae..07925f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java
@@ -24,14 +24,16 @@
 import com.casic.missiles.modular.system.model.RuRelation;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.meter.MeterWorkbenchService;
+import com.sun.jna.platform.win32.OaIdl;
+import javafx.scene.effect.MotionBlur;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("MeterWorkbenchService")
 public class MeterWorkbenchServiceImpl implements MeterWorkbenchService {
@@ -94,14 +96,48 @@
 
     @Override
     public ReturnDTO meterStaffStatistic() {
-        List<MeterWorkbenchResponse> resList = meterStaffMapper.meterStaffStatistic();
-        return ReturnUtil.success(resList);
+        String endTime = DateUtil.format(new Date(),"yyyy-MM");
+        String startTime = getStartTime();
+        List<MeterWorkbenchResponse> resList = meterStaffMapper.meterStaffStatistic(startTime,endTime);
+        if(resList.size()<12){
+            List<String> monthList = getMonthList(12);
+            resList.forEach(result->{
+                monthList.remove(result.getDate());
+            });
+            for (String month : monthList) {
+                MeterWorkbenchResponse result = new MeterWorkbenchResponse();
+                result.setDate(month);
+                result.setCount("0");
+                resList.add(result);
+            }
+        }
+        List<MeterWorkbenchResponse> newList = resList.stream().
+                sorted(Comparator.comparing(MeterWorkbenchResponse::getDate)).
+                collect(Collectors.toList());
+        return ReturnUtil.success(newList);
     }
 
     @Override
     public ReturnDTO meterTrainStatistic() {
-        List<MeterWorkbenchResponse>  resList = trainPlanMapper.meterTrainStatistic();
-        return ReturnUtil.success(resList);
+        String endTime = DateUtil.format(new Date(),"yyyy-MM");
+        String startTime = getStartTime();
+        List<MeterWorkbenchResponse>  resList = trainPlanMapper.meterTrainStatistic(startTime,endTime);
+        if(resList.size()<12){
+            List<String> monthList = getMonthList(12);
+            resList.forEach(result->{
+                monthList.remove(result.getDate());
+            });
+            for (String month : monthList) {
+                MeterWorkbenchResponse result = new MeterWorkbenchResponse();
+                result.setDate(month);
+                result.setCount("0");
+                resList.add(result);
+            }
+        }
+        List<MeterWorkbenchResponse> newList = resList.stream().
+                sorted(Comparator.comparing(MeterWorkbenchResponse::getDate)).
+                collect(Collectors.toList());
+        return ReturnUtil.success(newList);
     }
 
     @Override
@@ -163,4 +199,31 @@
         RuRelation ruRelation = ruRelationMapper.selectOne(ruRelationWrapper);
         return ObjectUtil.isNotEmpty(ruRelation);
     }
+
+    public List<String> getMonthList(Integer count) {
+        List<String> resList = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+            Date date = new Date();
+            Calendar calendar = Calendar.getInstance();
+            // 设置为当前时间
+            calendar.setTime(date);
+            calendar.add(Calendar.MONTH,-i);
+            // 设置为上一个月
+            date = calendar.getTime();
+            String dateStr = format.format(date);
+            resList.add(dateStr);
+        }
+        return resList;
+    }
+    public String getStartTime() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();
+        // 设置为当前时间
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH,-12);
+        date = calendar.getTime();
+        return format.format(date);
+    }
 }