Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigVo.java

@@ -54,6 +54,8 @@ public class ModelConfigVo implements Vo {
     private String packingCase;
     @ApiModelProperty(value = "内部编码：移动端使用")
     private String insideCode;
+    @ApiModelProperty(value = "排放标准：移动端使用")
+    private String emissionStandardValue;
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailVo.java

@@ -47,6 +47,9 @@ public class AppCurrentCarDetailVo implements Vo {
     @ApiModelProperty(value = "变速箱")
     private String gearboxTypeValue;
 
+    @ApiModelProperty(value = "排放标准")
+    private String emissionStandardValue;
+
     @ApiModelProperty(value = "细分市场")
     private String marketSegments;
 

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

@@ -488,6 +488,7 @@
                bvm.gearboxTypeValue,
                bvm.marketSegments,
                bvm.department,
+               bvm.emissionStandardValue,
                bvm.engineTypeValue,
                bvm.announcementModel,
                bvm.specifications,

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

@@ -529,13 +529,14 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         list.add(getConfigValue("版本", vo.getVehicleVersionValue()));
         list.add(getConfigValue("燃料", vo.getFuelTypeValue()));
         list.add(getConfigValue("变速箱", vo.getGearboxTypeValue()));
-        list.add(getConfigValue("细分市场", vo.getMarketSegments()));
-        list.add(getConfigValue("系别", vo.getDepartment()));
+        list.add(getConfigValue("排放标准", vo.getEmissionStandardValue()));
         list.add(getConfigValue("发动机型号", vo.getEngineTypeValue()));
-        list.add(getConfigValue("公告型号", vo.getAnnouncementModel()));
+        list.add(getConfigValue("细分市场", vo.getMarketSegments()));
         list.add(getConfigValue("规格型号", vo.getSpecifications()));
-        list.add(getConfigValue("货箱", vo.getPackingCase()));
-        list.add(getConfigValue("内部编码", vo.getInsideCode()));
+        list.add(getConfigValue("系别", vo.getDepartment()));
+//        list.add(getConfigValue("公告型号", vo.getAnnouncementModel()));
+//        list.add(getConfigValue("货箱", vo.getPackingCase()));
+//        list.add(getConfigValue("内部编码", vo.getInsideCode()));
         vo.setConfigList(list);
         //配置列表
         IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -323,8 +323,9 @@
                bvm.vehicleVersionValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               bvm.marketSegments,
-               bvm.department,
+               bvm.marketSegmentsValue as marketSegments,
+               bvm.departmentValue as department,
+               bvm.emissionStandardValue,
                bvm.engineTypeValue,
                bvm.announcementModel,
                bvm.specifications,

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

@@ -444,16 +444,24 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      *
      * @param configName
      * @param configValue
-     * @param spanSize
      * @return
      */
-    private ConfigInfoSpanSize getConfigValueSpanSize(String configName, String configValue, Integer spanSize) {
+    private ConfigInfoSpanSize getConfigValueSpanSize(String configName, String configValue) {
         ConfigInfoSpanSize configInfoSpanSize = new ConfigInfoSpanSize();
+        configInfoSpanSize.setSpanSize(1);
         configInfoSpanSize.setName(configName);
-        configInfoSpanSize.setSpanSize(spanSize);
-        if (configValue == null) {
+        if (StringUtils.isBlank(configValue)) {
             configInfoSpanSize.setValue("-");
         } else {
+//            if (configValue.length() <= 6){
+//                configInfoSpanSize.setSpanSize(1);
+//            }
+//            if (configValue.length() > 6 && configValue.length() <= 20 ){
+//                configInfoSpanSize.setSpanSize(2);
+//            }
+//            if (configValue.length() > 20){
+//                configInfoSpanSize.setSpanSize(3);
+//            }
             configInfoSpanSize.setValue(configValue);
         }
         return configInfoSpanSize;
@@ -484,23 +492,22 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         AppCurrentCarDetailVo currentCarVo = baseMapper.getAppCurrentCarDetailConfigVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> modelInfoList = new ArrayList<>();
         List<ConfigInfoSpanSize> list1 = new ArrayList<>();
-        list1.add(getConfigValueSpanSize("品牌", currentCarVo.getBrandName(), 1));
-        list1.add(getConfigValueSpanSize("功能", currentCarVo.getVehicleTypeValue(), 1));
-        list1.add(getConfigValueSpanSize("系列", currentCarVo.getProductLineValue(), 1));
-        list1.add(getConfigValueSpanSize("驱动", currentCarVo.getDriveFormValue(), 1));
-        list1.add(getConfigValueSpanSize("马力", currentCarVo.getPowerValue(), 1));
-        list1.add(getConfigValueSpanSize("版本", currentCarVo.getVehicleVersionValue(), 1));
-        list1.add(getConfigValueSpanSize("燃料", currentCarVo.getFuelTypeValue(), 1));
-        list1.add(getConfigValueSpanSize("变速箱", currentCarVo.getGearboxTypeValue(), 1));
-//        List<ConfigInfoSpanSize> list2 = new ArrayList<>();
-//        list2.addAll(list1);
-        list1.add(getConfigValueSpanSize("细分市场", currentCarVo.getMarketSegments(), 1));
-        list1.add(getConfigValueSpanSize("系别", currentCarVo.getDepartment(), 1));
-        list1.add(getConfigValueSpanSize("发动机型号", currentCarVo.getEngineTypeValue(), 1));
-        list1.add(getConfigValueSpanSize("公告型号", currentCarVo.getAnnouncementModel(), 1));
-        list1.add(getConfigValueSpanSize("规格型号", currentCarVo.getSpecifications(), 1));
-        list1.add(getConfigValueSpanSize("货箱", currentCarVo.getPackingCase(), 1));
-        list1.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1));
+        list1.add(getConfigValueSpanSize("品牌", currentCarVo.getBrandName()));
+        list1.add(getConfigValueSpanSize("功能", currentCarVo.getVehicleTypeValue()));
+        list1.add(getConfigValueSpanSize("系列", currentCarVo.getProductLineValue()));
+        list1.add(getConfigValueSpanSize("驱动", currentCarVo.getDriveFormValue()));
+        list1.add(getConfigValueSpanSize("马力", currentCarVo.getPowerValue()));
+        list1.add(getConfigValueSpanSize("版本", currentCarVo.getVehicleVersionValue()));
+        list1.add(getConfigValueSpanSize("燃料", currentCarVo.getFuelTypeValue()));
+        list1.add(getConfigValueSpanSize("变速箱", currentCarVo.getGearboxTypeValue()));
+        list1.add(getConfigValueSpanSize("排放标准", currentCarVo.getEmissionStandardValue()));
+        list1.add(getConfigValueSpanSize("发动机型号", currentCarVo.getEngineTypeValue()));
+        list1.add(getConfigValueSpanSize("细分市场", currentCarVo.getMarketSegments()));
+        list1.add(getConfigValueSpanSize("规格型号", currentCarVo.getSpecifications()));
+        list1.add(getConfigValueSpanSize("系别", currentCarVo.getDepartment()));
+//        list1.add(getConfigValueSpanSize("公告型号", currentCarVo.getAnnouncementModel(), 1));
+//        list1.add(getConfigValueSpanSize("货箱", currentCarVo.getPackingCase(), 1));
+//        list1.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1));
 //        modelInfoList.add(list1);
 //        modelInfoList.add(list2);
         configDetailVo.setModeInfo(list1);
@@ -508,25 +515,25 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         AppModelConfigDetailsVo configVo = baseModelConfigService.getAppModelConfigDetailsVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
         List<ConfigInfoSpanSize> list2 = new ArrayList<>();
-        list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1));
-        list2.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine(), 1));
-        list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1));
-        list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1));
-        list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1));
-        list2.add(getConfigValueSpanSize("后桥速比", configVo.getRearAxleRatio(), 1));
-        list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1));
-        list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1));
-        list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1));
-        list2.add(getConfigValueSpanSize("悬架", configVo.getSuspension(), 1));
-        list2.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1));
-        list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1));
-        list2.add(getConfigValueSpanSize("鞍座", configVo.getSaddle(), 1));
-        list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1));
-        list2.add(getConfigValueSpanSize("保险杠", configVo.getBumper(), 1));
-        list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1));
-        list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1));
-        list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1));
-        list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1));
+        list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor()));
+        list2.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine()));
+        list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror()));
+        list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize()));
+        list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification()));
+        list2.add(getConfigValueSpanSize("后桥速比", configVo.getRearAxleRatio()));
+        list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner()));
+        list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial()));
+        list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel()));
+        list2.add(getConfigValueSpanSize("悬架", configVo.getSuspension()));
+        list2.add(getConfigValueSpanSize("座椅", configVo.getSeat()));
+        list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover()));
+        list2.add(getConfigValueSpanSize("鞍座", configVo.getSaddle()));
+        list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase()));
+        list2.add(getConfigValueSpanSize("保险杠", configVo.getBumper()));
+        list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
+        list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
+        list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank()));
+        list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia()));
         configDetailVo.setConfigInfo(list2);
         //更多配置
         String otherConfig = configVo.getOtherConfig();

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -48,6 +48,12 @@ public class AppDeliveredDetailsVo implements Vo {
     private String taskId;
 
     @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("申请人sid")
+    private String applySid;
+
+    @ApiModelProperty("客户名称")
     private String name;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java

@@ -44,4 +44,12 @@ public class AppDeliveredApplyDto implements Dto {
     @ApiModelProperty("申请人")
     private String applyName;
 
+    @ApiModelProperty("申请人sid")
+    private String applySid;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+
+    @ApiModelProperty("客户名称")
+    private String name;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -12,25 +15,27 @@ public class AppDeliveredApplyInfoVo implements Vo {
     private static final long serialVersionUID = 1516492882330414001L;
 
     @ApiModelProperty("合同id")
-    private String contractId;
+    @JsonProperty("contractId")
+    private String contractNo;
 
     @ApiModelProperty("车型")
-    private String model;
+    @JsonProperty("model")
+    private String modelName;
 
     @ApiModelProperty("手机号")
     private String mobile;
 
     @ApiModelProperty("申请日期")
-    private String date;
-
-    @ApiModelProperty("合同sid")
-    private String contractSid;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonProperty("date")
+    private Date applyDate;
 
     @ApiModelProperty("是否为终端客户")
     private String terminalValue;
 
     @ApiModelProperty("是否为终端客户")
-    private String terminalKey;
+    @JsonProperty("terminalKey")
+    private String isTerminal;
 
     @ApiModelProperty("备注")
     private String remarks;
@@ -39,7 +44,8 @@ public class AppDeliveredApplyInfoVo implements Vo {
     private List<AppCarListVo> carList;
 
     @ApiModelProperty("用户sid")
-    private String userSid;
+    @JsonProperty("userSid")
+    private String createBySid;
 
     @ApiModelProperty("流程实列id")
     private String procInsId;
@@ -47,6 +53,6 @@ public class AppDeliveredApplyInfoVo implements Vo {
     @ApiModelProperty("任务id")
     private String taskId;
 
-    @ApiModelProperty("申请人")
+    @ApiModelProperty("客户名称")
     private String name;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageVo.java

@@ -8,8 +8,8 @@ import lombok.Data;
 public class AppDeliveredApplyPageVo implements Vo {
     private static final long serialVersionUID = -5751419060183212855L;
 
-    @ApiModelProperty("合同sid")
-    private String contractSid;
+    @ApiModelProperty("列表sid")
+    private String sid;
 
     @ApiModelProperty("合同编号")
     private String contractId;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -750,7 +750,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
         BeanUtil.copyProperties(busDeliveredApply, vo);
 
-        if (vo.getTerminalKey().equals(1)) {
+        if (vo.getIsTerminal().equals(1)) {
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             voList.removeAll(Collections.singleton(null));
             if (!voList.isEmpty()) {
@@ -766,7 +766,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             vo.setCarList(voList);
 
-        } else if (vo.getTerminalKey().equals(0)) {
+        } else if (vo.getIsTerminal().equals(0)) {
             //根据出库申请单的sid查询需要出库的车辆信息
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             for (int i = 0; i < voList.size(); i++) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java

@@ -55,7 +55,7 @@ public class AppScmVehicleExamineDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private BigDecimal price;
+    private Integer price;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -44,7 +44,7 @@ public class AppScmVehicleExamineInfoVo implements Vo {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private BigDecimal price;
+    private Integer price;
 
     @ApiModelProperty("车型配置差异说明")
     private String modelDifferenceExplain; // 车型配置差异说明

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java

@@ -44,7 +44,7 @@ public class AppScmVehicleExamineSubmitDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private BigDecimal price;
+    private Integer price;
 
     @ApiModelProperty("车型配置差异说明")
     private String modelDifferenceExplain; // 车型配置差异说明

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java

@@ -83,7 +83,7 @@ public class ScmVehicleExamine extends BaseEntity {
 	@ApiModelProperty("验车状态（已验车，未验车）")
     private String inspectionResult; // 验车状态（已验车，未验车）
     @ApiModelProperty("洗车费")
-    private BigDecimal price;
+    private Integer price;
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("分公司sid")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -258,10 +258,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             inspectionItemVos.add(appScmInspectionItemVo);
         }
         vo.setInspectList(inspectionItemVos);
-
-        if (vo.getPrice() == null || vo.getPrice().equals("")) {
-            BigDecimal bigDecimal = new BigDecimal("0.00");
-            vo.setPrice(bigDecimal);
+        if(vo.getPrice() == null){
+            vo.setPrice(0);
         }
         vo.setUserSid(userSid);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type1);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -86,6 +86,11 @@ public interface AppBusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("手机端-出库申请 详情")
+    @GetMapping("/getRetrievalDetail/{sid}")
+    @ResponseBody
+    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@PathVariable("sid") String sid);
+
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -71,6 +71,11 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
         return null;
     }
 
+    @Override
+    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarVinListVo.java

@@ -7,8 +7,25 @@ import lombok.Data;
 @Data
 public class CarVinListVo implements Vo {
 
-    private static final long serialVersionUID = -7971193710676779957L;
+    private static final long serialVersionUID = -161197661649661665L;
+
+    private String carSid;
 
     @ApiModelProperty("车架号")
     private String vin;
+
+    @ApiModelProperty("成交价")
+    private String price;
+
+    @ApiModelProperty("合同id")
+    private String contractId;
+
+    @ApiModelProperty("录入人信息")
+    private UseInfoVo useInfo;
+
+    @ApiModelProperty("使用人信息sid")
+    private String useMessageSid;
+
+    @ApiModelProperty("车辆备注")
+    private String carRemarks;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java

@@ -0,0 +1,54 @@
+package com.yxt.anrui.terminal.api.autoservice.retrieval;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeliveredApplyDetailsVo implements Vo {
+    private static final long serialVersionUID = -3479185955975144740L;
+
+
+    @ApiModelProperty("合同id")
+    private String contractId;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("申请日期")
+    private String date;
+
+    @ApiModelProperty("是否为终端客户")
+    private String terminalValue;
+
+    @ApiModelProperty("是否为终端客户")
+    private String terminalKey;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("车辆集合")
+    private List<CarListVo> carList;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("客户名称")
+    private String name;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java

@@ -25,6 +25,16 @@ public class DeliveredApplyDto implements Dto {
     @JsonProperty("date")
     private String applyDate;
 
+    @ApiModelProperty("申请人")
+    @JsonProperty("applyName")
+    private String applyName;
+
+    @ApiModelProperty("申请人sid")
+    private String applySid;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+
     @ApiModelProperty("是否为终端客户")
     @JsonProperty("terminalKey")
     private String isTerminal;
@@ -48,7 +58,7 @@ public class DeliveredApplyDto implements Dto {
     @JsonProperty("taskId")
     private String taskId;
 
-    @ApiModelProperty("申请人")
+    @ApiModelProperty("客户名称")
     @JsonProperty("name")
-    private String applyName;
+    private String name;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java

@@ -17,15 +17,9 @@ public class DeliveredApplyInfoVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
-    @ApiModelProperty("手机号")
-    private String mobile;
-
     @ApiModelProperty("申请日期")
     private String date;
 
-    @ApiModelProperty("合同sid")
-    private String contractSid;
-
     @ApiModelProperty("是否为终端客户")
     private String terminalValue;
 
@@ -48,5 +42,11 @@ public class DeliveredApplyInfoVo implements Vo {
     private String taskId;
 
     @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("客户名称")
     private String name;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageVo.java

@@ -8,8 +8,8 @@ import lombok.Data;
 public class DeliveredApplyPageVo implements Vo {
     private static final long serialVersionUID = -2059933471530850176L;
 
-    @ApiModelProperty("合同sid")
-    private String contractSid;
+    @ApiModelProperty("列表sid")
+    private String sid;
 
     @ApiModelProperty("合同编号")
     private String contractId;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@@ -49,5 +49,11 @@ public class DeliveredDetailsVo implements Vo {
     private String taskId;
 
     @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("申请人sid")
+    private String applySid;
+
+    @ApiModelProperty("客户名称")
     private String name;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -80,6 +80,11 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
         return appBusDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
     }
 
+    @Override
+    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+        return appBusDeliveredApplyService.getRetrievalDetail(sid);
+    }
+
     @Override
     public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
         return appBusDeliveredApplyService.saveRetrievalApplyInfo(deliveredApplyDto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -124,4 +124,16 @@ public class AppBusDeliveredApplyService {
         List<AppCarVinListVo> data = retrievalCarVin.getData();
         return rb.success().setData(data);
     }
+
+    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+        ResultBean<DeliveredApplyDetailsVo> rb = ResultBean.fireFail();
+        DeliveredApplyDetailsVo vo = new DeliveredApplyDetailsVo();
+        ResultBean<AppDeliveredApplyInfoVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
+        return rb.success().setData(vo);
+    }
 }