Browse Source

Merge remote-tracking branch 'origin/master'

master
God 3 years ago
parent
commit
fd1eba3c8b
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java
  2. 28
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java
  3. 31
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java
  4. 31
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java
  5. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  6. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  7. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java
  8. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
  9. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java
  10. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java
  11. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  12. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  13. 56
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  14. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  15. 82
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  16. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java
  17. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml
  18. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java
  19. 27
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
  20. 202
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
  21. 153
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  22. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java
  23. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  24. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  25. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  26. 51
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  27. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
  28. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  29. 14
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  30. 4
      anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js

3
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;
}

28
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<AppBaseNowProduceCarVo> records;
@ApiModelProperty("常用配置")
private String commonlyConfig;
@ApiModelProperty("页数")
private Long pages;
}

31
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;
}

31
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;
}

8
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<AppBaseConfigNowCarVo> getModelNowCarList(@RequestBody PagerQuery<AppBaseConfigNowCarQuery> pagerQuery);
@ApiOperation("手机端-配置列表获取排产列表")
@PostMapping("/getModelOrderCarList")
public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(@RequestBody PagerQuery<AppBaseConfigNowCarQuery> pagerQuery);
@ApiOperation("手机端-保存 询价 其他配置说明")
@PostMapping("/saveCarConfigSummaryInfo")
public ResultBean saveCarConfigSummaryInfo(@Valid @RequestBody AppCarConfigSummaryDto dto);
}

11
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;
@ -169,4 +170,14 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
return null;
}
@Override
public ResultBean saveCarConfigSummaryInfo(@Valid AppCarConfigSummaryDto dto) {
return null;
}
}

18
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;
}

5
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<List<AppResultData>> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid",required = false) String manufacturerSid);
@ApiOperation("手机端-获取品牌数据字典")
@GetMapping("/selectAppListByUserSid/{userSid}")
ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@PathVariable("userSid") String userSid);
}

5
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<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid) {
return null;
}
}

6
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;
}

2
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

30
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<BaseVehicle> {
/**
* 根据车型配置及车型查询现车的数量
*
* @param qw 查询条件
* @return
*/
Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> 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<AppBaseNowProduceCarVo> getModelOrderCarList(IPage<AppBaseNowProduceCarVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseNowProduceCarVo> qw);
}

56
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
@ -663,17 +663,63 @@
</select>
<select id="fetchVehicle" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
SELECT * FROM base_vehicle
${ew.customSqlSegment}
SELECT *
FROM base_vehicle ${ew.customSqlSegment}
</select>
<select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
SELECT vinNo AS vin,
vehicleStateValue AS `state`,
carColor AS color,
location AS address
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
${ew.customSqlSegment}
</select>
<select id="selectVehicleCount" resultType="java.lang.Integer">
select count(*)
from base_vehicle bv
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectByModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
select bvm.vehicleAlias AS modelName,
bv.guidedPrice AS price,
bmc.configName AS commonlyConfig
from base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
where bv.modelSid = #{modelSid}
AND bv.modelConfigSid = #{configSid}
AND bv.useOrg = #{useOrg}
</select>
<select id="getModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
select bvm.vehicleAlias AS modelName,
bvc.guidedPrice AS price,
bmc.configName AS commonlyConfig
from base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
where bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
</select>
<select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
select bvo.orderNo AS orderId,
bvo.orderStatus AS state,
bvo.orderDate AS `date`,
bvo.expectLaunchDate AS forecastDate,
bvo.launchDate AS `upDate`,
bvo.offlineDate AS downDate,
bvo.platformNo AS `number`
from bus_vehicle_order bvo
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

18
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<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
@ -547,5 +551,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
ResultBean<AppBaseConfigOrderCarVo> 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();
}
}

