From ba0676324166a315c767e8f0377af059b87b409b Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Mon, 25 Apr 2022 12:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/crmbusiness/AppCrmBusinessInfoVo.java |  6 ++++
 .../crmcustomertemp/AppCrmCustomerTempVo.java |  6 ++--
 .../crmvisit/AppCrmVisitThumbDetailsVo.java   |  9 +++--
 .../crmcustomertemp/CrmCustomerTempMapper.xml |  2 +-
 .../CrmCustomerTempService.java               |  2 ++
 .../crm/biz/crmvisit/CrmVisitMapper.java      |  1 -
 .../anrui/crm/biz/crmvisit/CrmVisitMapper.xml | 13 +++++++
 .../crm/biz/crmvisit/CrmVisitService.java     | 34 ++++++++++++-------
 8 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmbusiness/AppCrmBusinessInfoVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmbusiness/AppCrmBusinessInfoVo.java
index 1b303cda6c..2798acf296 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmbusiness/AppCrmBusinessInfoVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmbusiness/AppCrmBusinessInfoVo.java
@@ -47,4 +47,10 @@ public class AppCrmBusinessInfoVo implements Vo {
 
     @ApiModelProperty("备注")
     private String remarks;
+
+    @ApiModelProperty("客户行业")
+    private String  customer_industry_type;
+
+    @ApiModelProperty("客户行业key")
+    private String  customer_industry_type_key;
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempVo.java
index 2e0a9116b2..e1a3d3ba16 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempVo.java
@@ -47,8 +47,8 @@ public class AppCrmCustomerTempVo implements Vo {
 //    @ApiModelProperty("紧急联系电话")
 //    private String emergencyContact;
 //
-//    @ApiModelProperty("紧急联系电话")
-//    private String emergencyMobile;
+    @ApiModelProperty("紧急联系电话")
+    private String mobile2;
 
     @ApiModelProperty("微信号码")
     private String weixin;
@@ -70,7 +70,7 @@ public class AppCrmCustomerTempVo implements Vo {
     private String remind_day;
 
     @ApiModelProperty("是否开启提醒（1开启，0不开启）")
-    private String isOnRemindkey;
+    private Integer isOnRemindkey;
 
     @ApiModelProperty("查看订单")
     private boolean viewOrder;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/AppCrmVisitThumbDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/AppCrmVisitThumbDetailsVo.java
index 0742eaecd5..1abaca533a 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/AppCrmVisitThumbDetailsVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/AppCrmVisitThumbDetailsVo.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @ApiModel("手机端跟进记录list对象")
@@ -24,10 +25,12 @@ public class AppCrmVisitThumbDetailsVo {
     @ApiModelProperty("意向车型")
     private boolean IntendedModel;
 
-//    @ApiModelProperty("拜访见证材料")
-//    private String visit_witness_materials;
+    @ApiModelProperty("拜访见证材料")
+    private String visit_witness_materials;
 
     @ApiModelProperty("拜访见证材料")
-    private List<String> materialsList;
+    private List<String> materialsList = new ArrayList<>();
 
+    @ApiModelProperty("地址")
+    private String address;
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index 589d073a7e..4d1f511560 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -102,7 +102,7 @@
 
     <select id="getAppCustomerTempDetails"
             resultType="com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempVo">
-        SELECT *
+        SELECT *, emergencyMobile AS mobile2
         FROM crm_customer_temp
         WHERE sid = #{sid}
           AND staffSid = #{staffSid}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 465facad81..2afed701f1 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -406,6 +406,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 appCrmCustomerTempVo.setCustomerPhoto(url);
             }
             vo.setAppCrmCustomerTempVo(appCrmCustomerTempVo);
+        } else {
+            vo.setAppCrmCustomerTempVo(new AppCrmCustomerTempVo());
         }
         //获取跟进材料信息
         List<String> list = crmVisitService.selVisitMaterials(sid, staffSid);
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java
index e7eb05ec0c..52e2f84be4 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java
@@ -62,7 +62,6 @@ public interface CrmVisitMapper extends BaseMapper<CrmVisit> {
 
     CrmVisitVo selectNewFollow_state(@Param("staffSid") String staffSid, @Param("customerSid") String customerSid);
 
-    @Select("select * from crm_visit where customerSid=#{sid} and staffSid=#{staffSid} order by id desc LIMIT 0,1 ")
     AppCrmVisitThumbDetailsVo getAppVisitByCustomerSid(@Param("sid") String sid, @Param("staffSid") String staffSid);
 
     List<String> selVisitMaterials(@Param("sid") String sid, @Param("staffSid") String staffSid);
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml
index e10edbe1fd..45307aa1a2 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml
@@ -104,5 +104,18 @@
         WHERE cv.sid = #{sid}
           AND cvcd.states = 0
     </select>
+    <select id="getAppVisitByCustomerSid"
+            resultType="com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo">
+        select sid,
+               follow_time,
+               follow_result,
+               follow_state,
+               visit_witness_materials,
+               positionInformation AS address
+        from crm_visit
+        where customerSid = #{sid}
+          and staffSid = #{staffSid}
+        order by id desc LIMIT 0,1
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
index 818ab74463..922864984a 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
@@ -166,6 +166,7 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
 
     /**
      * 向跟进客户表插入数据（潜在客户）
+     *
      * @param map
      * @return
      */
@@ -342,20 +343,27 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
 
     public AppCrmVisitThumbDetailsVo getAppVisitByCustomerSid(String sid, String staffSid) {
         AppCrmVisitThumbDetailsVo appCrmVisitThumbDetailsVo = baseMapper.getAppVisitByCustomerSid(sid, staffSid);
-        if (appCrmVisitThumbDetailsVo.getFollow_time() != null) {
-            Date date = DateUtils.dateStrConvertDate(appCrmVisitThumbDetailsVo.getFollow_time(), "yyyy-MM-dd");
-            String format = new SimpleDateFormat("yyyy年MM月dd日").format(date);
-            appCrmVisitThumbDetailsVo.setFollow_time(format + "  " + DateUtils.getWeekOfDate(date));
-        }
-//        if (StringUtils.isNotBlank(appCrmVisitThumbDetailsVo.getVisit_witness_materials())) {
-//            String[] urlArr = appCrmVisitThumbDetailsVo.getVisit_witness_materials().split(",");
-//            for (int i = 0; i < urlArr.length; i++) {
-//                list.add(fileUploadComponent.getUrlPrefix() + urlArr[i]);
+        if (appCrmVisitThumbDetailsVo != null) {
+            if (appCrmVisitThumbDetailsVo.getFollow_time() != null) {
+                Date date = DateUtils.dateStrConvertDate(appCrmVisitThumbDetailsVo.getFollow_time(), "yyyy-MM-dd");
+                String format = new SimpleDateFormat("yyyy年MM月dd日").format(date);
+                appCrmVisitThumbDetailsVo.setFollow_time(format + "  " + DateUtils.getWeekOfDate(date));
+            }
+//            if (StringUtils.isNotBlank(appCrmVisitThumbDetailsVo.getVisit_witness_materials())) {
+//                String[] urlArr = appCrmVisitThumbDetailsVo.getVisit_witness_materials().split(",");
+//                for (int i = 0; i < urlArr.length; i++) {
+//                    list.add(fileUploadComponent.getUrlPrefix() + urlArr[i]);
+//                }
 //            }
-//        }
-        AppCommonAppendixVo data = commonAppendixFeign.getAppAppendix(appCrmVisitThumbDetailsVo.getSid(), CommonAttachTypeEnum.WITNESS.getAttachType()).getData();
-        List<String> filePath = data.getFilePath();
-        appCrmVisitThumbDetailsVo.setMaterialsList(filePath);
+            AppCommonAppendixVo data = commonAppendixFeign.getAppAppendix(appCrmVisitThumbDetailsVo.getSid(), CommonAttachTypeEnum.WITNESS.getAttachType()).getData();
+            List<String> filePath = data.getFilePath();
+            if (filePath.size() >= 0) {
+                appCrmVisitThumbDetailsVo.setMaterialsList(filePath);
+            } else {
+                appCrmVisitThumbDetailsVo.setMaterialsList(new ArrayList<>());
+            }
+            return appCrmVisitThumbDetailsVo;
+        }
         return appCrmVisitThumbDetailsVo;
     }