客户管理车型报价bug修改

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

@@ -235,8 +235,8 @@ public interface BaseVehicleFeign {
     public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(@RequestBody PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery);
 
     @ApiOperation("获取车型配置总结（即常用配置一句话描述）")
-    @GetMapping("/carConfigSummary/{modelSid}/{configSid}")
+    @GetMapping("/carConfigSummary")
-    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
+    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid,@RequestParam("userSid") String userSid);
 
     @ApiOperation("手机端-配置列表获取现车列表")
     @PostMapping("/getModelNowCarList")

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

@@ -161,7 +161,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(String modelSid, String configSid) {
+    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(String modelSid, String configSid, String userSid) {
         return null;
     }
 

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

@@ -635,34 +635,34 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
                 qw.eq("bvc.modelSid", pagerQuery.getModelSid());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getMultiMedia())) {//多媒体
-                qw.eq("bvm.multimedia", pagerQuery.getMultiMedia());
+                qw.eq("bmc.multimedia", pagerQuery.getMultiMedia());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getFuelTank())) {//燃料箱
-                qw.eq("bvm.fuelTank", pagerQuery.getFuelTank());
+                qw.eq("bmc.fuelTank", pagerQuery.getFuelTank());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getIndependentSources())) {//独立热源
-                qw.eq("bvm.independentSources", pagerQuery.getIndependentSources());
+                qw.eq("bmc.independentSources", pagerQuery.getIndependentSources());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getConfiguringBao())) {//配置包
-                qw.eq("bvm.configuringBao", pagerQuery.getConfiguringBao());
+                qw.eq("bmc.configuringBao", pagerQuery.getConfiguringBao());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getBumper())) {//保险杠
-                qw.eq("bvm.bumper", pagerQuery.getBumper());
+                qw.eq("bmc.bumper", pagerQuery.getBumper());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getWheelbase())) {//轴距
-                qw.eq("bvm.wheelbase", pagerQuery.getWheelbase());
+                qw.eq("bmc.wheelbase", pagerQuery.getWheelbase());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSaddle())) {//鞍座
-                qw.eq("bvm.saddle", pagerQuery.getSaddle());
+                qw.eq("bmc.saddle", pagerQuery.getSaddle());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getProtectTireCover())) {//护轮罩
-                qw.eq("bvm.tireCover", pagerQuery.getProtectTireCover());
+                qw.eq("bmc.tireCover", pagerQuery.getProtectTireCover());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSeat())) {//座椅
-                qw.eq("bvm.seat", pagerQuery.getSeat());
+                qw.eq("bmc.seat", pagerQuery.getSeat());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSuspension())) {//悬架
-                qw.eq("bvm.suspension", pagerQuery.getSuspension());
+                qw.eq("bmc.suspension", pagerQuery.getSuspension());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrg())) {//分公司
                 qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());

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

@@ -450,10 +450,7 @@
         FROM base_vehicle bv
         WHERE bv.modelSid = #{modelSid}
           AND bv.modelConfigSid = #{configSid}
-          AND (bv.vehicleStateValue = '现车'
+          AND bv.lockedState = '03'
-            or bv.vehicleStateValue = '库存')
-          AND (bv.lockedStateValue = ''
-            or bv.lockedStateValue = null)
     </select>
 
     <select id="selExistingCarPageList"

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