82
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<BaseVehicleMapper, Ba
@Autowired
private BaseModelConfigService baseModelConfigService;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private CommonAppendixService commonAppendixService;
@Autowired
private BaseVehicleAppendixService baseVehicleAppendixService;
@ -1166,32 +1171,32 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (query.getSidList().size() > 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<BaseVehicleVo> fetchVehicle(String vehicleSid,String modelSid) {
public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid, String modelSid) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid,modelSid);
QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid, modelSid);
BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw);
return rb.success().setData(baseVehicleVo);
}
private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid,String modelSid) {
private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid, String modelSid) {
QueryWrapper<BaseVehicleVo> 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<BaseVehicleMapper, Ba
public AppBaseConfigNowCarVo getModelNowCarList(PagerQuery<AppBaseConfigNowCarQuery> 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<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(query);
IPage<AppBaseVinNowCarVo> page = PagerUtil.queryToPage(pagerQuery);
@ -1214,6 +1219,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
vinNowCarVos.add(record);
}
appBaseConfigNowCarVo.setRecords(vinNowCarVos);
long pages = pagging.getPages();
appBaseConfigNowCarVo.setPages(pages);
return appBaseConfigNowCarVo;
}
@ -1221,23 +1228,66 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
QueryWrapper<AppBaseVinNowCarVo> 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<AppBaseConfigNowCarQuery> 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<AppBaseNowProduceCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseNowProduceCarVo> qw = nowProduceWrapper(query);
IPage<AppBaseNowProduceCarVo> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppBaseNowProduceCarVo> pagging = baseMapper.getModelOrderCarList(page, qw);
List<AppBaseNowProduceCarVo> records = pagging.getRecords();
for (AppBaseNowProduceCarVo record : records) {
vinNowCarVos.add(record);
}
appBaseConfigOrderCarVo.setRecords(vinNowCarVos);
long pages = pagging.getPages();
appBaseConfigOrderCarVo.setPages(pages);
return appBaseConfigOrderCarVo;
}
private QueryWrapper<AppBaseNowProduceCarVo> nowProduceWrapper(AppBaseConfigNowCarQuery query) {
QueryWrapper<AppBaseNowProduceCarVo> 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
*/

2
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<BaseVehicleBrand> {
@Select("select brandShortName from base_vehicle_brand where sid=#{sid}")
String getBrandShortName(@Param("sid") String sid);
List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(@Param("useOrg") String useOrg);
}

7
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}
</select>
<!--根据分公司sid查询所有品牌列表-->
<select id="selectAppListByUserSid"
resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo">
SELECT bvb.brandName as dictValue, bvb.sid as dictKey, bvb.sid
FROM base_vehicle_brand bvb
where bvb.useOrg = #{useOrg}
</select>
</mapper>

6
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<AppResultData> resultData = baseVehicleBrandService.selectAppListByManufacturerSid(manufacturerSid);
return new ResultBean<List<AppResultData>>().success().setData(resultData);
}
@Override
public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid) {
List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid);
return new ResultBean<List<BaseVehicleBrandDictionariesVo>>().success().setData(list);
}
}

27
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<BaseVehicleBrand
*/
private QueryWrapper<BaseVehicleBrandVo> buildQueryWrapper(BaseVehicleBrandQuery pagerQuery) {
QueryWrapper<BaseVehicleBrandVo> 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<BaseVehicleBrand
if (StringUtils.isNotBlank(brandCode)) {//品牌编码
qw.like("bvb.brandCode", brandCode);
}
if(StringUtils.isNotBlank(query.getManufacturerName())){
qw.like("bm.manufacturerName",query.getManufacturerName());
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("bm.manufacturerName", query.getManufacturerName());
}
return baseMapper.listExcel(qw);
}
@ -149,8 +149,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
if (resultBean.getSuccess()) {
list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
}
// s = new String[][]{list1};
s[i]=list1;
// s = new String[][]{list1};
s[i] = list1;
}
baseVehicleBrandDetailsVo.setUseOrg(s);
}
@ -222,10 +222,25 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
/**
* 根据sid查询品牌简称
*
* @param sid
* @return
*/
public String getBrandShortName(String sid) {
return baseMapper.getBrandShortName(sid);
};
}
;
/**
* 手机端-获取品牌数据字典
*
* @param userSid
* @return
*/
public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(String userSid) {
String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(useOrg);
return list;
}
}

