wangbo пре 4 година
родитељ
комит
283f3176a7

+ 48 - 2
operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -12,6 +12,8 @@ import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -160,12 +162,36 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
 
     @Override
     public List<Map<String, Object>> eventMonthStatistics(WorkOrderManageDto workOrderManageDto) {
-        return workOrderManageMapper.eventMonthStatistics(workOrderManageDto);
+        String strMonth = workOrderManageDto.getStartDate().substring(5,7);
+        int days = Integer.parseInt(strMonth);
+        List<Map<String,Object>> list = workOrderManageMapper.eventMonthStatistics(workOrderManageDto);
+        for(int i=0; i<days; i++){
+            String strDate =  workOrderManageDto.getStartDate().substring(0,7) + String.format("-%2d",i+1);
+            Map<String,Object> map = list.get(i);
+            if(!map.get("日期").toString().equals(strDate)) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("数量", 0);
+                data.put("日期", strDate);
+                list.add(i, data);
+            }
+        }
+        return list;
     }
 
     @Override
     public List<Map<String, Object>> eventYearStatistics(WorkOrderManageDto workOrderManageDto) {
-        return workOrderManageMapper.eventYearStatistics(workOrderManageDto);
+        List<Map<String,Object>> list = workOrderManageMapper.eventYearStatistics(workOrderManageDto);
+        for(int i=0; i<12; i++){
+            String strDate =  workOrderManageDto.getStartDate().substring(0,4) + String.format("-%2d",i+1);
+            Map<String,Object> map = list.get(i);
+            if(!map.get("日期").toString().equals(strDate)) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("数量", 0);
+                data.put("日期", strDate);
+                list.add(i, data);
+            }
+        }
+        return list;
     }
 
     @Override
@@ -183,4 +209,24 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     public List<WorkOrderManageDto> selectMaintainOrder(WorkOrderManageDto workOrderManageDto) {
         return workOrderManageMapper.selectMaintainOrder(workOrderManageDto);
     }
+
+
+    /**
+     *获取某月有多少天
+     */
+    private int getDaysByYearMonth(int month) {
+
+        Calendar a =Calendar.getInstance();
+
+        a.set(Calendar.MONTH, month- 1);
+
+        a.set(Calendar.DATE, 1);
+
+        a.roll(Calendar.DATE,-1);
+
+        int maxDate =a.get(Calendar.DATE);
+
+        return maxDate;
+
+    }
 }