yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改问题

zhanglei
dimengzhe 2 years ago
parent
1fa65db5a9
commit
f9aebf3cf4
7 changed files with 57 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java
  2. 44
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  3. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  4. 24
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
  5. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  6. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  7. 4
      anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java
View File

@ -58,8 +58,8 @@ public class ModelConfigListQuery implements Query {
private String userSid;
@ApiModelProperty("分公司：后端内部使用")
private String useOrg;
// @ApiModelProperty("分公司：机构sid")
// private String orgPath;
@ApiModelProperty("分公司：机构sid")
private String orgPath;
@ApiModelProperty(value = "标签")
private String label;

44
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
View File

@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.*;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
import com.yxt.anrui.base.api.basevehicle.ModelLabel;
import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
import com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo;
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
@ -321,7 +319,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
return iPage;
}*/
public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
/*public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
for (BaseModelConfigListVo record : records) {
// String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) && "有".equals(record.getSlowMachine()) ? ("缓速器" + "/") : "";
String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) ? (record.getSlowMachine() + "/") : "";
@ -373,7 +371,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
return records;
}
}*/
/**
* 更多配置分页列表(非本公司的)
@ -513,15 +511,15 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
public ModelConfigVo getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
String userSid = pagerQuery.getParams().getUserSid();
// String orgPath = pagerQuery.getParams().getOrgPath();
// String orgSid = "";
// if (StringUtils.isBlank(orgPath)) {
// orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
// } else {
// orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
// }
String orgPath = pagerQuery.getParams().getOrgPath();
String orgSid = "";
if (StringUtils.isBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
// 1、根据业务员部门sid查询分公司sid
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
// String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
if (StringUtils.isNotBlank(orgSid)) {
pagerQuery.getParams().setUseOrg(orgSid);
}
@ -559,7 +557,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
//配置列表
IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
// List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
long pages = page.getPages();
vo.setPages((int) pages);
@ -581,7 +578,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
appModelConfigListVo.setMoreList(moreConfigVos);
}
addDonfigName(appModelConfigListVos);
addDonfigName1(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
return vo;
}
@ -640,11 +637,22 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
appModelConfigListVo.setMoreList(moreConfigVos);
}*/
addDonfigName(appModelConfigListVos);
addDonfigName1(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
return vo;
}
public List<AppModelConfigListVo> addDonfigName1(List<AppModelConfigListVo> appModelConfigListVos) {
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
BaseModelConfig baseModelConfig = fetchBySid(appModelConfigListVo.getConfigSid());
String configName = configNameSpell(baseModelConfig);
appModelConfigListVo.setConfigName(configName);
}
return appModelConfigListVos;
}
/**
* 拼接常用车型字段（configName）
*
@ -870,7 +878,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
appModelConfigListVo.setMoreList(moreConfigVos);
}
addDonfigName(appModelConfigListVos1);
addDonfigName1(appModelConfigListVos1);
return appModelConfigListVos;
}
@ -1049,7 +1057,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
appModelConfigListVo.setMoreList(moreConfigVos);
}
addDonfigName(appModelConfigListVos);
addDonfigName1(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
return vo;
}

30
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.basemodelconfig.BaseModelConfig;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
import com.yxt.anrui.base.api.basevehicle.*;
@ -707,7 +708,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
vo.setPrice(guidedPriceMin + "-" + guidedPriceMax + "万元");
//拼接常用车型
List<AppModelConfigListVo> appModelConfigListVos = baseModelConfigService.selectAppConfigListByModelSid(modelSid);
addDonfigName(appModelConfigListVos);
baseModelConfigService.addDonfigName1(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
return vo;
}
@ -896,7 +897,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
configDetailVo.setMoreConfig(otherConfig);
}
//拼接常用配置字段
String modelInfoName = modelInfoName(configVo);
// String modelInfoName = modelInfoName(configVo);
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(configSid);
String modelInfoName = baseModelConfigService.configNameSpell(baseModelConfig);
configDetailVo.setModelInfoName(modelInfoName);
return configDetailVo;
}
@ -904,23 +907,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
// 拼接常用配置字段
public String modelInfoName(AppModelConfigDetailsVo configVo) {
/* String brandName = StringUtils.isNotBlank(currentCarVo.getBrandName()) ? (currentCarVo.getBrandName() + "/") : "";
String vehicleType = StringUtils.isNotBlank(currentCarVo.getVehicleTypeValue()) ? (currentCarVo.getVehicleTypeValue() + "/") : "";
String productLine = StringUtils.isNotBlank(currentCarVo.getProductLineValue()) ? (currentCarVo.getProductLineValue() + "/") : "";
String driveForm = StringUtils.isNotBlank(currentCarVo.getDriveFormValue()) ? (currentCarVo.getDriveFormValue() + "/") : "";
String power = StringUtils.isNotBlank(currentCarVo.getPowerValue()) ? (currentCarVo.getPowerValue() + "/") : "";
String vehicleVersion = StringUtils.isNotBlank(currentCarVo.getVehicleVersionValue()) ? (currentCarVo.getVehicleVersionValue() + "/") : "";
String fuelType = StringUtils.isNotBlank(currentCarVo.getFuelTypeValue()) ? (currentCarVo.getFuelTypeValue() + "/") : "";
String gearboxType = StringUtils.isNotBlank(currentCarVo.getGearboxTypeValue()) ? (currentCarVo.getGearboxTypeValue() + "/") : "";
String emissionStandard = StringUtils.isNotBlank(currentCarVo.getEmissionStandardValue()) ? (currentCarVo.getEmissionStandardValue() + "/") : "";
String engineType = StringUtils.isNotBlank(currentCarVo.getEngineTypeValue()) ? (currentCarVo.getEngineTypeValue() + "/") : "";
String marketSegments = StringUtils.isNotBlank(currentCarVo.getMarketSegments()) ? (currentCarVo.getMarketSegments() + "/") : "";
String specifications = StringUtils.isNotBlank(currentCarVo.getSpecifications()) ? (currentCarVo.getSpecifications() + "/") : "";
String department = StringUtils.isNotBlank(currentCarVo.getDepartment()) ? (currentCarVo.getDepartment() + "/") : "";
String modelInfoName = brandName + vehicleType + productLine + driveForm + power + vehicleVersion + fuelType +
gearboxType + emissionStandard + engineType + marketSegments + specifications + department;
return modelInfoName.substring(0, modelInfoName.length() - 1);*/
String color = StringUtils.isNotBlank(configVo.getCarColor())
? (configVo.getCarColor() + "/") : "";
String slowMachine = StringUtils.isNotBlank(configVo.getSlowMachine())
@ -1436,7 +1422,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
*/
public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
/*String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
@ -1475,7 +1461,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;*/
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appModelConfigListVo.getConfigSid());
String configName = baseModelConfigService.configNameSpell(baseModelConfig);
vo.setConfig(configName);
vo.setModel(appModelConfigListVo.getModel());
vo.setMoreConfig(appModelConfigListVo.getOtherConfig());

