From 59ef5b105e6e683257e3290911af54e08e1fbc6c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 22 Feb 2023 14:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutFeign.java | 7 ++ .../api/basevehicleout/BaseVehicleOutVo.java | 2 - .../basevehicleout/BaseVehicleOutVoExecl.java | 66 +++++++++++ .../biz/basetrailer/BaseTrailerService.java | 33 ++---- .../basevehicleout/BaseVehicleOutMapper.java | 3 + .../basevehicleout/BaseVehicleOutMapper.xml | 108 ++++++++++++------ .../basevehicleout/BaseVehicleOutRest.java | 23 ++++ .../basevehicleout/BaseVehicleOutService.java | 12 ++ .../biz/sysfunction/SysFunctionMapper.xml | 23 ++-- 9 files changed, 213 insertions(+), 64 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index 070de90341..e9389dff13 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.api.basevehicleout; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -55,6 +56,12 @@ public interface BaseVehicleOutFeign { @DeleteMapping("/delBySid") @ResponseBody public ResultBean delBySid(@RequestParam("sid") String sid); + + @PostMapping("/exportExcel") + @ApiOperation(value = "车辆销售台账列表导出") + @ResponseBody + public void exportExcel(@RequestBody String[] sids); + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index 199185bc52..0b7d451dfc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -101,8 +101,6 @@ public class BaseVehicleOutVo implements Vo { @ApiModelProperty("上装/挂车名称") private String trailerOrInstallName; - @ApiModelProperty("上装/挂车") - private String trailerOrInstall; @ApiModelProperty("上装/挂车成交价") private String trailerOrInstallDealPrice; @ApiModelProperty("上装/挂车物料编码") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java new file mode 100644 index 0000000000..18c3d0fc1d --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.base.api.basevehicleout; + +import com.yxt.common.core.utils.ExportEntityMap; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/29 12:00 + * @Description + */ +@Data +public class BaseVehicleOutVoExecl{ + + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "分公司", EnName = "createOrgName") + private String createOrgName; // 分公司 + @ExportEntityMap(CnName = "车架号", EnName = "vinNo") + private String vinNo; + @ExportEntityMap(CnName = "配置", EnName = "modelConfig") + private String modelConfig; + @ExportEntityMap(CnName = "内部编码", EnName = "insideCode") + private String insideCode; // 内部编码 + @ExportEntityMap(CnName = "销售类型", EnName = "type") + private String type; + @ExportEntityMap(CnName = "销售日期", EnName = "saleDate") + private String saleDate; + @ExportEntityMap(CnName = "成交价", EnName = "price") + private String price; + @ExportEntityMap(CnName = "销售部门", EnName = "orgName") + private String orgName; + @ExportEntityMap(CnName = "销售专员", EnName = "staffName") + private String staffName; + @ExportEntityMap(CnName = "合同编号", EnName = "concatNo") + private String concatNo; + @ExportEntityMap(CnName = "是否为终端客户", EnName = "isTerminal") + private String isTerminal; + @ExportEntityMap(CnName = "客户名称", EnName = "customerName") + private String customerName; + @ExportEntityMap(CnName = "手机号码", EnName = "mobile") + private String mobile; + @ExportEntityMap(CnName = "上装/挂车名称", EnName = "trailerOrInstallName") + private String trailerOrInstallName; + @ExportEntityMap(CnName = "上装/挂车物料编码", EnName = "trailerOrInstallCode") + private String trailerOrInstallCode; + @ExportEntityMap(CnName = "上装/挂车成交价", EnName = "trailerOrInstallDealPrice") + private String trailerOrInstallDealPrice; + @ExportEntityMap(CnName = "赠品说明", EnName = "giftsDescription") + private String giftsDescription; + @ExportEntityMap(CnName = "销售折让", EnName = "salesAllowance") + private String salesAllowance; + @ExportEntityMap(CnName = "中介人1", EnName = "middleOne") + private String middleOne; + @ExportEntityMap(CnName = "返利金额1", EnName = "rebateMoneyOne") + private String rebateMoneyOne; + @ExportEntityMap(CnName = "中介人2", EnName = "middleTwo") + private String middleTwo; + @ExportEntityMap(CnName = "返利金额2", EnName = "rebateMoneyTwo") + private String rebateMoneyTwo; + @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName") + private String innerName; + @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue") + private String manPurOrderTypeValue; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 7a68892a86..7e7e5e0d34 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -288,26 +288,17 @@ public class BaseTrailerService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()); - if (data1 != null) { - //采购组织:FPurchaseOrgId (必填项) - stkInStock.setFPurchaseOrgId(data1.getOrgCode()); - //分配目标组织:TOrgId (必填项) - stkInStock.setTOrgId(data1.getOrgCode()); - } else { - SysOrganizationVo vo = sysOrganizationVoResultBean.getData(); - if (vo != null) { - //采购组织:FPurchaseOrgId (必填项) - stkInStock.setFPurchaseOrgId(vo.getOrgCode()); - //分配目标组织:TOrgId (必填项) - stkInStock.setTOrgId(vo.getOrgCode()); - } - } + stkInStock.setFPurchaseDeptId(sysOrganizationVoBM.getOrgCode()); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData(); + //采购组织:FPurchaseOrgId (必填项) + stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode()); + //分配目标组织:TOrgId (必填项) + stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode()); //供应商:FSupplierId (必填项) String trailerModelSid = baseTrailer.getTrailerModelSid(); BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid); @@ -420,7 +411,7 @@ public class BaseTrailerService extends MybatisBaseService fEntity = salOutStock.getFEntity(); for (SalOutStock.FEntity entity : fEntity) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index 129f37e28a..5f72db58f0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -38,4 +39,6 @@ public interface BaseVehicleOutMapper extends BaseMapper { List fetchByMainSid(String xsckdSid); BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid); + + BaseVehicleOutVoExecl selByExcel(String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 3d26a8f79d..0d5a806dba 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -52,7 +52,11 @@ bv.modelConfigSid, bvc.sid as vehModelConfigSid, bvc.guidedPrice, - bvoa.innerName + bvoa.innerName, + bvo.trailerOrInstallName, + bvo.trailerOrInstallCode, + bvo.trailerOrInstallDealPrice, + bvo.manPurOrderTypeValue from base_vehicle_out bvo left join base_vehicle bv on bv.sid = bvo.vinSid left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid = @@ -67,36 +71,36 @@ @@ -118,7 +122,47 @@ SELECT * FROM base_vehicle_out WHERE createOrgSid = #{useOrgSid} - AND vinSid = #{vehSid} - limit 1 + AND vinSid = #{vehSid} limit 1 + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index a586df1bd7..ab53fc144a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -1,6 +1,8 @@ package com.yxt.anrui.base.biz.basevehicleout; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo; import com.yxt.anrui.base.api.basevehicleout.*; +import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -9,6 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -24,6 +29,8 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { @Autowired private BaseVehicleOutService baseVehicleOutService; + @Autowired + private HttpServletResponse response; @Override public ResultBean vehicleOut(BaseVehicleOutDto dto) { @@ -63,4 +70,20 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { public ResultBean delBySid(String sid) { return baseVehicleOutService.delBySid(sid); } + + @Override + public void exportExcel(String[] sids) { + //得到所有要导出的数据 + List baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids); + //定义导出的excel名字 + String excelName = "车辆销售台账管理列表"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + //导出车辆销售台账列表 + ExportExcelUtils.export(fileNameURL, baseVehicleOutVoExecls, BaseVehicleOutVoExecl.class, response); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index b49c32edd6..a5a738695a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1121,4 +1121,16 @@ public class BaseVehicleOutService extends MybatisBaseService listExcel(String[] sids) { + List baseVehicleOutVoExecls = new ArrayList<>(); + int id = 1; + for (String sid : sids) { + BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid); + baseVehicleOutVoExecl.setRankNo(id); + id = id + 1; + baseVehicleOutVoExecls.add(baseVehicleOutVoExecl); + } + return baseVehicleOutVoExecls; + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml index 91d2ee3de5..f9fd16a4c8 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml @@ -14,8 +14,8 @@ SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid FROM sys_function func - left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid - left join sys_source source on source.sid = sourceFunction.sourceSid + left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid + left join sys_source source on source.sid = sourceFunction.sourceSid ${ew.sqlSegment} @@ -61,10 +61,15 @@ and ssf.sourceSid = #{sourceSid} \ No newline at end of file