Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java

@@ -140,8 +140,9 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("  GPFK_LFSL,WOGYLX_GXBZ ");
         sqlMap.append("from GPFK  ");
         sqlMap.append("  left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX ");
+        sqlMap.append("  left join BZGX on BZGX_ID = WOGYLX_BZGXID  ");
         sqlMap.append("where ( GPFK_FKSJ >= :pKsrq and GPFK_FKSJ < :pJsrq ) ");
-        sqlMap.append("  and ").append("WOGYLX_GXBZ", gxbzs);
+        sqlMap.append("  and ").append("WOGYLX_BZGXID", gxbzs);
         sqlMap.setParamValue("pKsrq", DateUtils.beginOfDay(date));
         sqlMap.setParamValue("pJsrq", DateUtils.endOfDay(date));
         return sqlMap.query(Gpfk.class);

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/utils/KwellParamEnum.java

@@ -9,7 +9,8 @@ import java.util.List;
 @GavelParams("901000000")
 public enum KwellParamEnum {
 
-	DASHBOARD_HGL("KWELL001","合格率按生产工序标志设置", "B", "合格率按生产工序标志设置", "E", "S:首工序;Z:中间工序;M:末工序;D:单道工序", "S", "首工序"),
+	DASHBOARD_HGL("KWELL001", "合格率按检验工序设置", "B", "合格率按检验工序设置", "E",
+			"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N' and BZGX_GXLX = 'JY' order by BZGX_CODE", "", ""),
     DASHBORAD_PDF("PDF","配置大屏看板PDF文件路径", "B", "配置大屏看板PDF文件路径", "S", "", "D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\pdf\\dashboard.pdf", ""),
 	DASHBORAD_VIDEO("VIDEO","配置大屏看板视频路径" ,"B","配置大屏看板视频路径","S","","D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4","");
 

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;
 	}