@@ -538,7 +538,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(String modelSid, String configSid) {
+    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(String modelSid, String configSid, String userSid) {
         ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
         AppCarConfigSummaryVo vo = baseVehicleService.getCarConfigSummary(modelSid, configSid);
         return rb.success().setData(vo);

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

@@ -640,7 +640,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @return
      */
     public List<AppVinsDetailsVo> getVins(String modelSid, String configSid) {
-        return baseMapper.getVins(modelSid, configSid);
+        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid);
+        if (vins.size() <= 0) {
+            for (AppVinsDetailsVo vin : vins) {
+                vins.add(vin);
+            }
+        }
+        return vins;
     }
 
     /**
@@ -750,6 +756,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 moreConfigVo.setCompanyName(data.getName());
             }
             record.setMoreList(moreConfigVos);
+
         }
         return iPage;
     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java

@@ -40,6 +40,9 @@ public class AppBusDepositBusDetailsVo implements Vo {
     @ApiModelProperty("收款账号")
     private String collectionNumber;
 
+    @ApiModelProperty("收款银行sid")
+    private String collectionBankSid;
+
     @ApiModelProperty("备注")
     private String remarks;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java

@@ -101,6 +101,10 @@ public class BusDeposit extends BaseEntity {
     @ApiModelProperty("备注")
     private String remarks;
 
+    @ApiModelProperty("收款银行sid")
+    private String collectionBankSid;
+
+
     @ApiModelProperty("付款凭证")
     private String paymentProof;
     @ApiModelProperty("流程定义的id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java

@@ -25,6 +25,9 @@ public class AppBusDepositBuscenterDto implements Dto {
     @ApiModelProperty("收款银行账号")
     private String collectionNumber;
 
+    @ApiModelProperty("收款银行sid")
+    private String collectionBankSid;
+
     @ApiModelProperty("付款方式")
     private String payType;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java

@@ -49,12 +49,6 @@ import lombok.Data;
 @Data
 public class AppBusMainDepositVo implements Vo {
 
-    @ApiModelProperty(value = "虚拟订单类型（01:订金收取,02:车辆预订）")
-    private String virtualOrderType;
-
-    @ApiModelProperty(value = "虚拟订单状态")
-    private String virtualOrderState;
-
     @ApiModelProperty(value = "虚拟订单Sid")
     private String virtualOrderSid;
 
@@ -64,6 +58,13 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "制单日期")
     private String virtualOrderDate;
 
+    @ApiModelProperty(value = "虚拟订单类型（01:订金收取,02:车辆预订）")
+    private String virtualOrderType;
+
+    @ApiModelProperty(value = "虚拟订单状态")
+    private String virtualOrderState;
+
+
     @ApiModelProperty(value = "客户名称")
     private String customerSid;
 
@@ -82,6 +83,11 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+
+
     @ApiModelProperty(value = "描述 (01时传值，02传空字符串)")
     private String describe;
 
@@ -97,9 +103,6 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "是否显示申请收款单 流程状态为 收款确认 时显示")
     private boolean showApplyBtn;
 
-    @ApiModelProperty("联系电话")
-    private String mobile;
-
     @ApiModelProperty("是否显示下载按钮")
     private boolean showDonwnLoadBtn;
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -40,7 +40,8 @@
                paymentProof,
                remarks,
                staffName    AS sellerName,
-               orgName      AS departmentName
+               orgName      AS departmentName,
+               collectionBankSid
         FROM bus_deposit
         WHERE billSid = #{virtualOrderSid}
           AND staffSid = #{staffSid}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
+import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusDepositVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
@@ -117,5 +119,11 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
      */
     List<String> selectVehicleList(@Param("modelSid") String modelSid, @Param("modelConfigSid") String modelConfigSid, @Param("staffSid") String staffSid, @Param("customerSid") String customerSid);
 
-    IPage<PcBusDepositVo> depositPageList(IPage<BusMainDeposit> page,  @Param(Constants.WRAPPER)QueryWrapper<BusMainDeposit> qw);
+    IPage<PcBusDepositVo> depositPageList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw);
+
+    BusDepositVehicleCustomer selectVehicleCustomerByBillSid(@Param("virtualOrderSid") String virtualOrderSid);
+
+    BusDepositCustomer selectDepositByBillSid(@Param("virtualOrderSid") String virtualOrderSid);
+
+    int selByBillSidCount(@Param("virtualOrderSid") String virtualOrderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -5,21 +5,21 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositListVo">
         SELECT bmd.id,
-               bmd.sid,
+        bmd.sid,
-               bmd.billNo,
+        bmd.billNo,
-               bmd.depositBillTypeKey,
+        bmd.depositBillTypeKey,
-               bmd.depositBillType,
+        bmd.depositBillType,
-               bmd.createDate,
+        bmd.createDate,
-               bmd.staffName,
+        bmd.staffName,
-               bd.deposit,
+        bd.deposit,
-               bd.usedDeposit,
+        bd.usedDeposit,
-               IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName)     name,
+        IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName) name,
-               IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
+        IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
-               IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id))                    depositVehicle
+        IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle
         FROM bus_main_deposit bmd
