袁少华 4 lat temu
rodzic
commit
c9298953dd

+ 11 - 4
src/main/java/org/jeecg/modules/fbsRdrecord32/controller/FbsRdrecords32Controller.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsRdrecord32.controller;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -52,12 +53,18 @@ public class FbsRdrecords32Controller {
 	  */
 
 	@RequestMapping(value = "getMonthSend")
-	public Result<List<Map<String,Object>>> getMonthSend(){
-		Result<List<Map<String,Object>>> result = new Result<>();
-
+	public Result<Map<String,Object>> getMonthSend(){
+		Result<Map<String,Object>> result = new Result<>();
+		Map<String,Object> mapList = new HashMap<>();
 		try {
 			List<Map<String,Object>> map = fbsRdrecords32Service.getMonthSend();
-			result.setResult(map);
+			if(map.size() > 0){
+				for (Map<String,Object> m:map){
+					mapList.put(m.get("cInvCName").toString(),m.get("iQuantity"));
+				}
+			}
+
+			result.setResult(mapList);
 			result.success("成功");
 
 		}catch (Exception e){

+ 6 - 1
src/main/java/org/jeecg/modules/fbsRdrecord32/mapper/xml/FbsRdrecords32Mapper.xml

@@ -4,7 +4,12 @@
 
     <select id="getMonthSend" resultType="java.util.HashMap">
 
-
+    select top 5 c.cInvCName,sum(a.iQuantity) iQuantity from rdrecords32 a
+        left join rdrecord32 d on a.id = d.id
+        left join Inventory b on b.cInvCode = a.cInvCode
+        left join InventoryClass c on b.cInvCCode = c.cInvCCode
+     where CONVERT(varchar(7),d.dDate,120) like CONVERT(varchar(7),getdate(),120)
+	  GROUP BY c.cInvCName
 
     </select>
 

+ 2 - 0
src/main/java/org/jeecg/modules/fbsRdrecord32/service/impl/FbsRdrecord32ServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsRdrecord32.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.fbsRdrecord32.entity.FbsRdrecord32;
 import org.jeecg.modules.fbsRdrecord32.mapper.FbsRdrecord32Mapper;
 import org.jeecg.modules.fbsRdrecord32.service.IFbsRdrecord32Service;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @version: V1.0
  */
 @Service
+@DS("multi-datasource1")
 public class FbsRdrecord32ServiceImpl extends ServiceImpl<FbsRdrecord32Mapper, FbsRdrecord32> implements IFbsRdrecord32Service {
 
 }

+ 2 - 0
src/main/java/org/jeecg/modules/fbsRdrecord32/service/impl/FbsRdrecords32ServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsRdrecord32.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.fbsRdrecord32.entity.FbsRdrecords32;
 import org.jeecg.modules.fbsRdrecord32.mapper.FbsRdrecords32Mapper;
 import org.jeecg.modules.fbsRdrecord32.service.IFbsRdrecords32Service;
@@ -18,6 +19,7 @@ import java.util.Map;
  * @version: V1.0
  */
 @Service
+@DS("multi-datasource1")
 public class FbsRdrecords32ServiceImpl extends ServiceImpl<FbsRdrecords32Mapper, FbsRdrecords32> implements IFbsRdrecords32Service {
     @Resource
     private FbsRdrecords32Mapper fbsRdrecords32Mapper;