客户管理问题修改，车型问题修改，合同档案代码，合同审核代码

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
 import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataVo;
 import com.yxt.anrui.crm.api.crmfile.CrmFile;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -81,4 +82,6 @@ public interface CrmCustomerFileMapper extends BaseMapper<CrmCustomerFile> {
 
     // 查询数据库是否存在该类型
     Integer selectBySid(@Param("sid") String sid);
+
+    List<CrmCustomerFile> selectIdImageByCustomerSid(@Param("customerSid") String customerSid, @Param("dataType") String dataType);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml

@@ -48,4 +48,11 @@
         WHERE ccf.linkSid = #{customerSid}
     </select>
 
+    <select id="selectIdImageByCustomerSid" resultType="com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFile">
+        SELECT *
+        FROM crm_customer_file ccf
+        WHERE ccf.linkSid = #{customerSid}
+          And ccf.dataType = #{dataType}
+    </select>
+
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileRest.java

@@ -68,8 +68,8 @@ public class CrmCustomerFileRest implements CrmCustomerFileFeign {
     }
 
     @Override
-    public ResultBean saveCustomerFile(String staffName,String staffSid,String sid, List<CrmFileDto> crmFileDtos) {
-        return crmCustomerFileService.saveCustomerFile(staffName,staffSid,sid,crmFileDtos);
+    public ResultBean saveCustomerFile(String staffName, String staffSid, String sid, List<CrmFileDto> crmFileDtos) {
+        return crmCustomerFileService.saveCustomerFile(staffName, staffSid, sid, crmFileDtos);
     }
 
     @Override
@@ -77,6 +77,13 @@ public class CrmCustomerFileRest implements CrmCustomerFileFeign {
         return crmCustomerFileService.fetchFileListBySid(sid);
     }
 
+    @Override
+    public ResultBean<List<CrmCustomerFile>> selectIdImageByCustomerSid(String customerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<CrmCustomerFile> crmCustomerFiles = crmCustomerFileService.selectIdImageByCustomerSid(customerSid);
+        return rb.success().setData(crmCustomerFiles);
+    }
+
 //    @Override
 //    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
 //        return crmCustomerFileService.initCustomerArchives(customerSid,userSid);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java

@@ -205,6 +205,8 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
     public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         AppCrmCustomerTempArchivesVo vo = new AppCrmCustomerTempArchivesVo();
+        vo.setCustomerSid(customerSid);
+        vo.setUserSid(userSid);
         List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid);
         if (dataVos.size() > 0) {
             for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
@@ -244,7 +246,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                         //不存在 直接新增保存 并更新时间为当前提交的时间
                         List<String> files = datum.getFiles();
                         for (String file : files) {
-                            if (file.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                            if (file.contains(fileUploadComponent.getUrlPrefix())) {
                                 file = file.replace(fileUploadComponent.getUrlPrefix(), "");
                             }
                             CrmFile crmFile = new CrmFile();
@@ -302,4 +304,9 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
     public List<CrmCustomerFileVo> selectByCustomerSidState(String sid) {
         return baseMapper.selectByCustomerSidState(sid);
     }
+
+    public List<CrmCustomerFile> selectIdImageByCustomerSid(String customerSid) {
+        String dataType = "身份证";
+        return baseMapper.selectIdImageByCustomerSid(customerSid, dataType);
+    }
 }

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

@@ -114,4 +114,6 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
     AppCrmCustomerTempInfoVo getAppCustomerTempDetailsBySid(@Param("sid") String sid);
 
     int  selBySidAndMobile(@Param("sid") String sid, @Param("mobile") String mobile);
+
+    int selBySidAndWeixin( @Param("sid")String sid, @Param("weixin") String weixin);
 }

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

@@ -172,18 +172,18 @@
                cct.companyName,
                cct.weiXin,
                cct.mobile,
-               cct.emergencyMobile                    AS mobile2,
-               cct.contacts                           AS `name`,
-               cct.emergencyContact                   AS name2,
+               cct.emergencyMobile                        AS mobile2,
+               cct.`name`,
+               cct.emergencyContact                       AS name2,
                cct.address,
-               (cct.province + cct.city + cct.county) AS addressNss,
+               CONCAT(cct.province, cct.city, cct.county) AS addressNss,
                cct.remarks,
-               cct.customerClass                      AS classification,
+               cct.customerClass                          AS classification,
                cct.source,
-               cct.e_mail                             AS email,
-               cct.endDate                            AS idDate,
+               cct.e_mail                                 AS email,
+               cct.endDate                                AS idDate,
                cct.idNumber,
-               cct.certificateType                    AS idType,
+               cct.certificateType                        AS idType,
                cct.sex,
                cct.birthday,
                cct.`level`,
@@ -191,6 +191,7 @@
         FROM crm_customer_temp cct
         WHERE cct.sid = #{sid}
     </select>
+
     <select id="selBySidAndMobile" resultType="java.lang.Integer">
         SELECT count(*)
         FROM crm_customer_temp cct
@@ -198,4 +199,11 @@
           AND
             cct.mobile =#{mobile}
     </select>
+    <select id="selBySidAndWeixin" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM crm_customer_temp cct
+        WHERE cct.sid != #{sid}
+          AND
+            cct.weixin =#{weixin}
+    </select>
 </mapper>

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

@@ -235,16 +235,25 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                     }
                 }
             }