-                 LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
+        LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
-                 LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid
+        LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid
-                 LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
+        LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -35,19 +35,15 @@
 
     <!--虚拟订单列表-->
     <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
-        SELECT bmd.sid                AS virtualOrderSid,
+        SELECT bmd.sid AS virtualOrderSid,
-               bmd.billNo             AS virtualOrderId,
+        bmd.billNo AS virtualOrderId,
-               bmd.createDate         AS virtualOrderDate,
+        bmd.createDate AS virtualOrderDate,
-               bmd.depositBillTypeKey AS virtualOrderType,
+        bmd.depositBillTypeKey as virtualOrderType,
-               bmd.staffName          AS sellerName,
+        bmd.staffName AS sellerName,
-               bmd.remarks,
+        bmd.remarks
-               bd.vehicleNum          AS carNumber,
-               bdvc.customerName,
-               bd.draweeName          AS payName,
-               bd.draweeMobile        AS mobile
         FROM bus_main_deposit bmd
-                 LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+        LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
-                 LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+        LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -141,7 +137,7 @@
     <update id="updateFlowFiled" parameterType="java.util.Map">
         UPDATE bus_main_deposit
         SET nodeState=#{nodeState}
-          , taskDefKey=#{taskDefKey}
+        , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -194,4 +190,26 @@
                  left join bus_deposit_customer bc on bc.billSid = bmd.sid
             ${ew.customSqlSegment}
     </select>
+
+    <select id="selectVehicleCustomerByBillSid"
+            resultType="com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer">
+        select bdvc.customerSid,
+               bdvc.customerName,
+               bdvc.customerMobile
+        from bus_deposit_vehicle_customer bdvc
+        where bdvc.billSid = #{virtualOrderSid}
+    </select>
+    <select id="selectDepositByBillSid"
+            resultType="com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer">
+        select bdc.customerSid,
+               bdc.customerName,
+               bdc.customerMobile
+        from bus_deposit_customer bdc
+        where bdc.billSid = #{virtualOrderSid}
+    </select>
+    <select id="selByBillSidCount" resultType="java.lang.Integer">
+        select count(*)
+        from bus_deposit_vehicle_customer bdvc
+        where bdvc.billSid = #{virtualOrderSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -587,6 +587,23 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         QueryWrapper<AppBusMainDepositVo> qw = aaQueryWrapper(pagerQuery.getParams());
         IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw);
         for (AppBusMainDepositVo record : iPage.getRecords()) {
+            String virtualOrderSid = record.getVirtualOrderSid();
+            int count = baseMapper.selByBillSidCount(virtualOrderSid);
+            record.setCarNumber(String.valueOf(count));
+            if (record.getVirtualOrderType().equals("01")) {
+                BusDepositCustomer busDepositCustomer = baseMapper.selectDepositByBillSid(virtualOrderSid);
+                record.setCustomerSid(busDepositCustomer.getCustomerSid());
+                record.setCustomerName(busDepositCustomer.getCustomerName());
+                record.setMobile(busDepositCustomer.getCustomerMobile());
+
+            } else if (record.getVirtualOrderType().equals("02")) {
+
+                BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
+                record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
+                record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
+                record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
+
+            }
             record.setDescribe("订金: 50.000.00元 已用: 0元");
             ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid());
             record.setShowUpdateBtn(false);
@@ -621,7 +638,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             qw.eq("bmd.staffSid", query.getStaffSid());
         }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdv.customerName", query.getName()));
+            qw.like("bd.draweeName", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("bdvc.customerName", query.getName());
         }
         if (StringUtils.isNotBlank(query.getType())) {
             qw.eq("bmd.depositBillTypeKey", query.getType());
@@ -649,8 +669,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setBillNo(map.get("billNo_Num"));
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(data.getStaffName());
-            busMainDeposit.setDepositBillType("01");
+            busMainDeposit.setDepositBillType("订金收取");
-            busMainDeposit.setDepositBillTypeKey("订金收取");
+            busMainDeposit.setDepositBillTypeKey("01");
             busMainDeposit.setCreateDate(dateFormat.format(date));
 /*            busMainDeposit.setProcDefId(dto.getTaskId());
             busMainDeposit.setProcInstSid(dto.getProcInsId());*/
@@ -702,6 +722,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         busDeposit.setDraweeMobile(dto.getMobile());
         busDeposit.setDeposit(dto.getDeposit());
         busDeposit.setRemarks(dto.getRemarks());
+        busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
         return busDeposit;
     }
 