202
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<BusVehicleInquiryMapper, BusVehicleInquiry> {
public PagerVo<BusVehicleInquiry> listPage(PagerQuery<BusVehicleInquiryQuery> pq) {
BusVehicleInquiryQuery query = pq.getParams();
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleInquiry> pagging = baseMapper.selectPage(page, qw);
PagerVo<BusVehicleInquiry> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BusVehicleInquiry> listAll(BusVehicleInquiryQuery query) {
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<BusVehicleInquiry> createQueryWrapper(BusVehicleInquiryQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusVehicleInquiry> 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<BusVehicleInquiryVo> listPageVo(PagerQuery<BusVehicleInquiryQuery> pq) {
BusVehicleInquiryQuery query = pq.getParams();
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleInquiryVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusVehicleInquiryVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BusVehicleInquiryVo> listAllVo(BusVehicleInquiryQuery query) {
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<BusVehicleInquiryVo> 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<BusVehicleInquiry> listPage(PagerQuery<BusVehicleInquiryQuery> pq) {
BusVehicleInquiryQuery query = pq.getParams();
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleInquiry> pagging = baseMapper.selectPage(page, qw);
PagerVo<BusVehicleInquiry> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BusVehicleInquiry> listAll(BusVehicleInquiryQuery query) {
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<BusVehicleInquiry> createQueryWrapper(BusVehicleInquiryQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusVehicleInquiry> 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<BusVehicleInquiryVo> listPageVo(PagerQuery<BusVehicleInquiryQuery> pq) {
BusVehicleInquiryQuery query = pq.getParams();
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleInquiryVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusVehicleInquiryVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BusVehicleInquiryVo> listAllVo(BusVehicleInquiryQuery query) {
QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<BusVehicleInquiryVo> 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);
}
}

153
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<CommonContractMapp
private BaseModelSzconfigService baseModelSzconfigService;
@Autowired
private BaseTrailerService baseTrailerService;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -577,7 +581,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @param dto
* @return
*/
/* public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
/*public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
Map<String, Object> map = new HashMap<String, Object>();
// 合同信息
CommonContract contract = fetchBySid(dto.getSid());
@ -587,6 +591,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("contractNo", contract.getContractNo()); // 合同编号
map.put("createDate", contract.getCreateDate()); // 签订时间
// 客户信息;
BusOrderVo order = busOrderFeign.fetchSid(dto.getBusSid()).getData();
map.put("customerName", order.getCustomerName()); // 联系电话
map.put("mobile", order.getMobile()); // 联系电话
@ -1171,6 +1176,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*/
/* public ResultBean<List<PrintConfirmVo>> printConfirm1(PrintConfirmDto dto) {
Map<String, Object> map = new HashMap<>();*/
/**
* 车辆登记合同参数
* 甲方${partyA}
@ -1179,10 +1185,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* 车辆出售方${partyA}
* 车辆信息List:
* {
* 序号
* 品牌${item.brandName}
* 车架号${item.VINNo}
* 发动机号${item.engineNo}
* 序号
* 品牌${item.brandName}
* 车架号${item.VINNo}
* 发动机号${item.engineNo}
* }
*/
//甲方为卖方,即xxx公司,即根据销售订单的单位sid查询单位的名称
@ -1198,4 +1204,129 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("IDNumber", orderVo.getIDNumber());
}*/
// }
/* public ResultBean<List<PrintConfirmVo>> printConfirm2(PrintConfirmDto dto) {
ResultBean<List<PrintConfirmVo>> rb = ResultBean.fireFail();
Map<String, Object> map = new HashMap<String, Object>();
// 合同信息
CommonContract contract = fetchBySid(dto.getSid());
// 甲方
map.put("partyA", contract.getPartyA());
// 乙方
map.put("partyB", contract.getPartyB());
// 合同编号
map.put("contractNo", contract.getContractNo());
// 客户信息
ResultBean<BusSalesOrderDetailsVo> 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<String> vinNo = busOrderVehicleFeign.getVehicleVINNoByOrderSid(dto.getBusSid());
map.put("VINNo", vinNo.getData()); // 车架号
// 上装信息
AppBaseModelSzconfigDetailsVo szconfig = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(model.getData().getSid());
map.put("topName", szconfig.getTopName()); // 上装
// 优惠说明信息
ResultBean<List<AppBusOrderDiscountListVo>> 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<PrintConfirmVo> list = new ArrayList<>();
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(5, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, order);
});
Future<String> future2 = pool.submit(() -> {
return genVehicleRegistration(dto, map);
});
Future<String> future3 = pool.submit(() -> {
// 客户开票申请书(暂时先不考虑)
if (dto.getIsAdvanceInvoice() == 1) {
return genAdvanceInvoice(dto, map);
} else {
return "";
}
});
Future<String> future4 = pool.submit(() -> {
// 委托提车授权书
if (dto.getIsEntrustVehicle() == 1) {
return genEntrustVehicle(dto, map);
} else {
return "";
}
});
Future<String> 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);
}*/
}

2
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("销售部门")

1
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<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid,
@RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
}

2
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<BusSalesOrder> {
* @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);
}

8
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}
</update>
<select id="selectCountByOrgSid" resultType="int">
SELECT count(*)
FROM bus_sales_order
WHERE createDate = #{date}
AND orgSid = #{orgSid}
AND billNo LIKE concat(#{billsType}, '%')
</select>
</mapper>

51
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;
@ -80,10 +81,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 +155,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private BasePostPriceFeign basePostPriceFeign;
@Autowired
private BaseVehiclePolicyFeign baseVehiclePolicyFeign;
@Autowired
private DictCommonFeign dictCommonFeign;
/**
* 构造查询条件
@ -227,6 +234,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo();
BeanUtil.copyProperties(entity, vo);
vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
//查询主车车型信息
BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
if (busSalesOrderModelDetailsVo != null) {
@ -503,6 +511,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<BusDepositFictitiousDto> 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 +750,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//更新销售订单的状态为已通过的状态:审批通过1
//ToDo:
updateStateByBusinessSid(1,variables.get("businessSid").toString());
//通过后新增合同表中的信息。
@ -1222,4 +1234,43 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
return rb.success().setMsg("删除成功");
}
public Map<String, String> generateBillNo(String userSid){
List<DictCommonVo> 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<AppUserOrgInfoVo> 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<String, String> 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);
}
}

2
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue

@ -8,7 +8,7 @@
<el-button type="primary" size="small" icon="el-icon-edit" @click="handleUpdate()">编辑</el-button>
<el-button type="success" size="small" icon="el-icon-user" @click="handleGenjin()">客户跟进</el-button>
<el-button type="success" size="small" icon="el-icon-user" @click="handleZiliao()">客户档案</el-button>
<el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
<!-- <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>-->
<el-button type="success" size="small">导入</el-button>
<el-button type="success" size="small" @click="handleDaoChu()">导出</el-button>
<el-button type="info" size="small" icon="el-icon-close">关闭</el-button>

2
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
</select>
<update id="updateQrCodePath">

14
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<SysOrganizationMa
* @return
*/
public SysOrganizationVo getUseOrgBySid(String orgSidPath) {
SysOrganizationVo sysOrganizationVo = null;
String[] split = orgSidPath.split("/");
for (int i = 0; i < split.length; i++) {
String sid = split[i];
sysOrganizationVo = baseMapper.getUseOrgBySid(sid);
}
if (sysOrganizationVo == null) {
SysOrganizationVo sysOrganizationVo1 = new SysOrganizationVo();
return sysOrganizationVo1;
SysOrganizationVo sysOrganizationVo = baseMapper.getUseOrgBySid(split[i]);
if (sysOrganizationVo != null) {
return sysOrganizationVo;
}
}
SysOrganization sysOrganization = fetchBySid(split[0]);// 总公司为所在公司
SysOrganizationVo sysOrganizationVo = new SysOrganizationVo();
BeanUtil.copyProperties(sysOrganization, sysOrganizationVo);
return sysOrganizationVo;
}

4
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' }
})

Loading…
Cancel
Save