From 8baa8c52c466e3d940d39a5c5e0bb97da871a160 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Thu, 4 Apr 2019 11:30:09 +0800
Subject: [PATCH] =?UTF-8?q?hql=E5=B0=81=E8=A3=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DemoDdlPackController.java          |  9 +++++++++
 .../apiservice/serviceimpl/busi/TestService.java   | 23 ++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java
index f531ac8..a1a095d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java
@@ -6,11 +6,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -82,4 +84,11 @@ public class DemoDdlPackController {
                         .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
                         .setResultList(list);
     }
+
+    @GetMapping(value="/testpager")
+    @ApiOperation(value="ddl测试分页")
+    public BaseResultBean testDdlPager(SysUser user,Pager pager){
+        ListPager<SysUser> listPager = testService.querySysUserByPager(user,pager);
+        return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
 }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
index 7d3b262..40d5e4d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
@@ -60,14 +60,21 @@ public class TestService implements ITestService {
         ListPager<SysUser> list =  new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager);
         LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
 
-        DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
-        DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
-        DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
-        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
-        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
-        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
-        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
+//        DdlPackBean packBean = new DdlPackBean();
+//        DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
+//        DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
+//        DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
+//        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
+//        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
+//        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
+//        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
+
+        DdlPackBean packBean = CoreHqlPack.packDdlSysUser(user);
+        System.out.println("getPackedHql=="+packBean.getPackedHql());
+        System.out.println("getPackedHqlAll=="+packBean.getPackedHqlAll());
+        System.out.println("getHqlAppend=="+packBean.getHqlAppend());
+        System.out.println("getWhereAppend=="+packBean.getWhereAppend());
+        System.out.println("getOrderByStr=="+packBean.getOrderByStr());
 
         pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean));
         list =  new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager);