From 4a7f75a64e6598219b610ca2fe218b72b9eee458 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 17 May 2023 11:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleOutApplyFeign.java | 2 +- .../BaseVehicleOutApplyFeignFallback.java | 6 +- .../BaseVehicleOutApplyQueryNew.java | 76 +++++++++++++ .../BaseVehicleOutApplyVoNew.java | 104 ++++++++++++++++++ .../BaseVehinstallmodel.java | 4 + .../BaseVehinstallmodelDetailsVo.java | 4 + .../BaseVehinstallmodelDto.java | 4 + .../BaseVehicleOutApplyMapper.java | 3 +- .../BaseVehicleOutApplyMapper.xml | 60 ++++++++-- .../BaseVehicleOutApplyRest.java | 11 +- .../BaseVehicleOutApplyService.java | 82 +++++++++++--- 11 files changed, 318 insertions(+), 38 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java index 2f76a20557..c71271e53f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java @@ -59,7 +59,7 @@ public interface BaseVehicleOutApplyFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java index c02f74e2a6..5f7f4770a8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java @@ -48,10 +48,10 @@ import java.util.List; @Component public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeign { + @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/basevehicleoutapply/listPage无法访问"); + public ResultBean> listPage(PagerQuery pq) { + return null; } @Override diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java new file mode 100644 index 0000000000..f94ef06b39 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicleoutapply; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(销售出库单)
+ * File: BaseVehicleOutApplyQuery.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery
+ * Description: 车辆出库单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件") +public class BaseVehicleOutApplyQueryNew implements Query { + + @ApiModelProperty("物料编码") + private String materialCode; + @ApiModelProperty("销售类型key") + private String typeKey; + @ApiModelProperty("销售日期开始时间") + private String saleDateStart; + @ApiModelProperty("销售日期结束时间") + private String saleDateEnd; + @ApiModelProperty("合同编号") + private String concatNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("销售部门") + private String orgDeptSid; + @ApiModelProperty("销售专员") + private String staffSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty("分公司sid") + private String orgSid; + @ApiModelProperty(value = "组织全路径") + private String orgSidPath; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java new file mode 100644 index 0000000000..eafbbec01f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -0,0 +1,104 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicleoutapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(销售出库单)
+ * File: BaseVehicleOutApplyVo.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo
+ * Description: 车辆出库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆出库单 视图数据对象", description = "车辆出库单 视图数据对象") +public class BaseVehicleOutApplyVoNew implements Vo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("分公司sid") + private String createOrgSid; + @ApiModelProperty("分公司名称") + private String createOrgName; + @ApiModelProperty("简述配置") + private String modelConfig; + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty("销售类型") + private String type; + @ApiModelProperty("采购类型") + private String manPurOrderTypeValue; + @ApiModelProperty("销售日期") + private String saleDate; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("销售部门") + private String orgName; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("合同编号") + private String concatNo; + @ApiModelProperty("是否为终端客户") + private String isTerminal; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("手机号码") + private String mobile; + @ApiModelProperty("物料名称") + private String materialName; + @ApiModelProperty("物料编码") + private String materialCode; + @ApiModelProperty("赠品价值") + private String giftsDescription; + @ApiModelProperty("销售折让") + private String salesAllowance; + @ApiModelProperty("中介人1") + private String middleOne; + @ApiModelProperty("返利金额1") + private String rebateMoneyOne; + @ApiModelProperty("中介人2") + private String middleTwo; + @ApiModelProperty("返利金额2") + private String rebateMoneyTwo; + @ApiModelProperty("内部引荐人姓名") + private String innerName; + + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java index 44734a34fe..b46272dd53 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java @@ -106,5 +106,9 @@ public class BaseVehinstallmodel extends BaseEntity { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java index 6f9c0fd579..03c45b4890 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java @@ -104,6 +104,10 @@ public class BaseVehinstallmodelDetailsVo implements Vo { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; @ApiModelProperty("销售订单中上装价格") private String topPrice; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java index 60f384ed05..76d1f5b353 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java @@ -114,5 +114,9 @@ public class BaseVehinstallmodelDto implements Dto { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java index 38679d354a..8e26c4395f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -56,7 +57,7 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml index 0df014cd83..72922f2afc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml @@ -1,13 +1,55 @@ - - - - - + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java index da3cbcb284..d4b90f3271 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.biz.basevehicleoutapply; +import com.yxt.anrui.base.api.basevehicleoutapply.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; /** * Project: anrui-base(销售出库单)
@@ -65,9 +60,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign { @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseVehicleOutApplyService.listPageVo(pq); + PagerVo pv = baseVehicleOutApplyService.listPageVo(pq); return rb.success().setData(pv); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index ee93caec59..09d18b2094 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -28,22 +28,18 @@ package com.yxt.anrui.base.biz.basevehicleoutapply; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleoutapply.*; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; - +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; /** * Project: anrui-base(销售出库单)
@@ -60,19 +56,73 @@ import java.util.List; */ @Service public class BaseVehicleOutApplyService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(BaseVehicleOutApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + private QueryWrapper createQueryWrapper(BaseVehicleOutApplyQueryNew params) { QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String orgSidPath = params.getOrgSidPath(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + qw.eq("bvo.createOrgSid", params.getCreateOrgSid()); + } + //车架号 + if (StringUtils.isNotBlank(params.getMaterialCode())) { + qw.like("bvo.materialCode", params.getMaterialCode()); + } + //销售类型 + if (StringUtils.isNotBlank(params.getTypeKey())) { + qw.eq("bvo.typeKey", params.getTypeKey()); + } + //销售日期开始-销售日期结束 + qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')" + ); + //合同编号 + if (StringUtils.isNotBlank(params.getConcatNo())) { + qw.like("bvo.concatNo", params.getConcatNo()); + } + //客户名称 + if (StringUtils.isNotBlank(params.getCustomerName())) { + qw.like("bvo.customerName", params.getCustomerName()); + } + //销售部门 + if (StringUtils.isNotBlank(params.getOrgDeptSid())) { + qw.eq("bvo.orgSid", params.getOrgDeptSid()); + } + //销售人员 + if (StringUtils.isNotBlank(params.getStaffSid())) { + qw.eq("bvo.staffSid", params.getStaffSid()); + } + //内部编码 + if (StringUtils.isNotBlank(params.getInsideCode())) { + qw.like("bv.insideCode", params.getInsideCode()); + } + if (StringUtils.isNotBlank(params.getOrgSid())) { + qw.eq("bvo.createOrgSid", params.getOrgSid()); + } + } return qw; } - public PagerVo listPageVo(PagerQuery pq) { - BaseVehicleOutApplyQuery query = pq.getParams(); + public PagerVo listPageVo(PagerQuery pq) { + BaseVehicleOutApplyQueryNew query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) { + String createOrgSid = record.getCreateOrgSid(); + String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); + record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8)); + record.setCreateOrgName(createorgName); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; }