代码调整3

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

@@ -157,7 +157,7 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("  left join BZGX on BZGX_ID = WOGYLX_BZGXID  ");
         sqlMap.append("where (GPFK_FKSJ >= :pStart and GPFK_FKSJ < :pEnd) and  (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");
         sqlMap.setParamValue("pStart", DateUtils.beginOfDay(DateUtils.getCurrentWeekDateBegin(date)));
-        sqlMap.setParamValue("pEnd", DateUtils.endOfDay(DateUtils.getCurrentQuarterDateEnd(date)));
+        sqlMap.setParamValue("pEnd", DateUtils.endOfDay(DateUtils.getCurrentWeekDateEnd(date)));
         sqlMap.setParamValue("pDGxbz", GxlxGxbzEnum.ONLY.getId());
         sqlMap.setParamValue("pMGxbz", GxlxGxbzEnum.LAST.getId());
         if(StringUtils.isNotEmpty(woid)){

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

@@ -32,20 +32,20 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
     @Override
     public PcslVO queryTodayPcsl(Date date) {
         SqlMap sqlMap = new SqlMap();
-        sqlMap.append("select sum(PCJHMX_JHSL) as JHSL ");
+        sqlMap.append("select sum(PCJHMX_JHSL) as JHSL,0 as WGSL ");
         sqlMap.append("from PCJHMX ");
         sqlMap.append("where 1=1 and ( :pKsrq <= PCJHMX_JHRQ and U_PCJHMX_JSRQ <= :pJsrq ) ");
         sqlMap.append(" or ( :pKsrq < PCJHMX_JHRQ and PCJHMX_JHRQ < :pJsrq ) ");
         sqlMap.append(" or ( :pKsrq < U_PCJHMX_JSRQ and U_PCJHMX_JSRQ < :pJsrq ) ");
         sqlMap.setParamValue("pKsrq", DateUtils.beginOfDay(DateUtils.getCurrentWeekDateBegin(date)));
-        sqlMap.setParamValue("pJsrq", DateUtils.endOfDay(DateUtils.getCurrentQuarterDateEnd(date)));
+        sqlMap.setParamValue("pJsrq", DateUtils.endOfDay(DateUtils.getCurrentWeekDateEnd(date)));
         return sqlMap.queryEntity(PcslVO.class);
     }
 
     @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,0 as WGSL ");
         sqlMap.append("from PCJHMX ");
         sqlMap.append("where 1=1 and ( :pKsrq <= PCJHMX_JHRQ and U_PCJHMX_JSRQ <= :pJsrq ) ");
         sqlMap.append(" or ( :pKsrq < PCJHMX_JHRQ and PCJHMX_JHRQ < :pJsrq ) ");