24
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
View File

@ -571,51 +571,51 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
StringBuilder modelName = new StringBuilder();
//功能
if (StringUtils.isNotBlank(dto.getVehicleTypeValue()) && !"-".equals(dto.getVehicleTypeValue())){
modelName.append(dto.getVehicleTypeValue()).append("/");
modelName.append(dto.getVehicleTypeValue());
}
//系列
if (StringUtils.isNotBlank(dto.getProductLineValue()) && !"-".equals(dto.getProductLineValue())){
modelName.append(dto.getProductLineValue()).append("/");
modelName.append("/").append(dto.getProductLineValue());
}
//驱动
if (StringUtils.isNotBlank(dto.getDriveFormValue()) && !"-".equals(dto.getDriveFormValue())){
modelName.append(dto.getDriveFormValue()).append("/");
modelName.append("/").append(dto.getDriveFormValue());
}
//马力
if (StringUtils.isNotBlank(dto.getPowerValue()) && !"-".equals(dto.getPowerValue())){
modelName.append(dto.getPowerValue()).append("/");
modelName.append("/").append(dto.getPowerValue());
}
//版本
if (StringUtils.isNotBlank(dto.getVehicleVersionValue()) && !"-".equals(dto.getVehicleVersionValue())){
modelName.append(dto.getVehicleVersionValue()).append("/");
modelName.append("/").append(dto.getVehicleVersionValue());
}
//燃料
if (StringUtils.isNotBlank(dto.getFuelTypeValue()) && !"-".equals(dto.getFuelTypeValue())){
modelName.append(dto.getFuelTypeValue()).append("/");
modelName.append("/").append(dto.getFuelTypeValue());
}
//排放标准
if (StringUtils.isNotBlank(dto.getEmissionStandardValue()) && !"-".equals(dto.getEmissionStandardValue())){
modelName.append(dto.getEmissionStandardValue()).append("/");
modelName.append("/").append(dto.getEmissionStandardValue());
}
//发动机型号
if (StringUtils.isNotBlank(dto.getEngineTypeValue()) && !"-".equals(dto.getEngineTypeValue())){
modelName.append(dto.getEngineTypeValue()).append("/");
modelName.append("/").append(dto.getEngineTypeValue());
}
//变速箱
if (StringUtils.isNotBlank(dto.getGearboxTypeValue()) && !"-".equals(dto.getGearboxTypeValue())){
modelName.append(dto.getGearboxTypeValue()).append("/");
modelName.append("/").append(dto.getGearboxTypeValue());
}
//细分市场
if (StringUtils.isNotBlank(dto.getMarketSegmentsValue()) && !"-".equals(dto.getMarketSegmentsValue())){
modelName.append(dto.getMarketSegmentsValue()).append("/");
modelName.append("/").append(dto.getMarketSegmentsValue());
}
//规格型号
if (StringUtils.isNotBlank(dto.getSpecifications()) && !"-".equals(dto.getSpecifications())){
modelName.append(dto.getSpecifications()).append("/");
modelName.append("/").append(dto.getSpecifications());
}
//系别
if (StringUtils.isNotBlank(dto.getDepartmentValue()) && !"-".equals(dto.getDepartmentValue())){
modelName.append(dto.getDepartmentValue());
modelName.append("/").append(dto.getDepartmentValue());
}
return modelName.toString();
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
View File