@@ -1048,8 +1069,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setBillNo(map.get("billNo_Num"));
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(data.getStaffName());
-            busMainDeposit.setDepositBillType("02");
+            busMainDeposit.setDepositBillType("车辆预订");
-            busMainDeposit.setDepositBillTypeKey("车辆预订");
+            busMainDeposit.setDepositBillTypeKey("02");
             busMainDeposit.setCreateDate(dateFormat.format(date));
             baseMapper.insert(busMainDeposit);
             // 车辆客户信息
@@ -1057,12 +1078,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             String customerSid = dto.getCustomerSid();
             AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customerSid).getData();
             customer.setCustomerSid(customerSid);
-            customer.setCustomerName(appCrmCustomerTempInfoVo.getName());
+            customer.setCustomerName(dto.getCustomerName());
-            customer.setCustomerMobile(appCrmCustomerTempInfoVo.getMobile());
+            customer.setCustomerMobile(dto.getMobile());
             customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType());
             customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey());
             customer.setCustomerPhoto(appCrmCustomerTempInfoVo.getCustomerPhoto());
-            customer.setSid(UUID.randomUUID().toString());
             customer.setBillSid(busMainDeposit.getSid());
             busDepositVehicleCustomerService.save(customer);
             //添加车辆信息

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java

