Merge branch 'zhangxin'

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/FssPaccountFinalbillFindPageRequest.java

 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaPageableDataRequest;
 import com.qtzl.alterSales.manager.vo.FssPaccountFinalbillVo;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
 
     @Override
     public HqlBuilder toSelectHql() {
+//        HqlBuilder builder = new HqlBuilder("   SELECT new com.qtzl.alterSales.manager.vo.FssPaccountFinalbillVo(naturalDate, SUM(payCount), SUM(payAmount) , SUM(refundCount), SUM(refundAmount) ) from FssPaccountFinalbill  GROUP BY naturalDate ");
         HqlBuilder builder = new HqlBuilder("   SELECT new com.qtzl.alterSales.manager.vo.FssPaccountFinalbillVo(naturalDate, SUM(payCount), SUM(payAmount) , SUM(refundCount), SUM(refundAmount) ) from FssPaccountFinalbill  GROUP BY naturalDate ");
         appendParam(builder);
+        builder.append( " ORDER BY naturalDate DESC ");
         return builder;
     }
 
     @Override
     public String toCountHql() {
-        HqlBuilder builder = new HqlBuilder("SELECT COUNT(1) FROM FssPaccountFinalbill GROUP BY naturalDate");
+        HqlBuilder builder = new HqlBuilder("SELECT COUNT(1) FROM FssPaccountFinalbill  GROUP BY naturalDate");
         appendParam(builder);
         builder.append( " ORDER BY naturalDate DESC ");
+        System.out.println(builder.toString());
         return builder.toString();
     }
 
 
     private void appendParam(HqlBuilder builder) {
-        builder.append("  having 1 = 1 ");
-        if (naturalDate!=null){
-            builder.append("  AND naturalDate = :naturalDate", naturalDate);
+        if (!StringUtils.isEmpty(naturalDate)){
+            builder.append("  having naturalDate = :naturalDate", naturalDate);
         }
     }