Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -79,7 +79,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
-        //后桥
+        /*//后桥
         if (StringUtils.isNotBlank(dto.getRearAxleValue()) && !"-".equals(dto.getRearAxleValue())) {
             configName += dto.getRearAxleValue() + "/";
         }
@@ -158,7 +158,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         //配置包
         if (StringUtils.isNotBlank(dto.getConfiguringBao()) && !"-".equals(dto.getConfiguringBao())) {
             configName += dto.getConfiguringBao() + "/";
-        }
+        }*/
+        configName = baseModelConfigService.configNameSpell(entity);
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
         List<String> stringList = baseModelConfigService.checkByConfigName(sid);
@@ -189,7 +190,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
-        //后桥
+        /*//后桥
         if (StringUtils.isNotBlank(dto.getRearAxleValue()) && !"-".equals(dto.getRearAxleValue())) {
             configName += dto.getRearAxleValue() + "/";
         }
@@ -268,7 +269,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         //配置包
         if (StringUtils.isNotBlank(dto.getConfiguringBao()) && !"-".equals(dto.getConfiguringBao())) {
             configName += dto.getConfiguringBao() + "/";
-        }
+        }*/
+        configName = baseModelConfigService.configNameSpell(entity);
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
         List<String> stringList = baseModelConfigService.checkByConfigName(sid);
@@ -309,7 +311,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         }
         dto.setCreateOrgSId(sid1);
         String configName = "";
-        //后桥
+        /*//后桥
         if (StringUtils.isNotBlank(dto.getRearAxleValue()) && !"-".equals(dto.getRearAxleValue())) {
             configName += dto.getRearAxleValue() + "/";
         }
@@ -388,9 +390,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         //配置包
         if (StringUtils.isNotBlank(dto.getConfiguringBao()) && !"-".equals(dto.getConfiguringBao())) {
             configName += dto.getConfiguringBao() + "/";
-        }
-        dto.setConfigName(configName);
-        String otherConfig = dto.getOtherConfig();
+        }*/
+        BeanUtil.copyProperties(dto,baseModelConfig);
+        configName = baseModelConfigService.configNameSpell(baseModelConfig);
+        baseModelConfig.setConfigName(configName);
+        String otherConfig = baseModelConfig.getOtherConfig();
         configName += otherConfig;
         List<String> stringList = baseModelConfigService.checkConfigNameBySid(sid,sid1);
         for (String s : stringList) {
@@ -398,8 +402,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
                 return rb.setMsg("该常用配置已存在");
             }
         }
-        int i = baseModelConfigService.updateBySid(dto.toMap(), sid);
-        if (i == 0) {
+        boolean i = baseModelConfigService.updateById(baseModelConfig);
+        if (!i) {
             return rb.setMsg("修改失败");
         }
         return rb.success().setMsg("修改成功");
@@ -408,10 +412,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean deleteBySids(String sids, String userSid) {
         List<String> sidList = Arrays.asList(sids.split(","));
-//        int count = baseModelConfigService.deleteBySids(sidList);
-//        if (count != sidList.size()) {
-//            return ResultBean.fireFail().setMsg("删除失败");
-//        }
         for (String sid : sidList) {
             int i = baseVehmodelConfigService.checkByConfigSid(sid);
             if (i > 0) {
@@ -452,17 +452,10 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean<PagerVo<AppChooseBaseModelConfigVo>> getAppChooseListByModelSid(PagerQuery<BaseModelConfigQuery> pagerQuery) {
         ResultBean<PagerVo<AppChooseBaseModelConfigVo>> rb = ResultBean.fireFail();
-       /* if (StringUtils.isBlank(pagerQuery.getParams().getVehicleSid())) {
-            return rb.setMsg("车型sid不能为空");
-        }*/
         IPage<AppChooseBaseModelConfigVo> page = baseModelConfigService.getAppChooseListByModelSid(pagerQuery);
         PagerVo<AppChooseBaseModelConfigVo> pv = new PagerVo<>();
         PagerVo<AppChooseBaseModelConfigVo> pv1 = PagerUtil.pageToVo(page, pv);
         pv1.setMsg("查询到以下" + page.getTotal() + "种配置");
-        /*BaseVehicleModel vehicleModel = baseVehicleModelService.fetchBySid(pagerQuery.getParams().getVehicleSid());
-        Map<String, Object> map = new HashMap<>();
-        map.put("modelName", vehicleModel.getModelName());
-        pv1.setMap(map);*/
         return rb.success().setData(pv1);
     }
 

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

@@ -897,14 +897,14 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         ModelConfigVo vo = baseMapper.getStockModelConfigList(modelSid, orgSid);
         List<ModelLabel> modelLabels = new ArrayList<>();
         StringBuilder labelValue = new StringBuilder();
-        if (StringUtils.isNotBlank(vo.getLabelName())){
+        if (StringUtils.isNotBlank(vo.getLabelName())) {
             String[] labelNames = vo.getLabelName().split(",");
             for (String labelName : labelNames) {
                 labelValue.append(labelName).append("/");
             }
         }
-        if (StringUtils.isNotBlank(labelValue.toString())){
-            vo.setLabelValue(labelValue.substring(0,labelValue.lastIndexOf("/")));
+        if (StringUtils.isNotBlank(labelValue.toString())) {
+            vo.setLabelValue(labelValue.substring(0, labelValue.lastIndexOf("/")));
         }
         List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
         List<String> modelImagesList = new ArrayList<>();
@@ -1006,7 +1006,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigLableList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid, params.getLabel());
         for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
-            if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())){
+            if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())) {
                 String labelName = appModelConfigListVo.getLabelName();
                 String[] mains = labelName.split(",");
                 List<ModelLabel> modelLabelss = new ArrayList<>();
@@ -1055,6 +1055,91 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     }
 
     public BaseModelConfigVo selectByConfigName(String sid, String configName) {
-        return baseMapper.selectByConfigName(sid,configName);
+        return baseMapper.selectByConfigName(sid, configName);
+    }
+
+    public String configNameSpell(BaseModelConfig baseModelConfig) {
+        String configName = "";
+        //后桥
+        if (StringUtils.isNotBlank(baseModelConfig.getRearAxleValue()) && !"-".equals(baseModelConfig.getRearAxleValue())) {
+            configName += baseModelConfig.getRearAxleValue() + "/";
+        }
+        //速比
+        if (StringUtils.isNotBlank(baseModelConfig.getRearAxleRatio()) && !"-".equals(baseModelConfig.getRearAxleRatio())) {
+            configName += baseModelConfig.getRearAxleRatio() + "/";
+        }
+        //轴距
+        if (StringUtils.isNotBlank(baseModelConfig.getWheelbase()) && !"-".equals(baseModelConfig.getWheelbase())) {
+            configName += baseModelConfig.getWheelbase() + "/";
+        }
+        //悬架
+        if (StringUtils.isNotBlank(baseModelConfig.getSuspension()) && !"-".equals(baseModelConfig.getSuspension())) {
+            configName += baseModelConfig.getSuspension() + "/";
+        }
+        //鞍座
+        if (StringUtils.isNotBlank(baseModelConfig.getSaddle()) && !"-".equals(baseModelConfig.getSaddle())) {
+            configName += baseModelConfig.getSaddle() + "/";
+        }
+        //颜色
+        if (StringUtils.isNotBlank(baseModelConfig.getCarColor()) && !"-".equals(baseModelConfig.getCarColor())) {
+            configName += baseModelConfig.getCarColor() + "/";
+        }
+        //驾驶室
+        if (StringUtils.isNotBlank(baseModelConfig.getSpecification()) && !"-".equals(baseModelConfig.getSpecification())) {
+            configName += baseModelConfig.getSpecification() + "/";
+        }
+        //保险杠
+        if (StringUtils.isNotBlank(baseModelConfig.getBumper()) && !"-".equals(baseModelConfig.getBumper())) {
+            configName += baseModelConfig.getBumper() + "/";
+        }
+        //燃料箱
+        if (StringUtils.isNotBlank(baseModelConfig.getFuelTank()) && !"-".equals(baseModelConfig.getFuelTank())) {
+            configName += baseModelConfig.getFuelTank() + "/";
+        }
+        //导流罩
+        if (StringUtils.isNotBlank(baseModelConfig.getBaffleModel()) && !"-".equals(baseModelConfig.getBaffleModel())) {
+            configName += baseModelConfig.getBaffleModel() + "/";
+        }
+        //独立热源
+        if (StringUtils.isNotBlank(baseModelConfig.getIndependentSources()) && !"-".equals(baseModelConfig.getIndependentSources())) {
+            configName += baseModelConfig.getIndependentSources() + "/";
+        }
+        //缓速器
+        if (StringUtils.isNotBlank(baseModelConfig.getSlowMachine()) && !"-".equals(baseModelConfig.getSlowMachine())) {
+            configName += baseModelConfig.getSlowMachine() + "/";
+        }
+        //护轮罩
+        if (StringUtils.isNotBlank(baseModelConfig.getTireCover()) && !"-".equals(baseModelConfig.getTireCover())) {
+            configName += baseModelConfig.getTireCover() + "/";
+        }
+        //后视镜
+        if (StringUtils.isNotBlank(baseModelConfig.getRearViewMirror()) && !"-".equals(baseModelConfig.getRearViewMirror())) {
+            configName += baseModelConfig.getRearViewMirror() + "/";
+        }
+        //轮胎
+        if (StringUtils.isNotBlank(baseModelConfig.getTireSize()) && !"-".equals(baseModelConfig.getTireSize())) {
+            configName += baseModelConfig.getTireSize() + "/";
+        }
+        //轮毂材质
+        if (StringUtils.isNotBlank(baseModelConfig.getHubMaterial()) && !"-".equals(baseModelConfig.getHubMaterial())) {
+            configName += baseModelConfig.getHubMaterial() + "/";
+        }
+        //空调
+        if (StringUtils.isNotBlank(baseModelConfig.getAirConditioner()) && !"-".equals(baseModelConfig.getAirConditioner())) {
+            configName += baseModelConfig.getAirConditioner() + "/";
+        }
+        //座椅
+        if (StringUtils.isNotBlank(baseModelConfig.getSeat()) && !"-".equals(baseModelConfig.getSeat())) {
+            configName += baseModelConfig.getSeat() + "/";
+        }
+        //多媒体
+        if (StringUtils.isNotBlank(baseModelConfig.getMultimedia()) && !"-".equals(baseModelConfig.getMultimedia())) {
+            configName += baseModelConfig.getMultimedia() + "/";
+        }
+        //配置包
+        if (StringUtils.isNotBlank(baseModelConfig.getConfiguringBao()) && !"-".equals(baseModelConfig.getConfiguringBao())) {
+            configName += baseModelConfig.getConfiguringBao() + "/";
+        }
+        return configName;
     }
 }

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

@@ -497,14 +497,14 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     public ResultBean saveOrUpdateAll(BaseVehicleModelDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
-        String modelName = appendModelName(dto);
+        String modelName = "";
+//        String modelName = appendModelName(dto);
         if (StringUtils.isBlank(sid)) {
             BaseVehicleModel entity = new BaseVehicleModel();
             String userSid = dto.getUserSid();
             String sid2 = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-            String sid1 = entity.getSid();
-            BeanUtil.copyProperties(dto, entity);
-            entity.setSid(sid1);
+            BeanUtil.copyProperties(dto, entity,"sid");
+            modelName = appendModelName(entity);
             entity.setModelName(modelName);
             entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
             int i = baseMapper.checkSaveByModelName(modelName);
@@ -538,6 +538,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
+        BeanUtil.copyProperties(dto,baseVehicleModel,"sid");
+        modelName = appendModelName(baseVehicleModel);
         dto.setModelName(modelName);
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         int i = baseMapper.checkUpdateByModelName(modelName, sid);
@@ -565,7 +567,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     }
 
     //拼接车型全名称
-    private String appendModelName(BaseVehicleModelDto dto){
+    public String appendModelName(BaseVehicleModel dto){
         StringBuilder modelName = new StringBuilder();
         //功能
         if (StringUtils.isNotBlank(dto.getVehicleTypeValue()) && !"-".equals(dto.getVehicleTypeValue())){

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 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.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -14,6 +15,7 @@ import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
+import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
@@ -166,6 +168,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseModelConfigService baseModelConfigService;
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1692,10 +1696,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
-        String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue();
+        BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appOrderModelInfoVo.getConfigSid());
+        String modelName1 = baseVehicleModelService.appendModelName(baseVehicleModel);
         String modelName = "车型：" + baseVehicleModel.getVehicleAlias()+"。";
         //配置：后桥/速比/轴距/悬架/鞍座/颜色/驾驶室/保险杠/燃料箱/导流罩/独立热源/缓速器/护轮罩/后视镜/轮胎/轮毂材质/空调/坐骑/多媒体/配置包
-        String modelConfig = "配置：" + baseVehicleModel.getModelName()+"/"+appOrderModelInfoVo.getConfig() + "。";
+        String configName = baseModelConfigService.configNameSpell(baseModelConfig);
+        String modelConfig = "配置：" + modelName1+"/"+configName + "。";
         //上装
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();