From 48c46a0c2ebfa559aa87a99ac7d87ba09badb6a3 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 26 May 2022 18:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseDiscountpackage.java                  |  3 +++
 .../BaseDiscountpackageDto.java               |  6 +++++
 .../BaseDiscountpackageVo.java                | 25 ++++++++++--------
 .../BaseSalesDicountVo.java                   |  2 ++
 .../BaseVehicleModelFeign.java                |  2 +-
 .../base/api/basevehiclemodel/VehModelVo.java |  2 ++
 .../BaseVehmodelConfigDto.java                |  2 ++
 .../BaseDiscountpackageMapper.xml             | 25 +++++++++---------
 .../BaseDiscountpackageService.java           |  9 ++++++-
 .../BaseVehicleModelMapper.xml                |  2 +-
 .../BaseVehicleModelService.java              |  1 +
 .../BaseVehmodelConfigService.java            |  9 +++++++
 .../commoncontract/CommonContractService.java | 26 +++++++++++--------
 .../crmcustomertemp/CrmCustomerTempQuery.java | 19 +++++++-------
 .../yxt/anrui/crm/api/crmvisit/CrmVisit.java  |  7 +++--
 .../anrui/crm/api/crmvisit/CrmVisitVo.java    |  4 ++-
 .../CrmCustomerTempService.java               | 22 +++++++---------
 .../anrui/crm/biz/crmvisit/CrmVisitMapper.xml |  1 +
 .../anrui/crm/biz/crmvisit/CrmVisitRest.java  |  2 +-
 .../biz/sysstafforg/SysStaffOrgService.java   |  8 +++---
 20 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java