-
             if (StringUtils.isNotBlank(dto.getWeixin())) {
-                map.put("weixin", dto.getWeixin());
-                CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobileOrWx(map);
-                if (crmCustomerTempVo != null && crmCustomerTempVo.getStaffSid().equals(userOrgInfoVo.getStaffSid())) {
-                    if (crmCustomerTempVo.getWeixin().equals(dto.getWeixin())) {
-                        return new ResultBean().fail().setMsg("该微信号已绑定其它客户，请重新添加");
+                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);
+//                if (crmCustomerTempVo != null && crmCustomerTempVo.getStaffSid().equals(userOrgInfoVo.getStaffSid())) {
+//                    if (crmCustomerTempVo.getWeixin().equals(dto.getWeixin())) {
+//                        return new ResultBean().fail().setMsg("该微信号已绑定其它客户，请重新添加");
+//                    }
+//                }
+//            }
             CrmCustomerTemp customerTemp = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, customerTemp);
             String adCode = dto.getAdCode();
@@ -326,9 +335,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             // 客户档案
             List<CrmCustomerFileVo> crmCustomerFileVos = crmCustomerFileService.selectByCustomerSidState(sid);
             if (crmCustomerFileVos.size() <= 0) {
-                vo.setOperationSituationState(0);
+                vo.setCustomerArchivesState(0);
             } else {
-                vo.setOperationSituationState(1);
+                vo.setCustomerArchivesState(1);
             }
             //意向车型
             List<AppCrmVehicledemandVo> appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid);
@@ -544,7 +553,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         customerTemp.setStaffSid(userOrgInfoVo.getStaffSid());
         customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
         customerTemp.setCustomerNo(map.get("code"));
-        customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02");
+        customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "0003" : "02");
         customerTemp.setCertificateType(customerTemp.getCustomerTypeKey().equals("1") ? "身份证" : "营业执照");
         ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
         if (resultBean.getSuccess() && resultBean.getData() != null) {

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

@@ -32,12 +32,11 @@
                cvcd.modelName,
                cvcd.modelSid,
                cvcd.comonConfigSid,
-               cvcd.vehicleModelOffer,
+               cvcd.saleReferencePrice  AS vehicleModelOffer,
                cvcd.createTime,
                cvcd.purchaseMethodValue AS purchaseMethod
-        FROM crm_customer_temp cct
-                 LEFT JOIN crm_vehicledemand cvcd ON cct.sid = cvcd.customerSid
-        WHERE cct.sid = #{sid}
+        FROM crm_vehicledemand cvcd
+        WHERE cvcd.customerSid = #{customerSid}
           AND cvcd.states = 1
     </select>
 
@@ -120,7 +119,7 @@
 
     <select id="selectPagePc" resultType="com.yxt.anrui.crm.api.crmvehicledemand.pc.PcCrmVehicleDemandVo">
         select cv.modelSid,
-               cv.comonConfigSid as modelConfigSid,
+               cv.comonConfigSid as   modelConfigSid,
                cv.modelName           modelAlias,
                cv.sketChconfiguration config,
                cv.brandName

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

@@ -312,13 +312,15 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         String modelSid = appCrmVehicleDemandDto.getModelSid();
         String configSid = appCrmVehicleDemandDto.getConfigSid();
         String userSid = appCrmVehicleDemandDto.getUserSid();
-        AppModelVeDetailVo data = baseVehmodelConfigFeign.getAppIntentionVehicleVo(modelSid, configSid, userSid).getData();
+        ResultBean<AppModelVeDetailVo> appIntentionVehicleVo = baseVehmodelConfigFeign.getAppIntentionVehicleVo(userSid, modelSid, configSid);
+        AppModelVeDetailVo data = appIntentionVehicleVo.getData();
         CrmVehicledemand entity = new CrmVehicledemand();
-        entity.setCustomerSid(UUID.randomUUID().toString());
+        entity.setCustomerSid(appCrmVehicleDemandDto.getCustomerSid());
         entity.setModelSid(modelSid);
         entity.setModelName(data.getModelName());
         entity.setBrandSid(data.getBrandSid());
         entity.setBrandName(data.getBrandName());
+        entity.setStates("1");
         entity.setSaleReferencePrice(data.getSaleReferencePrice());
         appCrmVehicleDemandDto.fillEntity(entity);
         baseMapper.insert(entity);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java

@@ -269,7 +269,7 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
             if (follow_time != null) {
                 Date followDate = DateUtils.dateStrConvertDate(follow_time, "yyyy-MM-dd");
                 int recordedNum = DateUtils.getIntervalDays(followDate, new Date());
-                vo.setRecordedNum(recordedNum + "天");
+                vo.setRecordedNum(recordedNum + 1 + "天");
             }
             for (CrmVisitVo crmVisitVo : crmVisitVos) {
                 AppCrmVisitThumbVo thumbVo = new AppCrmVisitThumbVo();
@@ -396,13 +396,15 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
         if (i > 0) {
             CrmVisit entity = new CrmVisit();
             List<String> materialsList = appCrmVisitDto.getMaterialsList();
-            if (materialsList != null) {
+            if (materialsList.size() > 0) {
                 String visit_witness_materials = "";
                 for (int j = 0; j < materialsList.size(); j++) {
                     String url = materialsList.get(j);
                     visit_witness_materials += url.replace(fileUploadComponent.getUrlPrefix(), "") + ",";
                 }
                 appCrmVisitDto.setVisit_witness_materials(visit_witness_materials.substring(0, visit_witness_materials.length() - 1));
+            } else {
+                appCrmVisitDto.setVisit_witness_materials("");
             }
             appCrmVisitDto.fillEntity(entity);
             String userSid = appCrmVisitDto.getUserSid();