提交修改

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

@@ -54,19 +54,21 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
         sqlMap.setParamValue("pKsrq", DateUtils.beginOfMonth(date));
         sqlMap.setParamValue("pJsrq", DateUtils.endOfMonth(date));*/
         //李哥说，这里要查询WO
-        sqlMap.append("select sum(WO_XQSL) as JHSL ");
+        sqlMap.append("select sum(WO_XQSL) as JHSL,sum(WO_WGSL) AS WGSL  ");
         sqlMap.append("from WO ");
         sqlMap.append("where WO_YWRQ >= :pKsrq and WO_YWRQ <= :pJsrq");
         sqlMap.setParamValue("pKsrq", DateUtils.beginOfMonth(date));
         sqlMap.setParamValue("pJsrq", DateUtils.endOfMonth(date));
         return sqlMap.queryEntity(PcslVO.class);
     }
+    
 
     @Override
     public  List<UWoVO> queryWo(Date date) {
         SqlMap sqlMap = new SqlMap();
         sqlMap.append("select PCJHMX_WOID as WO_ID,WO_DJID, WO_WLID,WLXX_CODE,WLXX_NAME,WLXX_GG,WO_YWRQ, ");
-        sqlMap.append(" sum(PCJHMX_JHSL) as WO_PCSL,0 as WO_WGSL ");
+        sqlMap.append(" (WO_XQSL-WO_WGSL) as WO_PCSL,WO_WGSL ");
+        //sqlMap.append(" sum(PCJHMX_JHSL) as WO_PCSL,0 as WO_WGSL ");
         sqlMap.append("from PCJHMX  ");
         sqlMap.append("  left join WO on WO_ID = PCJHMX_WOID ");
         sqlMap.append("  left join WLXX on WLXX_ID = PCJHMX_WLID ");

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

@@ -138,11 +138,12 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
         if(pcslVO == null){
             pcslVO = new PcslVO();
             pcslVO.setJhsl(0.0);
+            pcslVO.setWgsl(0.0);
         }
-        Gpfkjg gpfkjg = gpfkcxDao.queryMonthGpfk(new Date());
-        if(gpfkjg != null){
-            pcslVO.setWgsl(gpfkjg.getFksl()==null?0.0:gpfkjg.getFksl());
-        }
+//        Gpfkjg gpfkjg = gpfkcxDao.queryMonthGpfk(new Date());
+//        if(gpfkjg != null){
+//            pcslVO.setWgsl(gpfkjg.getFksl()==null?0.0:gpfkjg.getFksl());
+//        }
         return pcslVO;
     }