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

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

@@ -46,12 +46,18 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
     @Override
     public PcslVO queryMonthPcsl(Date date) {
         SqlMap sqlMap = new SqlMap();
-        sqlMap.append("select sum(PCJHMX_JHSL) as JHSL ");
+        /*sqlMap.append("select sum(PCJHMX_JHSL) as JHSL ");
         sqlMap.append("from PCJHMX ");
         sqlMap.append("where 1=1 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.beginOfMonth(date));
+        sqlMap.setParamValue("pJsrq", DateUtils.endOfMonth(date));*/
+        //李哥说，这里要查询WO
+        sqlMap.append("select sum(WO_XQSL) as JHSL ");
+        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);
     }