11111

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsArrivalVouchsController.java

@@ -88,6 +88,18 @@ public class FbsArrivalVouchsController {
 		try {
 
 			List<Map<String,Object>> map = fbsArrivalVouchsService.getLastSixMonthQualityTargetCompare();
+
+            if(map.size() > 0){
+                for (Map<String,Object> m:map){
+                    m.put("label",m.get("month"));
+                    m.put("label1", "质量目标");
+
+                    m.put("sum1",m.get("target"));
+                    m.put("label2", "合格率");
+                    m.put("sum2",m.get("real"));
+                }
+            }
+
 			result.setResult(map);
 			result.success("操作成功");
 

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsArrivalVouchsMapper.xml

@@ -28,8 +28,8 @@
 
     <select id="getLastSixMonthQualityTargetCompare" resultType="java.util.HashMap">
 
-        select  top 6 CONVERT(varchar(7), b.dDate,23) month, sum(a.iQuantity) target, sum(a.fRealQuantity ),
+        select  top 6 CONVERT(varchar(7), b.dDate,23) month, sum(a.fRealQuantity) target, sum(a.fRealQuantity ) fRealQuantity,
-        sum(a.fValidQuantity) real,sum(a.fValidInQuan)
+        sum(a.fValidQuantity) real,sum(a.fValidInQuan) as fValidInQuan
         from  PU_ArrivalVouchs a
         left join PU_ArrivalVouch b on a.id = b.id
         group by CONVERT(varchar(7), b.dDate,23)