From 64f68657e6ddfd3dd8c890491cd3171cf35b8a36 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Fri, 15 May 2026 19:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpEnterpriseUnitApplicationService.java | 40 +++++++++++++------ .../repository/todo/ErpEnterpriseUnitDO.java | 2 +- .../ErpEnterpriseUnitDTO.java | 5 --- .../ErpEnterpriseUnitApi.java | 7 +++- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java index 8183cab5e..1380a69d4 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java @@ -27,10 +27,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.IOException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service @Slf4j @@ -54,13 +51,23 @@ public class ErpEnterpriseUnitApplicationService { erpEnterpriseUnitDO.setTopOrganizationId(topOrganizationId); } } - PageHelper.startPage(erpEnterpriseUnitDO.getPageNum(),erpEnterpriseUnitDO.getPageSize()); + List list = erpEnterpriseUnitMapper.queryList(erpEnterpriseUnitDO); - Page page = (Page) list; + TableDataInfo tableDataInfo = new TableDataInfo(); - tableDataInfo.setData(list); - tableDataInfo.setTotal(page.getTotal()); tableDataInfo.setCode(200); + + // 判断是否是分页对象（PageHelper 返回的是 Page 类型） + if (list instanceof Page) { + Page page = (Page) list; + tableDataInfo.setData(page.getResult()); // 获取实际数据列表 + tableDataInfo.setTotal(page.getTotal()); // 获取总记录数 + } else { + // 如果没有分页，返回全部数据 + tableDataInfo.setData(list); + tableDataInfo.setTotal((long) list.size()); + } + return tableDataInfo; } @@ -109,14 +116,21 @@ public class ErpEnterpriseUnitApplicationService { StringBuilder failMsg = new StringBuilder(); for (ErpEnterpriseUnitDTO dto : dtoList) { - Map body = new HashMap<>(); - body.put("erpUnitCode", dto.getErpCode()); - body.put("erpUnitName", dto.getErpName()); +// Map body = new HashMap<>(); +// body.put("erpUnitCode", dto.getErpCode()); +// body.put("erpUnitName", dto.getErpName()); + + Map item = new HashMap<>(); + item.put("erpUnitCode", dto.getErpCode()); + item.put("erpUnitName", dto.getErpName()); + List> bodyList = new ArrayList<>(); + bodyList.add(item); + GwLog gwLog = new GwLog(); gwLog.setType("企业单位"); gwLog.setBusinessId(Long.valueOf(dto.getId())); - gwLog.setRequestBody(JSONObject.toJSONString(body)); + gwLog.setRequestBody(JSONObject.toJSONString(bodyList)); gwLog.setResponseBody(""); gwLog.setStatus(1); gwLog.setSendTime(new Date()); @@ -132,7 +146,7 @@ public class ErpEnterpriseUnitApplicationService { CloseableHttpClient httpClient = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(PUSH_API_URL); - StringEntity postingString = new StringEntity(JSONObject.toJSONString(body), "UTF-8"); + StringEntity postingString = new StringEntity(JSONObject.toJSONString(bodyList), "UTF-8"); httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/erpEnterpriseUnit/repository/todo/ErpEnterpriseUnitDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/erpEnterpriseUnit/repository/todo/ErpEnterpriseUnitDO.java index e587d1c6c..b1526f878 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/erpEnterpriseUnit/repository/todo/ErpEnterpriseUnitDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/erpEnterpriseUnit/repository/todo/ErpEnterpriseUnitDO.java @@ -46,7 +46,7 @@ public class ErpEnterpriseUnitDO extends BaseVOEntity { private String createTimeTo; @ApiModelProperty(value = "页码") - private Integer pageNum = 1; + private Integer pageNo = 1; @ApiModelProperty(value = "每页数量") private Integer pageSize = 10; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/erpEnterpriseUnit/ErpEnterpriseUnitDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/erpEnterpriseUnit/ErpEnterpriseUnitDTO.java index 412e80c2b..45253a787 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/erpEnterpriseUnit/ErpEnterpriseUnitDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/erpEnterpriseUnit/ErpEnterpriseUnitDTO.java @@ -45,10 +45,5 @@ public class ErpEnterpriseUnitDTO { @ApiModelProperty(value = "创建时间止") private String createTimeTo; - @ApiModelProperty(value = "页码") - private Integer pageNum = 1; - - @ApiModelProperty(value = "每页数量") - private Integer pageSize = 10; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java index 2ff5a1071..e6f87734a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java @@ -1,6 +1,7 @@ package com.mhd.oms.interfaces.facade.erpEnterpriseUnit; +import com.github.pagehelper.PageHelper; import com.mhd.common.core.web.controller.BaseController; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; @@ -35,9 +36,11 @@ public class ErpEnterpriseUnitApi extends BaseController { @ApiOperation("查询企业单位列表") @GetMapping("/list") - public TableDataInfo list(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO){ + public TableDataInfo list(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO, + @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){ ErpEnterpriseUnitDO erpEnterpriseUnitDO = erpEnterpriseUnitAssembler.toDO(erpEnterpriseUnitDTO); - startPage(); + PageHelper.startPage(pageNo, pageSize); return erpEnterpriseUnitApplicationService.queryList(erpEnterpriseUnitDO); }