111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

@@ -6,6 +6,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
+import com.github.pagehelper.Page;
 
 public interface WxEnterpriseApiService {
 
@@ -18,7 +19,7 @@ public interface WxEnterpriseApiService {
 	 * 运维后台获取微信企业id列表
 	 * @return
 	 */
-	List<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version);
+	com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version);
 	/**
 	 * 获取一个
 	 * @param wxEnterpriseId

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -11,9 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.api.base.commons.Page;
 import com.gic.commons.util.GlobalVar;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.PageResult;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -28,8 +32,14 @@ public class EnterpriseController extends WebBaseController{
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version) {
-		List<YwWxEnterpriseDTO> list = wxEnterpriseApiService.list(pageInfo,keyword,gicContactFlag,version);
-		return resultResponse(HaoBanErrCode.ERR_1, list);
+		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,gicContactFlag,version);
+		PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
+        pageVo.setList(EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult()));
+        pageVo.setPageNum(page.getCurrentPage());
+        pageVo.setPages(page.getPages());
+        pageVo.setPageSize(page.getPageSize());
+        pageVo.setTotal(page.getTotalCount());
+		return resultResponse(HaoBanErrCode.ERR_1,pageVo);
  
 	}
 	//登录

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.github.pagehelper.Page;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -20,7 +21,7 @@ public interface WxEnterpriseMapper {
 
     int updateByPrimaryKey(TabHaobanWxEnterprise record);
     
-    List<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("gicContactFlag") String gicContactFlag,@Param("version") String version);
+    Page<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("gicContactFlag") String gicContactFlag,@Param("version") String version);
 
     List<TabHaobanWxEnterprise> listBycorpId(@Param("corpId") String corpId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.alibaba.fastjson.JSON;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.Constant;
+import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.wechat.api.dto.qywx.DepartmentDTO;
@@ -31,6 +32,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.service.WxApplicationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 
 @Service
@@ -86,14 +88,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 	}
 
 	@Override
-	public List<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version) {
+	public com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version) {
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageNum());
-		List<TabHaobanWxEnterprise>  list = wxEnterpriseMapper.list(keyword,gicContactFlag,version);
-		if(CollectionUtil.isEmpty(list)){
-			return new ArrayList<YwWxEnterpriseDTO>();
-		}
-		List<YwWxEnterpriseDTO>  resultList = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, list);
-		return resultList;
+		Page<TabHaobanWxEnterprise>  page = wxEnterpriseMapper.list(keyword,gicContactFlag,version);
+		return  PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class);
 	}
 
 	@Override