|
@@ -1813,15 +1813,53 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
int year = calendar.get(Calendar.YEAR);
|
|
|
// 获取统计数据
|
|
|
-
|
|
|
+ // 获取项目统计
|
|
|
+ List<Map<String, String>> listMap = pmDemandMapper.purchaseProjectNumberAnalysisYear(pmDemandReqVo);
|
|
|
+ mapReturn.addAll(listMap);
|
|
|
+ for (int i = minYear; i <= year; i++) {
|
|
|
+ for (Map<String, String> map : listMap) {
|
|
|
+ if (i != Integer.valueOf(map.get("yy"))) {
|
|
|
+ Map<String, String> map1 = new HashMap<>();
|
|
|
+ map1.put("yy", i + "");
|
|
|
+ map1.put("countNum", 0 + "");
|
|
|
+ mapReturn.add(map1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
} else if ("2".equals(pmDemandReqVo.getTimeType())) {
|
|
|
// 当前年份季度统计
|
|
|
// 获取统计数据
|
|
|
-
|
|
|
+ List<Map<String, String>> listMap = pmDemandMapper.purchaseProjectNumberAnalysisQuarter(pmDemandReqVo);
|
|
|
+ mapReturn.addAll(listMap);
|
|
|
+ for (int i = 1; i <= 4; i++) {
|
|
|
+ for (Map<String, String> map : listMap) {
|
|
|
+ int ii = Integer.parseInt(String.valueOf(map.get("yy")));
|
|
|
+ map.put("yy", ii + "");
|
|
|
+ if (i != ii) {
|
|
|
+ Map<String, String> map1 = new HashMap<>();
|
|
|
+ map1.put("yy", i + "");
|
|
|
+ map1.put("countNum", 0 + "");
|
|
|
+ mapReturn.add(map1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
} else if ("3".equals(pmDemandReqVo.getTimeType())) {
|
|
|
// 当前年份月份统计
|
|
|
// 获取统计数据
|
|
|
-
|
|
|
+ List<Map<String, String>> listMap = pmDemandMapper.purchaseProjectNumberAnalysisMonth(pmDemandReqVo);
|
|
|
+ mapReturn.addAll(listMap);
|
|
|
+ for (int i = 1; i <= 12; i++) {
|
|
|
+ for (Map<String, String> map : listMap) {
|
|
|
+ int ii = Integer.parseInt(String.valueOf(map.get("yy")));
|
|
|
+ map.put("yy", ii + "");
|
|
|
+ if (i != ii) {
|
|
|
+ Map<String, String> map1 = new HashMap<>();
|
|
|
+ map1.put("yy", i + "");
|
|
|
+ map1.put("countNum", 0 + "");
|
|
|
+ mapReturn.add(map1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return mapReturn;
|
|
|
}
|