From bd7e3315821012d63a7b8ae48e23002cfa5326ce Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Mon, 16 May 2022 17:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crmcustomerfile/CrmCustomerFileMapper.xml |  2 +-
 .../CrmCustomerFileService.java               | 18 +++++-----
 .../CrmCustomerTempService.java               | 33 +++++++++++--------
 .../anrui/crm/biz/crmfile/CrmFileMapper.java  |  2 ++
 .../anrui/crm/biz/crmfile/CrmFileMapper.xml   |  6 ++++
 .../anrui/crm/biz/crmfile/CrmFileService.java |  4 +++
 6 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml
index bd4aa275e7..2156cae525 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml
@@ -38,7 +38,7 @@
 
     <select id="selectBySid" resultType="java.lang.Integer">
         select count(*)
-        from crm_customer_file ccf
+        from crm_file ccf
         where ccf.linkSid = #{sid}
     </select>
 
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
index 75687fb48d..31a6700cf7 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
@@ -224,10 +224,12 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                 }
                 appCustomerArchivesDataVo.setFiles(list);
             }
+            vo.setData(dataVos);
         } else {
             fetchByDataTypeKey(customerSid);
+            dataVos = baseMapper.selectByCustomerSid(customerSid);
+            vo.setData(dataVos);
         }
-        vo.setData(dataVos);
         return rb.success().setData(vo);
     }
 
@@ -254,7 +256,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                             crmFile.setLinkSid(sid);
                             crmFile.setCreateBySid(data.getStaffSid());
                             crmFile.setCreateTime(new Date());
-                            crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+                            crmFile.setAttachType(datum.getKey());
                             crmFile.setName(data.getStaffName());
                             crmFileService.save(crmFile);
                         }
@@ -262,14 +264,14 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                     } else {
                         // 存在 需要判断是否是当天的 如果不是当天的 false
                         String createTime = appCustomerArchivesDataVo.getCreateTime();
-                        Date date = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd");
-                        boolean b = DateUtils.compTime(date, new Date());
-                        if (b) {
+                        Date nowTime = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd");
+                        boolean effectiveDate = DateUtils.isEffectiveDate(nowTime);
+                        if (effectiveDate) {
                             //如果是当天的  并新增 提交时间为当前提交时间
                             List<String> files = datum.getFiles();
+                            //删除之前的附件并且删除服务器上的
+                            crmFileService.deleteByLinkSidAndAttachType(sid, datum.getKey());
                             for (String file : files) {
-                                //删除之前的附件并且删除服务器上的
-                                crmFileService.deleteFilesOss(file);
                                 //新增
                                 if (file.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                                     file = file.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -279,7 +281,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                                 crmFile.setLinkSid(sid);
                                 crmFile.setCreateBySid(data.getStaffSid());
                                 crmFile.setCreateTime(new Date());
-                                crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+                                crmFile.setAttachType(datum.getKey());
                                 crmFile.setName(data.getStaffName());
                                 crmFileService.save(crmFile);
                             }
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 708393972e..dfaac8a034 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
@@ -235,16 +235,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                     }
                 }
             }
-            if (StringUtils.isNotBlank(dto.getWeixin())) {
-                AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
-                String weiXin = appCrmCustomerTempInfoVo.getWeiXin();
-                if (!weiXin.equals(dto.getWeixin())) {
-                    int count = baseMapper.selBySidAndWeixin(dto.getSid(), dto.getWeixin());
-                    if (count > 0) {
-                        return new ResultBean().fail().setMsg("该微信已绑定其它客户，请重新添加");
-                    }
-                }
-            }
+//            if (StringUtils.isNotBlank(dto.getWeixin())) {
+//                AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
+//                String weiXin = appCrmCustomerTempInfoVo.getWeiXin();
+//                if (!weiXin.equals(dto.getWeixin())) {
+//                    int count = baseMapper.selBySidAndWeixin(dto.getSid(), dto.getWeixin());
+//                    if (count > 0) {
+//                        return new ResultBean().fail().setMsg("该微信已绑定其它客户，请重新添加");
+//                    }
+//                }
+//            }
 //            if (StringUtils.isNotBlank(dto.getWeixin())) {
 //                map.put("weixin", dto.getWeixin());
 //                CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobileOrWx(map);
@@ -334,11 +334,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             }
             // 客户档案
             List<CrmCustomerFileVo> crmCustomerFileVos = crmCustomerFileService.selectByCustomerSidState(sid);
-            if (crmCustomerFileVos.size() <= 0) {
-                vo.setCustomerArchivesState(0);
-            } else {
-                vo.setCustomerArchivesState(1);
+            for (CrmCustomerFileVo crmCustomerFileVo : crmCustomerFileVos) {
+                String linkSid = crmCustomerFileVo.getSid();
+                List<CrmFileDetailsVo> crmFileDetailsVos = crmFileService.fetchByLinkSid(linkSid);
+                if (crmFileDetailsVos.size() <= 0) {
+                    vo.setCustomerArchivesState(0);
+                } else {
+                    vo.setCustomerArchivesState(1);
+                }
             }
+
             //意向车型
             List<AppCrmVehicledemandVo> appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid);
             if (appCrmVehicledemandVos.size() > 0) {
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.java
index 05a2334caf..06cb550c34 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.java
@@ -76,4 +76,6 @@ public interface CrmFileMapper extends BaseMapper<CrmFile> {
 	void deletePath(String path);
 
 	int fetchByFilePath(String str);
+
+	void deleteByLinkSidAndAttachType(@Param("sid") String sid, @Param("key") String key);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.xml
index 2bf40f342d..566c39ba9c 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.xml
@@ -42,6 +42,12 @@
         from crm_file
         where filePath = #{path}
     </delete>
+    <delete id="deleteByLinkSidAndAttachType">
+        delete
+        from crm_file
+        where linkSid = #{sid}
+          and attachType = #{key}
+    </delete>
 
     <select id="fetchByFilePath" resultType="int">
         select count(*)
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileService.java
index ef5186efde..e969adc45c 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileService.java
@@ -236,4 +236,8 @@ public class CrmFileService extends MybatisBaseService<CrmFileMapper, CrmFile> {
         }
         return rb.success().setMsg("移除成功");
     }
+
+    public void deleteByLinkSidAndAttachType(String sid, String key) {
+        baseMapper.deleteByLinkSidAndAttachType(sid,key);
+    }
 }
\ No newline at end of file