From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
index 5ebf949..f178344 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
@@ -1,18 +1,22 @@
package com.consum.base.controller;
-import cn.hutool.core.convert.Convert;
-import com.consum.base.BaseController;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.model.po.FinSysTenantUser;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
+import com.consum.base.BaseController;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.web.ResponseValue;
+
+import cn.hutool.core.convert.Convert;
+import io.swagger.annotations.Api;
/**
* @ClassName LWhHomeStatisticsController
@@ -39,7 +43,19 @@
/*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
FinSysTenantUser sysInfo = this.getSysInfo();
String tenantId = sysInfo.getTenantId();
- List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0l));
+ List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0L));
+ if (CollectionUtils.isEmpty(goodsNumPrice)){
+ return ResponseValue.success();
+ }
return ResponseValue.success(goodsNumPrice.get(0));
}
+
+ @GetMapping("getGoodsNumByMonth")
+ public ResponseValue getGoodsNumByMonth() {
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumByMonth(Convert.toLong(tenantId, 0L));
+ return ResponseValue.success(goodsNumPrice);
+ }
}
--
Gitblit v1.9.1