@ -536,7 +536,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
*/
public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
String carColor = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) ? (appModelConfigListVo.getCarColor() + "/") : "";
/*String carColor = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) ? (appModelConfigListVo.getCarColor() + "/") : "";
//缓速器
String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
? (appModelConfigListVo.getSlowMachine() + "/") : "";
@ -589,7 +589,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
? (appModelConfigListVo.getMultimedia() + "/") : "";
String configName = carColor + slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;*/
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appModelConfigListVo.getConfigSid());
String configName = baseModelConfigService.configNameSpell(baseModelConfig);
vo.setConfig(configName);
vo.setModel(appModelConfigListVo.getModel());
vo.setMoreConfig(appModelConfigListVo.getOtherConfig());

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -1019,13 +1019,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*/
private String getInvoicMessage(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
//根据分公司sid查询分公司开票申请
/*String invoicName = "";
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
invoicName = invoicingDetailsVoResultBean.getData().getName();
}*/
//查询销售订单的现车
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
@ -1045,7 +1038,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}else{
for (int i = 0; i < Integer.parseInt(orderModelInfoVo.getTotal()); i++) {
InvoicMessageContractVo vo = new InvoicMessageContractVo();
vo.setType(appOrderDetailsVo.getInvoiceType());
// vo.setType(appOrderDetailsVo.getInvoiceType());
invoicMessageContractVos.add(vo);
}
}
@ -1807,7 +1800,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
/*Future<String> future1 = pool.submit(() -> {
/* Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, appOrderDetailsVo);
});
Future<String> future1_2 = pool.submit(() -> {

4
anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl
View File

@ -779,7 +779,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${money!}</w:t>
<w:t> ${money!} </w:t>
</w:r>
<w:r>
<w:rPr>
@ -805,7 +805,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t> ${moneyDx!} </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t> ${moneyDx!} </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
</w:r>
<w:r>
<w:rPr>

Write Preview
Loading…
Cancel
Save