From b3af44868d0b5816d3c864d941e592898c6d6dc1 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Tue, 17 May 2022 18:12:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=87=8C=E7=9A=84=20=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=8E=B0=E8=BD=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=93=81=E7=89=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/AppBaseConfigNowCarVo.java | 3 + .../basevehicle/AppBaseConfigOrderCarVo.java | 28 +++ .../basevehicle/AppBaseNowProduceCarVo.java | 31 +++ .../basevehicle/AppCarConfigSummaryDto.java | 31 +++ .../api/basevehicle/BaseVehicleFeign.java | 8 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../BaseVehicleBrandDictionariesVo.java | 18 ++ .../BaseVehicleBrandFeign.java | 5 + .../BaseVehicleBrandFeignFallback.java | 5 + .../busvehicleinquiry/BusVehicleInquiry.java | 6 + .../biz/basevehicle/BaseVehicleMapper.java | 30 +++ .../biz/basevehicle/BaseVehicleMapper.xml | 52 ++++- .../base/biz/basevehicle/BaseVehicleRest.java | 18 ++ .../biz/basevehicle/BaseVehicleService.java | 82 +++++-- .../BaseVehicleBrandMapper.java | 2 + .../BaseVehicleBrandMapper.xml | 7 + .../BaseVehicleBrandRest.java | 6 + .../BaseVehicleBrandService.java | 27 ++- .../BusVehicleInquiryService.java | 202 +++++++++++------- 19 files changed, 463 insertions(+), 103 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java index e8ade060a7..d54fd8e430 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java @@ -20,4 +20,7 @@ public class AppBaseConfigNowCarVo implements Vo { @ApiModelProperty("常用配置") private String commonlyConfig; + + @ApiModelProperty("页数") + private Long pages; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java new file mode 100644 index 0000000000..e8239906d7 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +@Data +public class AppBaseConfigOrderCarVo implements Vo { + + @ApiModelProperty("车型名称") + private String modelName; + + @ApiModelProperty("销售指导价") + private String price; + + @ApiModelProperty("排产列表") + private List records; + + @ApiModelProperty("常用配置") + private String commonlyConfig; + + @ApiModelProperty("页数") + private Long pages; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java new file mode 100644 index 0000000000..a1a922c39e --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBaseNowProduceCarVo implements Vo { + + @ApiModelProperty("订单编号") + private String orderId; + + @ApiModelProperty("状态") + private String state; + + @ApiModelProperty("订单日期") + private String date; + + @ApiModelProperty("预计上线日期") + private String forecastDate; + + @ApiModelProperty("上线日期") + private String upDate; + + @ApiModelProperty("下线日期") + private String downDate; + + @ApiModelProperty("采购数量") + private String number; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java new file mode 100644 index 0000000000..6cc102ee1b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCarConfigSummaryDto implements Dto { + + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("配置sid") + private String configSid; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("其他配置说明") + private String otherConfig; + + @ApiModelProperty("常用配置") + private String config; + + @ApiModelProperty("更多配置") + private String moreConfig; + + @ApiModelProperty("车型名称") + private String model; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 65b4811465..2f1e831c88 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -241,4 +241,12 @@ public interface BaseVehicleFeign { @ApiOperation("手机端-配置列表获取现车列表") @PostMapping("/getModelNowCarList") public ResultBean getModelNowCarList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-配置列表获取排产列表") + @PostMapping("/getModelOrderCarList") + public ResultBean getModelOrderCarList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-保存 询价 其他配置说明") + @PostMapping("/saveCarConfigSummaryInfo") + public ResultBean saveCarConfigSummaryInfo(@Valid @RequestBody AppCarConfigSummaryDto dto); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index d52015d984..dee0978b32 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -169,4 +169,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean getModelOrderCarList(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java new file mode 100644 index 0000000000..9a443c10cc --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.base.api.basevehiclebrand; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BaseVehicleBrandDictionariesVo implements Vo { + + @ApiModelProperty("品牌sid") + private String sid; + + @ApiModelProperty("品牌key") + private String dictKey; + + @ApiModelProperty("品牌value") + private String dictValue; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java index 6b9222a9e0..379c7268f9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java @@ -108,4 +108,9 @@ public interface BaseVehicleBrandFeign { @ApiOperation("手机端根据厂商sid查询品牌列表") @GetMapping("/selectAppListByManufacturerSid") ResultBean> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid",required = false) String manufacturerSid); + + @ApiOperation("手机端-获取品牌数据字典") + @GetMapping("/selectAppListByUserSid/{userSid}") + ResultBean> selectAppListByUserSid(@PathVariable("userSid") String userSid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java index 197f9e43e6..8c8d308611 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java @@ -76,5 +76,10 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign { return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclebrand/selectAppListByManufacturerSid无法访问"); } + @Override + public ResultBean> selectAppListByUserSid(String userSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java index 08a7aea638..f9e01289e5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java @@ -68,4 +68,10 @@ public class BusVehicleInquiry extends BaseEntity { private String customerSid; @ApiModelProperty("品牌名称") private String brandName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("更多配置") + private String moreConfig; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 24d05a8c3f..d4c8d8773f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -327,8 +327,38 @@ public interface BaseVehicleMapper extends BaseMapper { /** * 根据车型配置及车型查询现车的数量 + * * @param qw 查询条件 * @return */ Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 根据车型sid配置sid分公司sid查询车型名称等 + * + * @param modelSid + * @param configSid + * @param useOrg + * @return + */ + AppBaseConfigNowCarVo selectByModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); + + /** + * 根据车型sid配置sid分公司sid查询车型名称等 + * + * @param modelSid + * @param configSid + * @param useOrg + * @return + */ + AppBaseConfigOrderCarVo getModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); + + /** + * 手机端-配置列表获取现车列表 + * + * @param page + * @param qw + * @return + */ + IPage getModelOrderCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index bc35ba31af..718e3ea424 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -663,17 +663,63 @@ + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index a33d536e96..572b1f5d84 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -73,6 +74,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Autowired private BaseModelConfigService baseModelConfigService; + @Autowired + private BusVehicleInquiryService busVehicleInquiryService; + @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -547,5 +551,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(vo); } + @Override + public ResultBean getModelOrderCarList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + AppBaseConfigOrderCarVo vo = baseVehicleService.getModelOrderCarList(pagerQuery); + return rb.success().setData(vo); + } + + @Override + public ResultBean saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) { + ResultBean rb = ResultBean.fireFail(); + busVehicleInquiryService.saveCarConfigSummaryInfo(dto); + return rb.success(); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index fa8407ac80..d77c05b248 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -6,9 +6,12 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; +import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; @@ -54,6 +57,8 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bv.sid", query.getSidList()); } - if(StringUtils.isNotBlank(query.getLinkNo())){ - qw.like("bv.vinNo",query.getLinkNo()); + if (StringUtils.isNotBlank(query.getLinkNo())) { + qw.like("bv.vinNo", query.getLinkNo()); } } return qw; } - public ResultBean fetchVehicle(String vehicleSid,String modelSid) { + public ResultBean fetchVehicle(String vehicleSid, String modelSid) { ResultBean rb = ResultBean.fireFail(); - QueryWrapper qw = vehicleActualWrapper1(vehicleSid,modelSid); + QueryWrapper qw = vehicleActualWrapper1(vehicleSid, modelSid); BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw); return rb.success().setData(baseVehicleVo); } - private QueryWrapper vehicleActualWrapper1(String vehicleSid,String modelSid) { + private QueryWrapper vehicleActualWrapper1(String vehicleSid, String modelSid) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(vehicleSid)){ + if (StringUtils.isNotBlank(vehicleSid)) { String[] split = vehicleSid.split(","); for (String s : split) { - qw.ne("sid",s); + qw.ne("sid", s); } } - qw.eq("modelSid",modelSid); - qw.eq("vehicleState",0005); - qw.eq("lockedState",03); + qw.eq("modelSid", modelSid); + qw.eq("vehicleState", 0005); + qw.eq("lockedState", 03); return qw; } @@ -1204,8 +1209,8 @@ public class BaseVehicleService extends MybatisBaseService pagerQuery) { AppBaseConfigNowCarQuery query = pagerQuery.getParams(); SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData(); - String useOrg = data.getSid(); - AppBaseConfigNowCarVo appBaseConfigNowCarVo = new AppBaseConfigNowCarVo(); + query.setUseOrg(data.getSid()); + AppBaseConfigNowCarVo appBaseConfigNowCarVo = baseMapper.selectByModelSidAndConfigSid(query.getModelSid(), query.getConfigSid(), query.getUseOrg()); List vinNowCarVos = new ArrayList<>(); QueryWrapper qw = modelNowCarWrapper(query); IPage page = PagerUtil.queryToPage(pagerQuery); @@ -1214,6 +1219,8 @@ public class BaseVehicleService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { if (StringUtils.isNotBlank(query.getNames())) { - qw.eq("bv.modelSid", query.getModelSid());//车型sid + qw.like("bv.vinNo", query.getNames());//车架号 } if (StringUtils.isNotBlank(query.getNames())) { - qw.eq("bv.modelConfigSid", query.getConfigSid());//配置sid + qw.like("bv.vehicleStateValue", query.getNames());//状态 } if (StringUtils.isNotBlank(query.getNames())) { - qw.like("bv.vinNo", query.getNames());//车架号 + qw.like("bmc.carColor", query.getNames());//车身颜色 } - if (StringUtils.isNotBlank(query.getUseOrg())) { + if (StringUtils.isNotBlank(query.getNames())) { + qw.like("bv.location", query.getNames());//存放地点 + } + if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司 qw.eq("bv.useOrg", query.getUseOrg()); } } return qw; } + /** + * 手机端-配置列表获取排产列表 + * + * @param pagerQuery + * @return + */ + public AppBaseConfigOrderCarVo getModelOrderCarList(PagerQuery pagerQuery) { + AppBaseConfigNowCarQuery query = pagerQuery.getParams(); + SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData(); + query.setUseOrg(data.getSid()); + AppBaseConfigOrderCarVo appBaseConfigOrderCarVo = baseMapper.getModelSidAndConfigSid(query.getModelSid(), query.getConfigSid(), query.getUseOrg()); + List vinNowCarVos = new ArrayList<>(); + QueryWrapper qw = nowProduceWrapper(query); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getModelOrderCarList(page, qw); + List records = pagging.getRecords(); + for (AppBaseNowProduceCarVo record : records) { + vinNowCarVos.add(record); + } + appBaseConfigOrderCarVo.setRecords(vinNowCarVos); + long pages = pagging.getPages(); + appBaseConfigOrderCarVo.setPages(pages); + return appBaseConfigOrderCarVo; + } + + + private QueryWrapper nowProduceWrapper(AppBaseConfigNowCarQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getNames())) { + qw.like("bvo.orderStatus", query.getNames());//订单状态 + } + if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司 + qw.eq("bvo.useOrg", query.getUseOrg()); + } + } + return qw; + } + /** * 根据车型及车型配置查询 + * * @param query 查询条件 * @return */ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index 2947e5cf16..7d2178793e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -122,4 +122,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper { @Select("select brandShortName from base_vehicle_brand where sid=#{sid}") String getBrandShortName(@Param("sid") String sid); + + List selectAppListByUserSid(@Param("useOrg") String useOrg); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index ee56177c3a..26ed144d4c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -98,4 +98,11 @@ FROM base_vehicle_brand bvb where bvb.manufacturerSid = #{manufacturerSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java index e14492cce1..93a252314f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java @@ -170,4 +170,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { List resultData = baseVehicleBrandService.selectAppListByManufacturerSid(manufacturerSid); return new ResultBean>().success().setData(resultData); } + + @Override + public ResultBean> selectAppListByUserSid(String userSid) { + List list = baseVehicleBrandService.selectAppListByUserSid(userSid); + return new ResultBean>().success().setData(list); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index e80aa5714a..d5fc925d6c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -60,7 +60,7 @@ public class BaseVehicleBrandService extends MybatisBaseService buildQueryWrapper(BaseVehicleBrandQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bvb.isDelete",0); + qw.eq("bvb.isDelete", 0); if (pagerQuery != null) { if (StringUtils.isNotBlank(pagerQuery.getBrandName())) {//品牌名称 qw.like("bvb.brandName", pagerQuery.getBrandName()); @@ -123,8 +123,8 @@ public class BaseVehicleBrandService extends MybatisBaseService selectAppListByUserSid(String userSid) { + String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + List list = baseMapper.selectAppListByUserSid(useOrg); + return list; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java index da0413b040..e15057e90a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java @@ -28,15 +28,26 @@ package com.yxt.anrui.base.biz.busvehicleinquiry; 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.basevehicle.AppCarConfigSummaryDto; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.busvehicleinquiry.*; +import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; 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.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.xml.crypto.Data; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -54,83 +65,118 @@ import java.util.List; */ @Service public class BusVehicleInquiryService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BusVehicleInquiryQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BusVehicleInquiryQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(BusVehicleInquiryQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getInquiryDate())) { - qw.eq("inquiryDate", query.getInquiryDate()); - } - - if (StringUtils.isNotBlank(query.getInquirer())) { - qw.eq("inquirer", query.getInquirer()); - } - - if (StringUtils.isNotBlank(query.getCreateOrgSid())) { - qw.eq("createOrgSid", query.getCreateOrgSid()); - } - - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("brandSid", query.getBrandSid()); - } - - if (StringUtils.isNotBlank(query.getModelName())) { - qw.eq("modelName", query.getModelName()); - } - - if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) { - qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration()); - } - - if (StringUtils.isNotBlank(query.getOtherConfig())) { - qw.eq("otherConfig", query.getOtherConfig()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusVehicleInquiryQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BusVehicleInquiryQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusVehicleInquiryDto dto){ - BusVehicleInquiry entity = new BusVehicleInquiry(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusVehicleInquiryVo fetchByIdVo(String id){ - BusVehicleInquiry entity = this.fetchById(id); - BusVehicleInquiryVo vo = new BusVehicleInquiryVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + @Autowired + SysUserFeign sysUserFeign; + + @Autowired + BaseVehicleModelService baseVehicleModelService; + + public PagerVo listPage(PagerQuery pq) { + BusVehicleInquiryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(BusVehicleInquiryQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(BusVehicleInquiryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getInquiryDate())) { + qw.eq("inquiryDate", query.getInquiryDate()); + } + + if (StringUtils.isNotBlank(query.getInquirer())) { + qw.eq("inquirer", query.getInquirer()); + } + + if (StringUtils.isNotBlank(query.getCreateOrgSid())) { + qw.eq("createOrgSid", query.getCreateOrgSid()); + } + + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("brandSid", query.getBrandSid()); + } + + if (StringUtils.isNotBlank(query.getModelName())) { + qw.eq("modelName", query.getModelName()); + } + + if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) { + qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration()); + } + + if (StringUtils.isNotBlank(query.getOtherConfig())) { + qw.eq("otherConfig", query.getOtherConfig()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusVehicleInquiryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BusVehicleInquiryQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BusVehicleInquiryDto dto) { + BusVehicleInquiry entity = new BusVehicleInquiry(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BusVehicleInquiryVo fetchByIdVo(String id) { + BusVehicleInquiry entity = this.fetchById(id); + BusVehicleInquiryVo vo = new BusVehicleInquiryVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 车型报价点击询价保存询价数据 + * + * @param dto + */ + @Transactional(rollbackFor = Exception.class) + public void saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) { + BusVehicleInquiry busVehicleInquiry = new BusVehicleInquiry(); + busVehicleInquiry.setModelSid(dto.getModelSid()); + busVehicleInquiry.setConfigSid(dto.getConfigSid()); + busVehicleInquiry.setModelName(dto.getModel()); + busVehicleInquiry.setOtherConfig(dto.getOtherConfig()); + busVehicleInquiry.setModelBriefConfiguration(dto.getConfig()); + busVehicleInquiry.setMoreConfig(dto.getMoreConfig()); + String userSid = dto.getUserSid(); + AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData(); + busVehicleInquiry.setInquirer(data.getStaffName()); + busVehicleInquiry.setCreateOrgSid(data.getOrgSid()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String format = simpleDateFormat.format(new Date()); + busVehicleInquiry.setInquiryDate(format); + BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid()); + busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand()); + busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName()); + save(busVehicleInquiry); + } } \ No newline at end of file From 2896fd01aad8e077bd3a2cf13060b5d96a5e9eb7 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 18 May 2022 08:46:30 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/kehuguanli/kehudangan/kehudangan.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue index b2d7ae15bf..15ad5e04b4 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue @@ -8,7 +8,7 @@ 编辑 客户跟进 客户档案 - 删除 + 导入 导出 关闭 From b0af4ecfbccb3bb6881f11ce592fdc296ef7c5bd Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Wed, 18 May 2022 10:35:54 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E5=85=AC=E5=8F=B8sid=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/sysorganization/SysOrganizationMapper.xml | 2 +- .../sysorganization/SysOrganizationService.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 5d184539ba..295251961c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -138,7 +138,7 @@ SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode FROM sys_organization so WHERE sid = #{sid} - And isDept = 1 + And isDept = 0 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index c748ea3c2b..6367f552f7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -356,16 +356,16 @@ public class SysOrganizationService extends MybatisBaseService Date: Wed, 18 May 2022 10:55:09 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=B6=E5=8D=95?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 153 ++++++++++++++++-- .../api/bussalesorder/BusSalesOrderFeign.java | 1 - .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 8 + .../bussalesorder/BusSalesOrderService.java | 49 ++++++ 5 files changed, 201 insertions(+), 12 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 28ea520b5c..5b141eb4de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -3,9 +3,9 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; -import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; -import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; @@ -16,11 +16,12 @@ import com.yxt.anrui.base.biz.flow.FlowableService; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; -import com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; -import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFile; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; -import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileListVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; @@ -47,11 +48,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.xml.crypto.Data; import java.io.File; import java.math.BigDecimal; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; /** @@ -119,6 +121,8 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -577,7 +581,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { + /*public ResultBean> printConfirm(PrintConfirmDto dto) { Map map = new HashMap(); // 合同信息 CommonContract contract = fetchBySid(dto.getSid()); @@ -587,6 +591,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm1(PrintConfirmDto dto) { Map map = new HashMap<>();*/ + /** * 车辆登记合同参数： * 甲方：${partyA} @@ -1179,10 +1185,10 @@ public class CommonContractService extends MybatisBaseService> printConfirm2(PrintConfirmDto dto) { + ResultBean> rb = ResultBean.fireFail(); + Map map = new HashMap(); + // 合同信息 + CommonContract contract = fetchBySid(dto.getSid()); + // 甲方 + map.put("partyA", contract.getPartyA()); + // 乙方 + map.put("partyB", contract.getPartyB()); + // 合同编号 + map.put("contractNo", contract.getContractNo()); + // 客户信息 + ResultBean busSalesOrderDetailsVoResultBean = busSalesOrderFeign.fetchDetailsBySid(dto.getBusSid()); + BusSalesOrderDetailsVo order = busSalesOrderDetailsVoResultBean.getData(); + if (!busSalesOrderDetailsVoResultBean.getSuccess()) { + return rb.setMsg("该业务数据不存在"); + } + map.put("customerName", busSalesOrderDetailsVoResultBean.getData().getCustomerName()); + map.put("mobile", busSalesOrderDetailsVoResultBean.getData().getMobile()); + BusSalesOrderModelDetailsVo busSalesOrderModel = busSalesOrderDetailsVoResultBean.getData().getBusSalesOrderModel(); + // 车型、主车信息 + map.put("modelName", busSalesOrderModel.getModelName()); + map.put("modelConfig", busSalesOrderModel.getConfig()); + map.put("mainVehicleNum", busSalesOrderDetailsVoResultBean.getData().getBusSalesOrderPrice().getQuantity()); + map.put("mainVehicleSinglePrice", busSalesOrderDetailsVoResultBean.getData().getBusSalesOrderPrice().getSingleFinalPrice()); + ResultBean vinNo = busOrderVehicleFeign.getVehicleVINNoByOrderSid(dto.getBusSid()); + map.put("VINNo", vinNo.getData()); // 车架号 + // 上装信息 + AppBaseModelSzconfigDetailsVo szconfig = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(model.getData().getSid()); + map.put("topName", szconfig.getTopName()); // 上装 + // 优惠说明信息 + ResultBean> discountList = busOrderDiscountFeign.getAppDiscountListVoByOrderSid(order.getOrderSid()); + map.put("discountDetail", ""); // 优惠说明 ？待确认 + if (discountList.getSuccess()) { + map.put("discountDetail", discountList.getData().get(0).getDetail()); // 优惠说明 ？待确认 + } + // 保险说明信息 + map.put("insuranceDetail", "首次在本店投保，第二、三年继续在本店续保。（不在公司投保的，不显示）"); // 保险说明 ？待确认 + // 车辆交付地点 +// map.put("deliveryPlace", model.getData().getExpected_takecar_location()); + + List list = new ArrayList<>(); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(5, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + return genCarSaleContract(dto, map, order); + }); + Future future2 = pool.submit(() -> { + return genVehicleRegistration(dto, map); + }); + Future future3 = pool.submit(() -> { + // 客户开票申请书（暂时先不考虑） + if (dto.getIsAdvanceInvoice() == 1) { + return genAdvanceInvoice(dto, map); + } else { + return ""; + } + }); + Future future4 = pool.submit(() -> { + // 委托提车授权书 + if (dto.getIsEntrustVehicle() == 1) { + return genEntrustVehicle(dto, map); + } else { + return ""; + } + }); + Future future5 = pool.submit(() -> { + return genCarSaleContractBlank(dto, map, order); + }); + + future1.get(); + future2.get(); + future3.get(); + future4.get(); + future5.get(); + PrintConfirmVo printConfirmVo = null; + if (StringUtils.isNotBlank(future1.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 +// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); + printConfirmVo.setDownloadUrl(future1.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future2.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.VEHICLEREGISTRATION.getName())); + printConfirmVo.setDownloadUrl(future2.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future3.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CUSTOMERINVOICINGAPPLICATION.getName())); + printConfirmVo.setDownloadUrl(future3.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future4.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.ENTRUSTPICKUPAUTHORIZATION.getName())); + printConfirmVo.setDownloadUrl(future4.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future5.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 +// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName())); + printConfirmVo.setDownloadUrl(future5.get()); + list.add(printConfirmVo); + } + } catch (Exception e) { + e.printStackTrace(); + return new ResultBean().fail().setMsg("生成文件失败"); + } + return new ResultBean().success().setData(list); + }*/ + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index e7c95c2ca9..797f0be218 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -144,5 +144,4 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid, @RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid); - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 6efc846707..e98c61a657 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -92,4 +92,6 @@ public interface BusSalesOrderMapper extends BaseMapper { * @param businessSid 销售订单sid */ void updateStateByBusinessSid(@Param("state") int state, @Param("businessSid") String businessSid); + + int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 555a79f4ed..bef37b6b46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -87,4 +87,12 @@ set state = #{state} where sid = #{businessSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 8f2701830d..9983afd1c6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -80,10 +80,14 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -150,6 +154,8 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = new BusSalesOrder(); BeanUtil.copyProperties(dto, busSalesOrder, "sid"); + busSalesOrder.setCreateDate(new Date()); + busSalesOrder.setBillNo(generateBillNo(dto.getUserSid()).get("billNo_Num")); baseMapper.insert(busSalesOrder); String sid = busSalesOrder.getSid(); //主车车型信息保存 @@ -740,6 +748,8 @@ public class BusSalesOrderService extends MybatisBaseService generateBillNo(String userSid){ + List commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData(); + String billsType = ""; + if (commonVoList.size() > 0) { + for (int i = 0; i < commonVoList.size(); i++) { + if (commonVoList.get(i).getDictValue().contains("销售订单")) { + billsType = commonVoList.get(i).getDictKey(); + } + } + } + AppUserOrgInfoVo userOrgInfo = null; + String orgCode = ""; + String orgSid = ""; + String orgName = ""; + ResultBean resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid); + if (resultBean.getSuccess() && resultBean.getData() != null) { + userOrgInfo = resultBean.getData(); + orgSid = userOrgInfo.getOrgSid(); + orgName = userOrgInfo.getOrgName(); + orgCode = userOrgInfo.getOrgCode(); + } + String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd"); + // 流水号 + int i = selectCountByOrgSid(billsType, date, orgSid); + String num = String.format("%04d", i + 1); // 不足4位补0 + Map map = new HashMap<>(); + map.put("billNo_Num", billsType + orgCode + date.replaceAll("-","") + num); + map.put("billNo", billsType + orgCode + date.replaceAll("-","")); + map.put("staffSid", userOrgInfo.getStaffSid()); + map.put("staffName", userOrgInfo.getStaffName()); + map.put("orgSid", orgSid); + map.put("orgName", orgName); + return map; + } + + public int selectCountByOrgSid(String billsType, String date, String orgSid) { + return baseMapper.selectCountByOrgSid(billsType, date, orgSid); + } } \ No newline at end of file From 797f20c613bacf49ecb5506821f8663b7de9f233 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 18 May 2022 10:55:09 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=B6=E5=8D=95?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 153 ++++++++++++++++-- .../api/bussalesorder/BusSalesOrderFeign.java | 1 - .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 8 + .../bussalesorder/BusSalesOrderService.java | 49 ++++++ 5 files changed, 201 insertions(+), 12 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 28ea520b5c..5b141eb4de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -3,9 +3,9 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; -import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; -import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; @@ -16,11 +16,12 @@ import com.yxt.anrui.base.biz.flow.FlowableService; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; -import com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; -import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFile; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; -import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileListVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; @@ -47,11 +48,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.xml.crypto.Data; import java.io.File; import java.math.BigDecimal; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; /** @@ -119,6 +121,8 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -577,7 +581,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { + /*public ResultBean> printConfirm(PrintConfirmDto dto) { Map map = new HashMap(); // 合同信息 CommonContract contract = fetchBySid(dto.getSid()); @@ -587,6 +591,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm1(PrintConfirmDto dto) { Map map = new HashMap<>();*/ + /** * 车辆登记合同参数： * 甲方：${partyA} @@ -1179,10 +1185,10 @@ public class CommonContractService extends MybatisBaseService> printConfirm2(PrintConfirmDto dto) { + ResultBean> rb = ResultBean.fireFail(); + Map map = new HashMap(); + // 合同信息 + CommonContract contract = fetchBySid(dto.getSid()); + // 甲方 + map.put("partyA", contract.getPartyA()); + // 乙方 + map.put("partyB", contract.getPartyB()); + // 合同编号 + map.put("contractNo", contract.getContractNo()); + // 客户信息 + ResultBean busSalesOrderDetailsVoResultBean = busSalesOrderFeign.fetchDetailsBySid(dto.getBusSid()); + BusSalesOrderDetailsVo order = busSalesOrderDetailsVoResultBean.getData(); + if (!busSalesOrderDetailsVoResultBean.getSuccess()) { + return rb.setMsg("该业务数据不存在"); + } + map.put("customerName", busSalesOrderDetailsVoResultBean.getData().getCustomerName()); + map.put("mobile", busSalesOrderDetailsVoResultBean.getData().getMobile()); + BusSalesOrderModelDetailsVo busSalesOrderModel = busSalesOrderDetailsVoResultBean.getData().getBusSalesOrderModel(); + // 车型、主车信息 + map.put("modelName", busSalesOrderModel.getModelName()); + map.put("modelConfig", busSalesOrderModel.getConfig()); + map.put("mainVehicleNum", busSalesOrderDetailsVoResultBean.getData().getBusSalesOrderPrice().getQuantity()); + map.put("mainVehicleSinglePrice", busSalesOrderDetailsVoResultBean.getData().getBusSalesOrderPrice().getSingleFinalPrice()); + ResultBean vinNo = busOrderVehicleFeign.getVehicleVINNoByOrderSid(dto.getBusSid()); + map.put("VINNo", vinNo.getData()); // 车架号 + // 上装信息 + AppBaseModelSzconfigDetailsVo szconfig = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(model.getData().getSid()); + map.put("topName", szconfig.getTopName()); // 上装 + // 优惠说明信息 + ResultBean> discountList = busOrderDiscountFeign.getAppDiscountListVoByOrderSid(order.getOrderSid()); + map.put("discountDetail", ""); // 优惠说明 ？待确认 + if (discountList.getSuccess()) { + map.put("discountDetail", discountList.getData().get(0).getDetail()); // 优惠说明 ？待确认 + } + // 保险说明信息 + map.put("insuranceDetail", "首次在本店投保，第二、三年继续在本店续保。（不在公司投保的，不显示）"); // 保险说明 ？待确认 + // 车辆交付地点 +// map.put("deliveryPlace", model.getData().getExpected_takecar_location()); + + List list = new ArrayList<>(); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(5, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + return genCarSaleContract(dto, map, order); + }); + Future future2 = pool.submit(() -> { + return genVehicleRegistration(dto, map); + }); + Future future3 = pool.submit(() -> { + // 客户开票申请书（暂时先不考虑） + if (dto.getIsAdvanceInvoice() == 1) { + return genAdvanceInvoice(dto, map); + } else { + return ""; + } + }); + Future future4 = pool.submit(() -> { + // 委托提车授权书 + if (dto.getIsEntrustVehicle() == 1) { + return genEntrustVehicle(dto, map); + } else { + return ""; + } + }); + Future future5 = pool.submit(() -> { + return genCarSaleContractBlank(dto, map, order); + }); + + future1.get(); + future2.get(); + future3.get(); + future4.get(); + future5.get(); + PrintConfirmVo printConfirmVo = null; + if (StringUtils.isNotBlank(future1.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 +// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); + printConfirmVo.setDownloadUrl(future1.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future2.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.VEHICLEREGISTRATION.getName())); + printConfirmVo.setDownloadUrl(future2.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future3.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CUSTOMERINVOICINGAPPLICATION.getName())); + printConfirmVo.setDownloadUrl(future3.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future4.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.ENTRUSTPICKUPAUTHORIZATION.getName())); + printConfirmVo.setDownloadUrl(future4.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future5.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 +// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName())); + printConfirmVo.setDownloadUrl(future5.get()); + list.add(printConfirmVo); + } + } catch (Exception e) { + e.printStackTrace(); + return new ResultBean().fail().setMsg("生成文件失败"); + } + return new ResultBean().success().setData(list); + }*/ + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index e7c95c2ca9..797f0be218 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -144,5 +144,4 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid, @RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid); - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 6efc846707..e98c61a657 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -92,4 +92,6 @@ public interface BusSalesOrderMapper extends BaseMapper { * @param businessSid 销售订单sid */ void updateStateByBusinessSid(@Param("state") int state, @Param("businessSid") String businessSid); + + int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 555a79f4ed..bef37b6b46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -87,4 +87,12 @@ set state = #{state} where sid = #{businessSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 8f2701830d..9983afd1c6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -80,10 +80,14 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -150,6 +154,8 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = new BusSalesOrder(); BeanUtil.copyProperties(dto, busSalesOrder, "sid"); + busSalesOrder.setCreateDate(new Date()); + busSalesOrder.setBillNo(generateBillNo(dto.getUserSid()).get("billNo_Num")); baseMapper.insert(busSalesOrder); String sid = busSalesOrder.getSid(); //主车车型信息保存 @@ -740,6 +748,8 @@ public class BusSalesOrderService extends MybatisBaseService generateBillNo(String userSid){ + List commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData(); + String billsType = ""; + if (commonVoList.size() > 0) { + for (int i = 0; i < commonVoList.size(); i++) { + if (commonVoList.get(i).getDictValue().contains("销售订单")) { + billsType = commonVoList.get(i).getDictKey(); + } + } + } + AppUserOrgInfoVo userOrgInfo = null; + String orgCode = ""; + String orgSid = ""; + String orgName = ""; + ResultBean resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid); + if (resultBean.getSuccess() && resultBean.getData() != null) { + userOrgInfo = resultBean.getData(); + orgSid = userOrgInfo.getOrgSid(); + orgName = userOrgInfo.getOrgName(); + orgCode = userOrgInfo.getOrgCode(); + } + String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd"); + // 流水号 + int i = selectCountByOrgSid(billsType, date, orgSid); + String num = String.format("%04d", i + 1); // 不足4位补0 + Map map = new HashMap<>(); + map.put("billNo_Num", billsType + orgCode + date.replaceAll("-","") + num); + map.put("billNo", billsType + orgCode + date.replaceAll("-","")); + map.put("staffSid", userOrgInfo.getStaffSid()); + map.put("staffName", userOrgInfo.getStaffName()); + map.put("orgSid", orgSid); + map.put("orgName", orgName); + return map; + } + + public int selectCountByOrgSid(String billsType, String date, String orgSid) { + return baseMapper.selectCountByOrgSid(billsType, date, orgSid); + } } \ No newline at end of file From 0b4c5f035e3f8ac4355e64efe36bb12f21dfcd11 Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Wed, 18 May 2022 11:06:20 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=A4=96=E9=87=87?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js index 8c94e6c467..d1d69d633f 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js @@ -4,8 +4,8 @@ import qs from 'qs' // 车型与常用配置关联表条件查询 已改 export function pagerList(data) { return request({ - // url: '/base/basevehmodelconfig/listPage', data, - url: '/base/v1/basemodelconfig/pagerList', data, + url: '/base/basevehmodelconfig/listPage', data, + //url: '/base/v1/basemodelconfig/pagerList', data, method: 'post', headers: { 'Content-Type': 'application/json' } }) From de708d227e9f3f67b523507bce3ffbdad1033441 Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Wed, 18 May 2022 11:11:46 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=A4=96=E9=87=87?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/BaseVehicleFeignFallback.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index dee0978b32..4c34d257af 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import javax.validation.Valid; import java.io.IOException; import java.text.ParseException; import java.util.List; @@ -174,4 +175,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean saveCarConfigSummaryInfo(@Valid AppCarConfigSummaryDto dto) { + return null; + } + } \ No newline at end of file From 4d33a7a088f2acf5d71ee5c0799ced5e4ac88572 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 18 May 2022 11:24:25 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E5=88=B6=E5=8D=95=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java | 2 ++ .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 763ba63901..752b18a7ea 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -61,6 +61,8 @@ import java.util.List; public class BusSalesOrderDetailsVo implements Vo { private static final long serialVersionUID = -7574451321354327831L; + @ApiModelProperty("销售订单编号") + private String billNo; @ApiModelProperty("销售部门sid") private String orgSid; @ApiModelProperty("销售部门") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 9983afd1c6..1c5b880b99 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorder; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; @@ -233,6 +234,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Wed, 18 May 2022 13:00:10 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=9F=A5=E8=AF=A2sql?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml | 2 +- .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index 4d20994536..ecee9ea395 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -517,7 +517,7 @@ bvm.brandName as brand, bvm.carBrand as brandSid, ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid AND - lockedState = '0004' ) AS nowCarNum, + lockedState = '03' ) AS nowCarNum, ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid and bvad.configSid = bmc.sid) AS produceCarNum FROM base_vehmodel_config bvc diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 718e3ea424..f99f7bff7a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -493,8 +493,8 @@ bvm.gearboxTypeValue, bvc.priceValidity, bvc.guidedPrice, - (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum, - (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum, + (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid) AS configNum, + (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum, (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum