Merge remote-tracking branch 'origin/master'

3 years ago · 1e093aaae2
7 changed files with 95 additions and 62 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java
@ -19,6 +19,9 @@ public class AppCurrentCarDetailConfigVo implements Vo {
    @ApiModelProperty(value = "常用配置")
    private List<ConfigInfoSpanSize> configInfo;

+    @ApiModelProperty(value = "拼接常用配置")
+    private String modelInfoName;
+
    @ApiModelProperty(value = "更多配置")
    private String moreConfig;

--- 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
@ -554,9 +554,35 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        //更多配置
        String otherConfig = configVo.getOtherConfig();
        configDetailVo.setMoreConfig(otherConfig);
+        //拼接常用配置字段
+        String modelInfoName = modelInfoName(currentCarVo);
+        configDetailVo.setModelInfoName(modelInfoName);
        return configDetailVo;
    }

+
+    //    拼接常用配置字段
+    public String modelInfoName(AppCurrentCarDetailVo currentCarVo) {
+
+        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);
+    }
+
+
    public IPage<BaseVehicleListVo> exiCarPagerList(PagerQuery<ExiCarQuery> pq) {
        IPage<ExiCarQuery> page = PagerUtil.queryToPage(pq);
        QueryWrapper<BaseVehicleListVo> qw = exiCarBuildQueryWrapper(pq.getParams());
@ -1126,7 +1152,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        List<String> stringList = baseVehicleUpdateQuery.getVinNoLis();
        String settlementStatus = baseVehicleUpdateQuery.getSettlementStatus();
        String settlementStatusValue = baseVehicleUpdateQuery.getSettlementStatusValue();
-        return baseMapper.updateStatusByVinNo(stringList, settlementStatus,settlementStatusValue);
+        return baseMapper.updateStatusByVinNo(stringList, settlementStatus, settlementStatusValue);
    }

    /**
@ -1632,7 +1658,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        if (StringUtils.isNotBlank(params.getUseOrgSid())) {
            qw.eq("bv.createOrgSid", params.getUseOrgSid());
        }
-        qw.eq("bv.vehicleState",VehicleState.StockEnum.STOCK.getCode());
+        qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
        qw.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.WITPURCHASE));
        IPage<AppScmWarehouseVinVo> iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid());
        return iPage;
@ -1726,7 +1752,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        if (null == baseVehicle)
            return rb.success().setMsg("参数错误");

-        if (null == baseVehicle.getId()){
+        if (null == baseVehicle.getId()) {
            return rb.success().setMsg("无需更新");
        }
        if (!updateById(baseVehicle)) {
@ -1855,47 +1881,47 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba

    }

-    public void copyToBean(BaseVehicleDto dto,BaseVehicle baseVehicle) {
-        if (StringUtils.isNotBlank(dto.getMaterialSid())){
+    public void copyToBean(BaseVehicleDto dto, BaseVehicle baseVehicle) {
+        if (StringUtils.isNotBlank(dto.getMaterialSid())) {
            baseVehicle.setMaterialSid(dto.getMaterialSid());
        }
-        if (StringUtils.isNotBlank(dto.getModelSid())){
+        if (StringUtils.isNotBlank(dto.getModelSid())) {
            baseVehicle.setModelSid(dto.getModelSid());
        }
-        if (StringUtils.isNotBlank(dto.getVehicleState())){
+        if (StringUtils.isNotBlank(dto.getVehicleState())) {
            baseVehicle.setVehicleState(dto.getVehicleState());
        }
-        if (StringUtils.isNotBlank(dto.getVehicleStateValue())){
+        if (StringUtils.isNotBlank(dto.getVehicleStateValue())) {
            baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
        }
-        if (StringUtils.isNotBlank(dto.getModelName())){
+        if (StringUtils.isNotBlank(dto.getModelName())) {
            baseVehicle.setModelName(dto.getModelName());
        }
-        if (StringUtils.isNotBlank(dto.getConfigName())){
+        if (StringUtils.isNotBlank(dto.getConfigName())) {
            baseVehicle.setConfigName(dto.getConfigName());
        }
-        if (StringUtils.isNotBlank(dto.getModelConfigSid())){
+        if (StringUtils.isNotBlank(dto.getModelConfigSid())) {
            baseVehicle.setModelConfigSid(dto.getModelConfigSid());
        }
-        if (StringUtils.isNotBlank(dto.getSpecialInstructions())){
+        if (StringUtils.isNotBlank(dto.getSpecialInstructions())) {
            baseVehicle.setSpecialInstructions(dto.getSpecialInstructions());
        }
-        if (StringUtils.isNotBlank(dto.getVinNo())){
+        if (StringUtils.isNotBlank(dto.getVinNo())) {
            baseVehicle.setVinNo(dto.getVinNo());
        }
-        if (StringUtils.isNotBlank(dto.getEngineNo())){
+        if (StringUtils.isNotBlank(dto.getEngineNo())) {
            baseVehicle.setEngineNo(dto.getEngineNo());
        }
-        if (StringUtils.isNotBlank(dto.getOrderingNo())){
+        if (StringUtils.isNotBlank(dto.getOrderingNo())) {
            baseVehicle.setOrderingNo(dto.getOrderingNo());
        }
-        if (StringUtils.isNotBlank(dto.getManPurOrderTypeKey())){
+        if (StringUtils.isNotBlank(dto.getManPurOrderTypeKey())) {
            baseVehicle.setManPurOrderTypeKey(dto.getManPurOrderTypeKey());
        }
-        if (StringUtils.isNotBlank(dto.getManPurOrderTypeValue())){
+        if (StringUtils.isNotBlank(dto.getManPurOrderTypeValue())) {
            baseVehicle.setManPurOrderTypeValue(dto.getManPurOrderTypeValue());
        }
-        if (StringUtils.isNotBlank(dto.getPriceDate())){
+        if (StringUtils.isNotBlank(dto.getPriceDate())) {
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            try {
                baseVehicle.setPriceDate(simpleDateFormat.parse(dto.getPriceDate()));
@ -1903,7 +1929,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                e.printStackTrace();
            }
        }
-        if (StringUtils.isNotBlank(dto.getDepartureDate())){
+        if (StringUtils.isNotBlank(dto.getDepartureDate())) {
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            try {
                baseVehicle.setDepartureDate(simpleDateFormat.parse(dto.getDepartureDate()));
@ -1911,7 +1937,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                e.printStackTrace();
            }
        }
-        if (StringUtils.isNotBlank(dto.getArrivalDate())){
+        if (StringUtils.isNotBlank(dto.getArrivalDate())) {
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            try {
                baseVehicle.setArrivalDate(simpleDateFormat.parse(dto.getArrivalDate()));
@ -1919,7 +1945,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                e.printStackTrace();
            }
        }
-        if (StringUtils.isNotBlank(dto.getSalesDate())){
+        if (StringUtils.isNotBlank(dto.getSalesDate())) {
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            try {
                baseVehicle.setSalesDate(simpleDateFormat.parse(dto.getSalesDate()));
@ -1927,7 +1953,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                e.printStackTrace();
            }
        }
-        if (StringUtils.isNotBlank(dto.getSolidDate())){
+        if (StringUtils.isNotBlank(dto.getSolidDate())) {
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            try {
                baseVehicle.setSolidDate(simpleDateFormat.parse(dto.getSolidDate()));
@ -1935,13 +1961,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                e.printStackTrace();
            }
        }
-        if (StringUtils.isNotBlank(dto.getSettlementStatus())){
+        if (StringUtils.isNotBlank(dto.getSettlementStatus())) {
            baseVehicle.setSettlementStatus(dto.getSettlementStatus());
        }
-        if (StringUtils.isNotBlank(dto.getSettlementStatusValue())){
+        if (StringUtils.isNotBlank(dto.getSettlementStatusValue())) {
            baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
        }
-        if (StringUtils.isNotBlank(dto.getReturnDate())){
+        if (StringUtils.isNotBlank(dto.getReturnDate())) {
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            try {
                baseVehicle.setReturnDate(simpleDateFormat.parse(dto.getReturnDate()));
@ -1949,52 +1975,52 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                e.printStackTrace();
            }
        }
-        if (StringUtils.isNotBlank(dto.getLocation())){
+        if (StringUtils.isNotBlank(dto.getLocation())) {
            baseVehicle.setLocation(dto.getLocation());
        }
-        if (StringUtils.isNotBlank(dto.getLocationName())){
+        if (StringUtils.isNotBlank(dto.getLocationName())) {
            baseVehicle.setLocationName(dto.getLocationName());
        }
-        if (dto.getCostPrice() != null){
+        if (dto.getCostPrice() != null) {
            baseVehicle.setCostPrice(dto.getCostPrice());
        }
-        if (dto.getContractPrice() != null){
+        if (dto.getContractPrice() != null) {
            baseVehicle.setContractPrice(dto.getContractPrice());
        }
-        if (dto.getSalePrice() != null){
+        if (dto.getSalePrice() != null) {
            baseVehicle.setSalePrice(dto.getSalePrice());
        }
-        if (StringUtils.isNotBlank(dto.getWarrantyCardNo())){
+        if (StringUtils.isNotBlank(dto.getWarrantyCardNo())) {
            baseVehicle.setWarrantyCardNo(dto.getWarrantyCardNo());
        }
-        if (StringUtils.isNotBlank(dto.getLockedState())){
+        if (StringUtils.isNotBlank(dto.getLockedState())) {
            baseVehicle.setLockedState(dto.getLockedState());
        }
-        if (StringUtils.isNotBlank(dto.getLockedStateValue())){
+        if (StringUtils.isNotBlank(dto.getLockedStateValue())) {
            baseVehicle.setLockedStateValue(dto.getLockedStateValue());
        }
-        if (StringUtils.isNotBlank(dto.getCreateOrgSid())){
+        if (StringUtils.isNotBlank(dto.getCreateOrgSid())) {
            baseVehicle.setCreateOrgSid(dto.getCreateOrgSid());
        }
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())){
+        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
            baseVehicle.setCreateOrgName(dto.getCreateOrgName());
        }
-        if (StringUtils.isNotBlank(dto.getUseOrgSid())){
+        if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
            baseVehicle.setUseOrgSid(dto.getUseOrgSid());
        }
-        if (StringUtils.isNotBlank(dto.getUseOrgName())){
+        if (StringUtils.isNotBlank(dto.getUseOrgName())) {
            baseVehicle.setUseOrgName(dto.getUseOrgName());
        }
-        if (StringUtils.isNotBlank(dto.getInsideCode())){
+        if (StringUtils.isNotBlank(dto.getInsideCode())) {
            baseVehicle.setInsideCode(dto.getInsideCode());
        }
-        if (dto.getFreight() != null){
+        if (dto.getFreight() != null) {
            baseVehicle.setFreight(dto.getFreight());
        }
-        if (StringUtils.isNotBlank(dto.getWitPinState())){
+        if (StringUtils.isNotBlank(dto.getWitPinState())) {
            baseVehicle.setWitPinState(dto.getWitPinState());
        }
-        if (StringUtils.isNotBlank(dto.getWitPinStateValue())){
+        if (StringUtils.isNotBlank(dto.getWitPinStateValue())) {
            baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
        }
    }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
@ -12,9 +12,7 @@
        <!--车架号-->
        bd.vinNo,
        <!--认款状态-->
-        case bd.type
-        when 1 then '已交款'
-        when 2 then '未交款' end as type,
+        bd.subscription as type,
        bd.modelName,
        bd.price,
        bd.mobile,
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
@ -88,10 +88,10 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
            if (query.getVinNoList().size() > 0) {
                qw.notIn("bd.vinNo", query.getVinNoList());
            }
-            //用户sid
-            if (StringUtils.isNotBlank(query.getUserSid())) {
-                qw.eq("bd.createBySid", query.getUserSid());
-            }
+//            //用户sid
+//            if (StringUtils.isNotBlank(query.getUserSid())) {
+//                qw.eq("bd.createBySid", query.getUserSid());
+//            }
            //待出库：1，出库申请：0
            qw.eq("bd.state", 1);

--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@ -389,10 +389,12 @@ export default {
    backPeizhiAdd(value) {
      this.viewState = 1
      for (var i = 0; i < this.formobj.busVehicleApplyDetailList.length; i++) {
-       if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz.szSid === value.szSid) {
-         this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz = value
-         this.formobj.busVehicleApplyDetailList[i].guidePrice = value.guidePrice
-       }
+        if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz !== null && this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz !== undefined) {
+          if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz.szSid === value.szSid) {
+            this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz = value
+            this.formobj.busVehicleApplyDetailList[i].guidePrice = value.guidePrice
+          }
+        }
      }
    },
    // 返回（===既判断）
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@ -383,9 +383,11 @@ export default {
    backPeizhiAdd(value) {
      this.viewState = 1
      for (var i = 0; i < this.formobj.busVehicleApplyDetailList.length; i++) {
-        if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz.szSid === value.szSid) {
-          this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz = value
-          this.formobj.busVehicleApplyDetailList[i].guidePrice = value.guidePrice
+        if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz !== null && this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz !== undefined) {
+          if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz.szSid === value.szSid) {
+            this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz = value
+            this.formobj.busVehicleApplyDetailList[i].guidePrice = value.guidePrice
+          }
        }
      }
    },
--- a/anrui-system-ui/src/components/flow/flowRecord.vue
+++ b/anrui-system-ui/src/components/flow/flowRecord.vue
@ -23,19 +23,21 @@
                      <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.createTime }}</label><br>
                      <label v-if="item.finishTime" style="font-weight: normal">办理时间： </label>
                      <label style="color:#8a909c;font-weight: normal">{{ item.finishTime }}</label><br>
-                      <p v-if="item.comment">
-                        <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
-                        <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
-                        <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
-                        <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
-                        <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
-                      </p>
                    </div>
                    <div>
                      <label v-if="item.duration" style="font-weight: normal">耗时：</label>
                      <label style="color:red;font-weight: normal">{{ item.duration }}</label>
                    </div>
                  </div>
+                  <div>
+                    <p v-if="item.comment">
+                      <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
+                      <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
+                      <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
+                      <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
+                      <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
+                    </p>
+                  </div>
                </el-card>
              </el-timeline-item>
            </el-timeline>