From 87c9acd7e7a4bcfcd9b740834a008a9785f45e3b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 23 Oct 2024 10:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AC=A0=E6=AC=BE=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/api/crmdockingpeople/CrmDockingPeopleFeign.java    | 2 +-
 .../com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java | 1 +
 .../CrmMaintenanceenterpriseRecordMapper.xml               | 2 +-
 .../CrmMaintenanceenterpriseRecordService.java             | 7 ++++++-
 .../as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml   | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java
index 0ea86f3eb2..72501c52ec 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java
@@ -89,6 +89,6 @@ public interface CrmDockingPeopleFeign {
     @ApiOperation("根据客户SID获取一条记录")
     @GetMapping("/getListByCustomerSid")
     @ResponseBody
-    public ResultBean<List<PeopleList>> getListByCustomerSid(@RequestParam("customerSid") String customerSid);
+    public ResultBean<List<PeopleList>> getListByCustomerSid(@RequestParam("sid") String sid);
 
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java
index 797f18f838..b0dad97b28 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java
@@ -16,4 +16,5 @@ public class PeopleList {
     private String name; // 对接人
     @ApiModelProperty("手机号码")
     private String mobile; // 手机号码
+    private String remarks;
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
index 22c8af7459..d4878e42ad 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
@@ -63,7 +63,7 @@
 	<select id="selPersonCount" resultType="java.lang.Integer">
 		select
 			count(*)
-		from crm_docking_people where customerSid =#{customerSid}
+		from crm_docking_people where customerSid =#{customerSid} and isDelete = 0
 	</select>
 	<select id="selectBySid" resultType="java.lang.Integer">
 		SELECT COUNT(*)
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
index 9c8a891563..d0a566b712 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
@@ -744,7 +744,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
                 String customerSid = entity.getCustomerSid();
                 List<CrmMaintenanceenterprisePerson> personList = crmMaintenanceenterprisePersonService.selByBillSid(businessSid);
                 if (!personList.isEmpty()) {
-                    crmDockingPeopleService.delByCustomerSid(customerSid);
+                    if (entity.getFilingType().equals("首次")) {
+                        crmDockingPeopleService.delByCustomerSid(customerSid);
+                    }
                     for (CrmMaintenanceenterprisePerson person : personList) {
                         CrmDockingPeople crmDockingPeople = new CrmDockingPeople();
                         if (StringUtils.isNotBlank(person.getName())) {
@@ -753,6 +755,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
                         if (StringUtils.isNotBlank(person.getMobile())) {
                             crmDockingPeople.setMobile(person.getMobile());
                         }
+                        if (StringUtils.isNotBlank(person.getRemarks())) {
+                            crmDockingPeople.setRemarks(person.getRemarks());
+                        }
                         crmDockingPeople.setCustomerSid(customerSid);
                         crmDockingPeopleService.insert(crmDockingPeople);
                     }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
index ff6da2e0b3..8e24512f7f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
@@ -50,9 +50,9 @@
 		FROM
 			as_customer_vehicle
 		WHERE
-			customerSid = #{customerSid} and isEnable = 1
+			customerSid = #{customerSid} and isDelete = 0
 	</select>
 	<select id="getVehListCountsByCustomerSid" resultType="java.lang.Integer">
-		SELECT COUNT(*) FROM as_customer_vehicle WHERE customerSid = #{customerSid}
+		SELECT COUNT(*) FROM as_customer_vehicle WHERE customerSid = #{customerSid} and isDelete = 0
 	</select>
 </mapper>