index 6a5fe50071..9c81abb128 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java
@@ -40,6 +40,9 @@ public class BaseDiscountpackage extends BaseEntity {
     @ApiModelProperty("优惠项目名称")
     private String projectName;
 
+    @ApiModelProperty("优惠包成本")
+    private String projectCost;
+
     @ApiModelProperty("政策类别")
     private String salesPolicy;
 
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java
index dca889d380..eff4d0f818 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java
@@ -42,6 +42,9 @@ public class BaseDiscountpackageDto implements Dto {
     @ApiModelProperty("优惠项目名称")
     private String projectName;
 
+    @ApiModelProperty("优惠包成本")
+    private String projectCost;
+
     @ApiModelProperty("政策类别")
     private String salesPolicy;
 
@@ -62,4 +65,7 @@ public class BaseDiscountpackageDto implements Dto {
 
     @ApiModelProperty("用户sid")
     private String userSid;
+
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java
index c9acb1e446..0fab058386 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java
@@ -24,12 +24,9 @@ import lombok.Data;
 @Data
 public class BaseDiscountpackageVo implements Vo {
 
-    @ApiModelProperty("优惠情况sid")
+    @ApiModelProperty("优惠情况")
     private String sid;
 
-    @ApiModelProperty("销售订单单据sid")
-    private String orderSid;
-
     @ApiModelProperty("优惠类型key")
     private String discountTypeKey;
 
@@ -37,13 +34,16 @@ public class BaseDiscountpackageVo implements Vo {
     private String discountType;
 
     @ApiModelProperty("优惠金额")
-    private String amount;
+    private String discountMoney;
 
     @ApiModelProperty("优惠项目说明")
-    private String detail;
+    private String discountExplain;
 
-    @ApiModelProperty("优惠项目说明")
-    private String discountName;
+    @ApiModelProperty("优惠项目名称")
+    private String projectName;
+
+    @ApiModelProperty("优惠包成本")
+    private String projectCost;
 
     @ApiModelProperty("政策类别")
     private String salesPolicy;
@@ -54,9 +54,12 @@ public class BaseDiscountpackageVo implements Vo {
     @ApiModelProperty("有效期")
     private String effectiveDate;
 
-    @ApiModelProperty("使用组织")
+    @ApiModelProperty("是否有效  1 是 0 否")
+    private String isEmploy;
+
+    @ApiModelProperty("使用组织sid")
     private String useOrg;
 
-    @ApiModelProperty("是否有效")
-    private String isEmploy;
+    @ApiModelProperty("使用组织")
+    private String useOrgName;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java
index 2a0970213d..f6a2ceb147 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java
@@ -20,6 +20,8 @@ public class BaseSalesDicountVo implements Vo {
     private String discountType;
     @ApiModelProperty("优惠包名称")
     private String projectName;
+    @ApiModelProperty("优惠包成本")
+    private String projectCost;
     @ApiModelProperty("优惠金额")
     private String discountMoney;
     @ApiModelProperty("优惠项目说明")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
index e6b5d60a42..92e64234ca 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
@@ -39,7 +39,7 @@ public interface BaseVehicleModelFeign {
 
     /**
      * 分页查询
-     *
+     *listPageByVehmodel
      * @param pagerQuery
      * @return
      */
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/VehModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/VehModelVo.java
index 0231b8cc91..3f725c0494 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/VehModelVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/VehModelVo.java
@@ -17,4 +17,6 @@ public class VehModelVo implements Vo {
     private String brandName;
     @ApiModelProperty("其他配置说明")
     private String otherConfig;
+    @ApiModelProperty(value = "销售指导价")
+    private String guidedPrice;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
index 29a1f8b29a..7cdbe7e59b 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
@@ -52,6 +52,8 @@ import java.math.BigDecimal;
 @Data
 public class BaseVehmodelConfigDto implements Dto {
 
+	@ApiModelProperty("业务员sid")
+	private String staffSid; // 车型与简述配置关联sid
 	@ApiModelProperty("车型与简述配置关联sid")
 	private String sid; // 车型与简述配置关联sid
 	@ApiModelProperty("车型sid")
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
index 80dcda35fc..1124315242 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
@@ -14,22 +14,23 @@
 
     <select id="selectBySid" resultType="com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageVo">
         select *
-        from bus_order_discount bod
-        where bod.sid = #{sid}
+        from base_discountpackage
+        where sid = #{sid}
     </select>
 
     <select id="selectSalesOrderList" resultType="com.yxt.anrui.base.api.basediscountpackage.BaseSalesDicountVo">
         select sid,
-               salesPolicy,
-               discountType,
-               projectName,
-               discountMoney,
-               discountExplain,
-               effectiveDate,
-               case isEmploy
-                   when '0' then '否'
-                   when '1' then '是'
-                   end as isEmploy
+        salesPolicy,
+        discountType,
+        projectName,
+        projectCost,
+        discountMoney,
+        discountExplain,
+        effectiveDate,
+        case isEmploy
+        when '0' then '否'
+        when '1' then '是'
+        end as isEmploy
         from base_discountpackage
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
index 47d8cbbced..351b2ce99e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basediscountpackage;
 
+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.basediscountpackage.*;
@@ -104,8 +105,14 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     public ResultBean saveOrUpdateDto(BaseDiscountpackageDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackage entity = new BaseDiscountpackage();
+        String orgSid = "";
+        ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid());
+        if (stringResultBean.getSuccess()) {
+            orgSid = stringResultBean.getData();
+        }
         dto.setSid(UUID.randomUUID().toString());
-        dto.fillEntity(entity);
+        BeanUtil.copyProperties(dto,entity);
+        entity.setUseOrg(orgSid);
         save(entity);
         return rb.success().setData(entity.getSid());
     }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
index 71af2a651d..2ef7061cdf 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
@@ -391,7 +391,7 @@
     </select>
 
     <select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
-        SELECT bvm.`brandName`,bvm.`modelName`,bmc.`configName`,bmc.otherConfig
+        SELECT bvm.`brandName`,bvm.`modelName`,bmc.`configName`,bmc.otherConfig,bvc.guidedPrice
         FROM base_vehmodel_config bvc
                      LEFT JOIN base_vehicle_model bvm
                 ON bvc.`modelSid` = bvm.`sid`
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
index a23ba02950..e984e3a850 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
@@ -507,6 +507,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
             entity.setModelName(entity.getVehicleTypeValue()+entity.getDriveFormValue()+entity.getGearboxTypeValue()+entity.getVehicleVersionValue()+entity.getProductLineValue()+entity.getPowerValue()+entity.getFuelTypeValue());
+            entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
             boolean isSave = save(entity);
             if (!isSave) {
                 return rb.setMsg("车型信息保存失败");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
index 0c822487d1..237a15feb6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basevehmodelconfig.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -72,6 +73,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BaseModelConfigService baseModelConfigService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     @Autowired
     private BaseVehicleAppendixService baseVehicleAppendixService;
@@ -413,6 +416,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         String sid = baseVehmodelConfig.getSid();
         BeanUtil.copyProperties(dto, baseVehmodelConfig);
         baseVehmodelConfig.setSid(sid);
+        String orgSid = "";
+        ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid());
+        if (stringResultBean.getSuccess()) {
+            orgSid = stringResultBean.getData();
+        }
+        baseVehmodelConfig.setUseOrgSid(orgSid);
         save(baseVehmodelConfig);
         return rb.success().setMsg("关联成功");
     }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 28089415a7..8cc619ccef 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -925,18 +925,22 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String path = "";
         List<String> commonContractVos = new ArrayList<>();
         List<String> sceneSignUrlList = new ArrayList<>();
-        String[] appdixUrls = appdixUrl.split(",");
-        String[] sceneSignUrls = sceneSignUrl.split(",");
-        for (String url : appdixUrls) {
-            String urlPrefix = fileUploadComponent.getUrlPrefix();
-            path = urlPrefix + url;
-            commonContractVos.add(path);
-        }
-        for (String signUrl : sceneSignUrls) {
-            String urlPrefix = fileUploadComponent.getUrlPrefix();
-            path = urlPrefix + signUrl;
-            sceneSignUrlList.add(path);
+        if (StringUtils.isNotBlank(appdixUrl)){
+            String[] appdixUrls = appdixUrl.split(",");
+            for (String url : appdixUrls) {
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                path = urlPrefix + url;
+                commonContractVos.add(path);
+            }
         }
+       if (StringUtils.isNotBlank(sceneSignUrl)){
+           String[] sceneSignUrls = sceneSignUrl.split(",");
+           for (String signUrl : sceneSignUrls) {
+               String urlPrefix = fileUploadComponent.getUrlPrefix();
+               path = urlPrefix + signUrl;
+               sceneSignUrlList.add(path);
+           }
+       }
         commonContractVo.setCommonAppendixVos(commonContractVos);
         commonContractVo.setSceneSignUrlList(sceneSignUrlList);
         return rb.success().setData(commonContractVo);
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java
index 479d57a277..752a331007 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java
@@ -24,27 +24,28 @@ import lombok.Data;
 @Data
 public class CrmCustomerTempQuery implements Query {
 
-	@ApiModelProperty("客户类型（自然人/法人）")
-    private String customerType;
+	@ApiModelProperty("客户类型key（自然人/法人）")
+    private String customerTypeKey;
     
 	@ApiModelProperty("客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）")
-    private String level;
-    
+    private String levelKey;
+
 	@ApiModelProperty("客户名称")
     private String name;
 
 	@ApiModelProperty("联系电话")
     private String mobile;
 
-	@ApiModelProperty("提醒日期")
-    private String remind_day;
+	@ApiModelProperty("提醒开始日期")
+    private String remindStartDay;
+
+    @ApiModelProperty("提醒结束日期")
+    private String remindEndDay;
 
     @ApiModelProperty("业务员sid")
     private String staffSid;
 
-    @ApiModelProperty("公司名称")
-    private String companyName;
-
     @ApiModelProperty("用户sid")
     private String userSid;
+
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisit.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisit.java
index 56a24cfe14..0b318a0259 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisit.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisit.java
@@ -77,15 +77,18 @@ public class CrmVisit extends BaseEntity {
     @ApiModelProperty("提醒日期（天）key")
     private String remind_day_key;
 
+    @ApiModelProperty("提醒备注")
+    private String remind_remark;
+
     @ApiModelProperty("位置信息")
     private String positionInformation;
 
-    @ApiModelProperty("区域代码（省）")
+/*    @ApiModelProperty("区域代码（省）")
     private String address_province;
     @ApiModelProperty("区域代码（市）")
     private String address_city;
     @ApiModelProperty("区域代码（县）")
-    private String address_county;
+    private String address_county;*/
 
     @ApiModelProperty("经度")
     private String longitude;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisitVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisitVo.java
index 974c3613ca..294fb53a9e 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisitVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisitVo.java
@@ -81,6 +81,9 @@ public class CrmVisitVo implements Vo {
     @ApiModelProperty("提醒日期（天）key")
     private String remind_day_key;
 
+    @ApiModelProperty("提醒备注")
+    private String remind_remark;
+
     @ApiModelProperty("位置信息")
     private String positionInformation;
 
@@ -98,5 +101,4 @@ public class CrmVisitVo implements Vo {
 
     @ApiModelProperty("车辆需求条数")
     private String xqcounts;
-
 }
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 f256986604..3802723b3a 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
@@ -106,16 +106,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotBlank(query.getCustomerType())) {
-            qw.eq("customerType", query.getCustomerType());
+        if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
+            qw.eq("customerTypeKey", query.getCustomerTypeKey());
         }
 
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("name", query.getName());
         }
 
-        if (StringUtils.isNotBlank(query.getLevel())) {
-            qw.eq("level", query.getLevel());
+        if (StringUtils.isNotBlank(query.getLevelKey())) {
+            qw.eq("levelKey", query.getLevelKey());
         }
 
         if (StringUtils.isNotBlank(query.getMobile())) {
@@ -125,15 +125,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         if (StringUtils.isNotBlank(query.getStaffSid())) {
             qw.eq("staffSid", query.getStaffSid());
         }
-
-        if (StringUtils.isNotBlank(query.getRemind_day())) {
-            qw.eq("remind_day", query.getRemind_day());
-        }
-
-        if (StringUtils.isNotBlank(query.getCompanyName())) {
-            qw.eq("companyName", query.getCompanyName());
-        }
-
+        String remindStartDay = query.getRemindStartDay();
+        String remindEndDay = query.getRemindEndDay();
+        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(remindEndDay), "date_format (remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
+                );
         return qw;
     }
 
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 b75e693b5f..76cfd513df 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
@@ -42,6 +42,7 @@
     </select>
     <select id="selVisitVo" resultType="com.yxt.anrui.crm.api.crmvisit.CrmVisitVo">
         SELECT cv.sid,
+               cv.remind_remark,
                cv.customerSid,
                cct.`name` AS customerName,
                cv.follow_form,
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
index 3b0c7f0c28..6e7d47061b 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
@@ -89,7 +89,7 @@ public class CrmVisitRest implements CrmVisitFeign {
         int count = crmCustomerService.selBySid(customerSid);
         if (count > 0) {
             CrmVisit entity = new CrmVisit();
-            dto.fillEntity(entity);
+            BeanUtil.copyProperties(dto,entity);
             boolean IsSave = crmVisitService.save(entity);
             if (!IsSave) {
                 return rb.fail().setMsg("添加失败");
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
index be6f37eeb0..9f6fce8e5d 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
@@ -171,9 +171,11 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         for (int i = 0; i < list.size(); i++) {
             SysOrganization sysOrganization = sysOrganizationService.fetchBySid(list.get(i));
             if (sysOrganization != null) {
-                if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) {
-                    sid = list.get(i);
-                    break;
+                if (sysOrganization.getIsDept() != null){
+                    if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) {
+                        sid = list.get(i);
+                        break;
+                    }
                 }
             }
         }