@@ -25,7 +25,7 @@ public class AppCrmVehicleDemandParticularsVo implements Vo {
     private String configSid;
 
     @ApiModelProperty("数量")
-    private String number;
+    private Integer number;
 
     @ApiModelProperty("车型报价")
     private String quotation;

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java

@@ -24,7 +24,7 @@ public class AppCrmVehicledemandDetailsVo implements Vo {
     private String remarks;
 
     @ApiModelProperty("数量")
-    private String number;
+    private Integer number;
 
     @ApiModelProperty("预计提车日期")
     private String date;

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerService.java

@@ -914,26 +914,41 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
             System.out.println(result.get("X-TC-Action"));
             System.out.println(result.get("X-TC-Region"));
 
-
+//            {"Response":{"RequestId":"8894294b-702c-4517-ae0f-590120dfde82","Error":{"Code":"FailedOperation.DownLoadError","Message":"下载失败"}}}
             String resultOne = HttpUtils.sendPost("https://ocr.tencentcloudapi.com", result, json);
-            System.out.println(resultOne);
+
-            JSONObject jsonObject = JSONObject.parseObject(resultOne);
+
-            Map<String, Object> map = JSONObject.parseObject(jsonObject.toJSONString(), new TypeReference<Map<String, Object>>() {
+            JSONObject object = JSONObject.parseObject(resultOne);
+            Map<String, Object> mapOneResult = JSONObject.parseObject(object.toJSONString(), new TypeReference<Map<String, Object>>() {
             });
-            Map<String, Object> map1 = ConstantUtils.getMap(map, "Response");
+            if (mapOneResult.containsKey("Response")) {
-            if (MLID_PASSPORTOCR.equals(type)) {//港澳居民台湾同胞通行证
+                Map<String, Object> mapOneResultOne = ConstantUtils.getMap(mapOneResult, "Response");
-                cardName = ConstantUtils.getString(map1, "Name", "");
+                if (mapOneResultOne.containsKey("Error")) {
-                cardNum = ConstantUtils.getString(map1, "Number", "");
+                    return new ResultBean().fail().setMsg("读取失败");
-            } else if (PERMITOCR.equals(type)) {//护照
+                }
-                cardName = ConstantUtils.getString(map1, "Name", "");
-                cardNum = ConstantUtils.getString(map1, "ID", "");
-            } else if (ID_CARDOCR.equals(type)) {//身份证
-                cardName = ConstantUtils.getString(map1, "Name", "");
-                cardNum = ConstantUtils.getString(map1, "IdNum", "");
             }
-            mapOne.put("Response", map1);
+            if (StringUtils.isNotBlank(resultOne)) {
-            mapOne.put("cardName", cardName);
+
-            mapOne.put("cardNum", cardNum);
+                System.out.println(resultOne);
+                JSONObject jsonObject = JSONObject.parseObject(resultOne);
+                Map<String, Object> map = JSONObject.parseObject(jsonObject.toJSONString(), new TypeReference<Map<String, Object>>() {
+                });
+                Map<String, Object> map1 = ConstantUtils.getMap(map, "Response");
+                if (MLID_PASSPORTOCR.equals(type)) {//港澳居民台湾同胞通行证
+                    cardName = ConstantUtils.getString(map1, "Name", "");
+                    cardNum = ConstantUtils.getString(map1, "Number", "");
+                } else if (PERMITOCR.equals(type)) {//护照
+                    cardName = ConstantUtils.getString(map1, "Name", "");
+                    cardNum = ConstantUtils.getString(map1, "ID", "");
+                } else if (ID_CARDOCR.equals(type)) {//身份证
+                    cardName = ConstantUtils.getString(map1, "Name", "");
+                    cardNum = ConstantUtils.getString(map1, "IdNum", "");
+                }
+                mapOne.put("Response", map1);
+                mapOne.put("cardName", cardName);
+                mapOne.put("cardNum", cardNum);
+            }
+
             return ResultBean.fireSuccess().setData(mapOne);
         }
         return new ResultBean().fail().setMsg("上传失败");
@@ -959,8 +974,8 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
         return baseMapper.cusList();
     }
 
-    public int updateRemindAndByCustomerSid(String customerSid,String remind_day,String remind_remark,String isOnRemind,String isOnRemindkey) {
+    public int updateRemindAndByCustomerSid(String customerSid, String remind_day, String remind_remark, String isOnRemind, String isOnRemindkey) {
-       return baseMapper.updateRemindAndByCustomerSid(customerSid,remind_day,remind_remark,isOnRemind,isOnRemindkey);
+        return baseMapper.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
     }
 
     /*获取身份证信息*/

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -3,10 +3,7 @@ package com.yxt.anrui.crm.biz.crmcustomertemp;
 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.commonappendix.AppCommonAppendixDto;
+import com.yxt.anrui.base.api.commonappendix.*;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
-import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
-import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
 import com.yxt.anrui.crm.api.crmbusiness.AppCrmBusinessInfoVo;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
@@ -17,6 +14,7 @@ import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo;
 import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo;
+import com.yxt.anrui.crm.api.crmvisit.CrmVisitVo;
 import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto;
 import com.yxt.anrui.crm.biz.crmbusiness.CrmBusinessService;
 import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
@@ -440,10 +438,18 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             vo.setAppCrmCustomerTempVo(new AppCrmCustomerTempVo());
         }
         //获取跟进材料信息
-        List<String> list = crmVisitService.selVisitMaterials(sid, staffSid);
+        List<String> list = new ArrayList<>();
-        if (list != null) {
+        List<CrmVisitVo> crmVisitVos = crmVisitService.selectListByCustomerSid(sid, staffSid);
-            vo.setMaterialsList(list);
+        for (CrmVisitVo crmVisitVo : crmVisitVos) {
+            String visitSid = crmVisitVo.getSid();
+            List<CommonAppendixVo> data = commonAppendixFeign.selByLinkSid(visitSid).getData();
+            for (CommonAppendixVo datum : data) {
+                list.add(fileUploadComponent.getUrlPrefix() + datum.getFilePath());
+            }
         }
+        vo.setMaterialsList(list);
+
+
         //获取客户运营信息
         AppCrmBusinessInfoVo appCrmBusinessInfoVo = crmBusinessService.selByCustomerSid(sid);
         if (appCrmBusinessInfoVo != null) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -112,6 +112,7 @@
                cv.saleReferencePrice  AS price,
                cv.vehicleModelOffer   AS quotation,
                cv.comonConfigSid      AS configSid,
+               cv.number,
                cv.remarks,
                cv.estimatedPickupDate AS `date`
         FROM crm_vehicledemand cv