调整bug

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

@@ -156,17 +156,20 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("from GPFKJG  ");
         sqlMap.append("  left join WOGYLX on WOGYLX_ID = GPFKJG_FKGX ");
         sqlMap.append("  left join BZGX on BZGX_ID = WOGYLX_BZGXID  ");
-        sqlMap.append("where (GPFKJG_FKSJ >= :pStart and GPFKJG_FKSJ < :pEnd) and  (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");
-        sqlMap.setParamValue("pStart", DateUtils.beginOfDay(DateUtils.getCurrentWeekDateBegin(date)));
-        sqlMap.setParamValue("pEnd", DateUtils.endOfDay(DateUtils.getCurrentWeekDateEnd(date)));
+        sqlMap.append("where (GPFKJG_FKSJ >= :pKsrq and GPFKJG_FKSJ < :pJsrq) and  (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");
         sqlMap.setParamValue("pDGxbz", GxlxGxbzEnum.ONLY.getId());
         sqlMap.setParamValue("pMGxbz", GxlxGxbzEnum.LAST.getId());
         if(StringUtils.isNotEmpty(woid)){
             sqlMap.append("  and WOGYLX_WOID = :pWoid ");
             sqlMap.setParamValue("pWoid", woid);
         }else {
-            sqlMap.append("  and isnull(WOGYLX_WOID,'') <> '' ");
+            sqlMap.append(" and  exists(select 1 from PCJHMX where PCJHMX_WOID = WOGYLX_WOID ");
+            sqlMap.append(" and( ( :pKsrq <= PCJHMX_JHRQ and U_PCJHMX_JSRQ <= :pJsrq ) ");
+            sqlMap.append(" or ( PCJHMX_JHRQ < :pKsrq  and U_PCJHMX_JSRQ > :pKsrq ) ");
+            sqlMap.append(" or ( PCJHMX_JHRQ < :pJsrq  and U_PCJHMX_JSRQ > :pJsrq))) ");
         }
+        sqlMap.setParamValue("pKsrq", DateUtils.beginOfDay(DateUtils.getCurrentWeekDateBegin(date)));
+        sqlMap.setParamValue("pJsrq", DateUtils.endOfDay(DateUtils.getCurrentWeekDateEnd(date)));
         return sqlMap.queryEntity(Gpfkjg.class);
     }
 

gavel/src/main/resources/static/js/dashboard/echarts.js

@@ -2525,9 +2525,13 @@ function setPieDailyChart(chart, cerpent, pdata) {
 	apidata.wgsl = 0
 	if (pdata) {
 		apidata = pdata
-		if(apidata.wgsl>apidata.jhsl){
-			apidata.wgsl=pidata.jhsl
+        console.log("apidata")
+		console.log(apidata)
 	}
+	if((apidata.jhsl-apidata.wgsl)<0){
+		var wwcsl=0
+	}else{
+        var wwcsl=apidata.jhsl-apidata.wgsl
 	}
 	var ops = {
 		color: ["#A2E9FF", "#409eff"],
@@ -2569,7 +2573,7 @@ function setPieDailyChart(chart, cerpent, pdata) {
 				}
 			},
 			data: [{
-					value: (apidata.jhsl - apidata.wgsl) || 0,
+					value: wwcsl || 0,
 					name: '未完工'
 				},
 				{