代码调整

gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java

@@ -2,6 +2,7 @@ package com.gavel.kwell.service.impl;
 
 import com.gavel.common.base.service.impl.BaseEditServiceImpl;
 import com.gavel.common.business.service.CommonService;
+import com.gavel.common.utils.CollectionUtils;
 import com.gavel.common.utils.DateUtils;
 import com.gavel.common.utils.NumberUtils;
 import com.gavel.common.utils.StringUtils;
@@ -134,11 +135,17 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
         for(Date date : dateList){
             GpfkHgVO gpfkHgVO = new GpfkHgVO();
             List<Gpfk> gpfks = gpfkcxDao.queryGpfk(date,gxbzs);
-            Double fksl =  gpfks.stream().mapToDouble(Gpfk::getFksl).sum();
-            Double hgsl =  gpfks.stream().mapToDouble(Gpfk::getHgsl).sum();
-            gpfkHgVO.setFkrq(date);
-            gpfkHgVO.setFksl(fksl);
-            gpfkHgVO.setHgsl(hgsl);
+            Integer fksl =0;
+            Double hgsl =0.0;
+            if(CollectionUtils.isNotEmpty(gpfks)){
+                fksl= gpfks.size();
+                hgsl =  gpfks.stream().mapToDouble(Gpfk::getHgsl).sum();
+                gpfkHgVO.setFksl(fksl);
+                gpfkHgVO.setHgsl(hgsl);
+            }else {
+                gpfkHgVO.setFksl(fksl);
+                gpfkHgVO.setHgsl(hgsl);
+            }
             gpfkHgVOList.add(gpfkHgVO);
         }
         return gpfkHgVOList;

gavel/src/main/java/com/gavel/kwell/vo/GpfkHgVO.java

@@ -9,7 +9,7 @@ public class GpfkHgVO extends BaseEntity {
 
 	private Date fkrq;
 
-	private Double fksl;//反馈数量
+	private Integer fksl;//反馈数量
 
 	private Double hgsl;//合格数量
 
@@ -21,11 +21,11 @@ public class GpfkHgVO extends BaseEntity {
 		this.fkrq = fkrq;
 	}
 
-	public Double getFksl() {
+	public Integer getFksl() {
 		return fksl;
 	}
 
-	public void setFksl(Double fksl) {
+	public void setFksl(Integer fksl) {
 		this.fksl = fksl;
 	}