11111

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

@@ -1,17 +1,20 @@
 package org.jeecg.modules.fbsPuArrivalvouch.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs;
+import org.jeecg.modules.fbsPuArrivalvouch.mapper.FbsArrivalVouchsMapper;
 import org.jeecg.modules.fbsPuArrivalvouch.service.IFbsArrivalVouchsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -45,6 +48,8 @@ import com.alibaba.fastjson.JSON;
 public class FbsArrivalVouchsController {
 	@Autowired
 	private IFbsArrivalVouchsService fbsArrivalVouchsService;
+	@Resource
+	private FbsArrivalVouchsMapper fbsArrivalVouchsMapper;
 
 
 	 /**
@@ -88,9 +93,17 @@ public class FbsArrivalVouchsController {
 		try {
 
 			List<Map<String,Object>> map = fbsArrivalVouchsService.getLastSixMonthQualityTargetCompare();
-
+			int percentage = fbsArrivalVouchsMapper.selectPercentage();
             if(map.size() > 0){
                 for (Map<String,Object> m:map){
+					BigDecimal num = new BigDecimal("0");
+					BigDecimal target = new BigDecimal(m.get("target").toString());
+					BigDecimal real = new BigDecimal(m.get("real").toString());
+					num = real.divide(target).multiply(new BigDecimal("100"));
+					m.put("real",num);
+                	if(percentage > 0){
+						m.put("target",percentage);
+					}
                     m.put("label",m.get("month"));
                     m.put("label1", "质量目标");
 

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

@@ -26,4 +26,10 @@ public interface FbsArrivalVouchsMapper extends BaseMapper<FbsArrivalVouchs> {
      */
     public List<Map<String,Object>> getLastSixMonthQualityTargetCompare();
 
+    /**
+     * 获取百分比
+     * @return
+     */
+    public int selectPercentage();
+
 }

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

@@ -59,4 +59,9 @@
         order by CONVERT(varchar(7), b.dDate,23) desc
 
     </select>
+    
+    <select id="selectPercentage" resultType="int">
+        select IFNULL(id,0) from aa_bank
+    </select>
+    
 </mapper>