From 71def45befd3b55d9ea375d4c69ac04e7e15f60d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 13 Nov 2023 09:57:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=9A=84=E5=BA=94=E6=94=B6=E6=9C=AA=E6=94=B6=E7=9A=84=E8=9E=8D?=
 =?UTF-8?q?=E8=B5=84=E6=94=BE=E6=AC=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderLoancontractService.java        |  4 ++--
 .../biz/loansolutions/LoanSolutionsService.java  | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
index e502667cb0..77a39d5c6e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
@@ -485,13 +485,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //留购价
-                            if (StringUtils.isNotBlank(solutions.getNominalPrice()) && !("0").equals(solutions.getNominalPrice())) {
+                           /* if (StringUtils.isNotBlank(solutions.getNominalPrice()) && !("0").equals(solutions.getNominalPrice())) {
                                 CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
                                 creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
-                            }
+                            }*/
                         }
                         creditResult.setResultDetails(collectionDetailDtoListOne);
                         finKingDeeFeign.pushOtherReceivableBill(creditResult);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index 0f9d994080..f88f3e9445 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -2725,6 +2725,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         //根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；
         // 差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
         BigDecimal bg = BigDecimal.ZERO;
+        BigDecimal zer = BigDecimal.ZERO;
         LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid);
         if (loanSolutions != null) {
             //根据产品政策sid查询
@@ -2741,22 +2742,27 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
                     if (loanSolutionsDetail != null) {
                         if (loanSolutionsDetail.getBondAmounts() != null) {
-                            bg = bg.subtract(loanSolutionsDetail.getBondAmounts());
+                            zer = zer.add(loanSolutionsDetail.getBondAmounts());
                         }
                     }
                 }
                 if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {
-                    BigDecimal zer = BigDecimal.ZERO;
                     if (loanSolutions.getFactoryDiscount() != null) {
-                        bg = bg.subtract(loanSolutions.getFactoryDiscount());
+//                        bg = bg.subtract(loanSolutions.getFactoryDiscount());
                         zer = zer.add(loanSolutions.getFactoryDiscount());
                     }
                     if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
-                        bg = bg.subtract(loanSolutionsOtherpolicy.getOtherDiscount());
+//                        bg = bg.subtract(loanSolutionsOtherpolicy.getOtherDiscount());
                         zer = zer.add(loanSolutionsOtherpolicy.getOtherDiscount());
                     }
-                    pushVo.setOtherReceivableMoney(zer.toString());
                 }
+                LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+                if(loanSolutionsDetail != null){
+                    if(loanSolutionsDetail.getProxyAccidentPremium() != null){
+                        zer = zer.add(loanSolutionsDetail.getProxyAccidentPremium());
+                    }
+                }
+                pushVo.setOtherReceivableMoney(zer.toString());
             }
         }
         pushVo.setMoney(bg.toString());

From 1f492e9fba497fcf001cc952c8400994bea9a579 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 13 Nov 2023 10:41:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=B9?=
 =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1=E7=BB=93=E6=9E=9C--?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E5=BC=80=E7=A5=A8=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/managementcreditaudit/managementcreditaudit.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue b/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
index 3689b7647d..f5f715346f 100644
--- a/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
+++ b/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
@@ -75,6 +75,14 @@
                 <el-input v-model="scope.row.bankContractNo" clearable placeholder=""/>
               </template>
             </el-table-column>
+            <el-table-column label="是否公司开票" align="center" width="150">
+              <template slot-scope="scope">
+                <el-radio-group :disabled="!scope.row.isHavTrailer" v-model="scope.row.isCompInvoic">
+                  <el-radio label="0">是</el-radio>
+                  <el-radio label="1">否</el-radio>
+                </el-radio-group>
+              </template>
+            </el-table-column>
             <el-table-column label="见证附件" align="center" width="130">
               <template slot-scope="scope">
                 <div style="display: flex;flex-direction: row;justify-content: center;align-items: center">

From edd829dee6a805153f16c61125cbff2966cd514c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 13 Nov 2023 11:04:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/jichuxinxi/crmcustomer.js         | 14 ++++-
 .../kehuguanli/kehuchaxun/kehuchaxun.vue      | 61 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js
index 592a738e83..2e1a56e194 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js
@@ -69,6 +69,17 @@ export function deleteBySids(data) {
   })
 }
 
+// 导出
+export function exportExcel(data) {
+  return request({
+    url: '/crm/v1/crmcustomertemp/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明返回服务器返回的数据类型
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
 // 推送财务数据--是否确定车架号选择否
 export function sendFinCustomer(data, orgCode) {
   return request({
@@ -93,9 +104,6 @@ export function sendFinCustomerTrue(data) {
   })
 }
 
-
-
-
 // 推送财务数据--是否确定车架号选择是，选择车辆
 export function vehicleCrmList(data) {
   return request({
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
index 97afd7eed9..6f0eb2ed36 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
@@ -24,6 +24,14 @@
                   <el-option v-for="item in induslevel" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="销售专员">
+                <el-input v-model="listQuery.params.staffName" placeholder="" class="addinputw" clearable/>
+              </el-form-item>
+              <el-form-item label="创建日期">
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createStartDate" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createEndDate" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
+              </el-form-item>
               <el-form-item label="提醒日期">
                 <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindStartDay" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
                 <span style="padding: 0 8px">至</span>
@@ -90,6 +98,11 @@
                 <span>{{ scope.row.level }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="创建日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="提醒日期" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.remind_day }}</span>
@@ -173,7 +186,7 @@
 </template>
 
 <script>
-import { listPageByOrgPathSid, sendFinCustomer } from '@/api/jichuxinxi/crmcustomer'
+import { listPageByOrgPathSid, sendFinCustomer, exportExcel } from '@/api/jichuxinxi/crmcustomer'
 import { typeValues, getOrgSidByPath, fetchDetailsByUseOrgSid, getButtonPermissions } from '@/api/dictcommons/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -211,6 +224,13 @@ export default {
           btnKey: 'toPush',
           btnLabel: '推送财务数据'
         },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        },
         {
           type: 'info',
           size: 'small',
@@ -243,7 +263,10 @@ export default {
           remindEndtDay: '',
           userSid: '',
           staffSid: '',
-          orgSidPath: ''
+          orgSidPath: '',
+          createStartDate: '',
+          createEndDate: '',
+          staffName: ''
         },
         total: 0
       },
@@ -275,6 +298,9 @@ export default {
         case 'toPush':
           this.toPush()
           break
+        case 'doExport':
+          this.doExport()
+          break
         case 'doClose':
           this.doClose()
           break
@@ -328,6 +354,7 @@ export default {
       this.listQuery = {
         current: 1,
         size: 10,
+        total: 0,
         params: {
           customerTypeKey: '',
           levelKey: '',
@@ -337,7 +364,10 @@ export default {
           remindEndtDay: '',
           userSid: '',
           staffSid: '',
-          orgSidPath: ''
+          orgSidPath: '',
+          createStartDate: '',
+          createEndDate: '',
+          staffName: ''
         }
       }
       this.getList()
@@ -465,6 +495,31 @@ export default {
         }
       })
     },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      exportExcel(this.listQuery.params).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '客户信息表' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'nonde'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)

From 14eb2fae67224bddc91856bba5242b649814d0e0 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 13 Nov 2023 11:05:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=81=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmCustomerTempExportVo.java              | 43 ++++++++
 .../crmcustomertemp/CrmCustomerTempFeign.java |  9 ++
 .../CrmCustomerTempFeignFallback.java         |  5 +
 .../crmcustomertemp/CrmCustomerTempQuery.java |  9 ++
 .../CrmCustomerTempMapper.java                |  2 +
 .../crmcustomertemp/CrmCustomerTempMapper.xml | 19 ++++
 .../crmcustomertemp/CrmCustomerTempRest.java  | 29 +++++-
 .../CrmCustomerTempService.java               | 97 ++++++++++++++++++-
 8 files changed, 209 insertions(+), 4 deletions(-)
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java
new file mode 100644
index 0000000000..530eb0d402
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java
@@ -0,0 +1,43 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 9:34
+ */
+@Data
+public class CrmCustomerTempExportVo {
+    private String staffSid;
+    private String createOrgSid;
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    private String createTime;
+    @ExportEntityMap(CnName = "客户编码", EnName = "customerNo")
+    private String customerNo;
+    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    private String createOrgName;
+    @ExportEntityMap(CnName = "部门", EnName = "deptName")
+    private String deptName;
+    @ExportEntityMap(CnName = " 销售专员", EnName = "staffName")
+    private String staffName;
+    @ExportEntityMap(CnName = "客户名称", EnName = "name")
+    private String name;
+    @ExportEntityMap(CnName = "客户类型", EnName = "customerType")
+    private String customerType;
+    @ExportEntityMap(CnName = "联系电话", EnName = "mobile")
+    private String mobile;
+    @ExportEntityMap(CnName = "微信号", EnName = "weixin")
+    private String weixin;
+    @ExportEntityMap(CnName = "客户级别", EnName = "level")
+    private String level;
+    @ExportEntityMap(CnName = "提醒日期", EnName = "remind_day")
+    private String remind_day;
+    @ExportEntityMap(CnName = "意向车型", EnName = "yxcounts")
+    private String yxcounts;
+    @ExportEntityMap(CnName = "跟进记录", EnName = "gjcounts")
+    private String gjcounts;
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
index 1a5d285d9c..ba5a25e3d3 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
@@ -96,6 +96,15 @@ public interface CrmCustomerTempFeign {
     public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);
 
 
+    /**
+     * 客户列表导出
+     * @param crmCustomerTempQuery
+     */
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "客户列表导出")
+    @ResponseBody
+    public void exportExcel(@RequestBody CrmCustomerTempQuery crmCustomerTempQuery);
+
     /**
      * pc端潜在客户编辑保存
      *
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
index 9b6a2e0d89..c5758d360c 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
@@ -73,6 +73,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public void exportExcel(CrmCustomerTempQuery crmCustomerTempQuery) {
+
+	}
+
 	@Override
 	public ResultBean update(CrmCustomerTempUpdateDto dto,String sid){
 		return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/update无法访问");
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 1bfb607801..d2f794b43c 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
@@ -56,4 +56,13 @@ public class CrmCustomerTempQuery implements Query {
     @ApiModelProperty("客户sid")
     private List<String> customerSidList;
 
+    @ApiModelProperty("创建开始日期")
+    private String createStartDate;
+
+    @ApiModelProperty("创建结束日期")
+    private String createEndDate;
+
+    @ApiModelProperty("销售专员")
+    private String staffName;
+
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
index 2452700d9c..5f4dbe3de4 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
@@ -135,4 +135,6 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
     List<CrmCustomerTemp> selectLists(@Param(Constants.WRAPPER) QueryWrapper<CrmCustomerTemp> qw);
 
     void updateIdBySid(@Param("idCard") String idCard,@Param("custSid") String custSid);
+
+    List<CrmCustomerTempExportVo> exportExcel(@Param(Constants.WRAPPER) QueryWrapper<CrmCustomerTemp> qw);
 }
\ No newline at end of file
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 665a6bffbc..6dd8a4ec66 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
@@ -5,6 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
         SELECT cct.*,
+        st.name as staffName,
         (SELECT COUNT(*)
         FROM crm_vehicledemand cv
         WHERE cct.sid = cv.customerSid
@@ -14,6 +15,7 @@
         WHERE cct.sid = cvi.customerSid) gjcounts
         FROM crm_customer_temp cct
         LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
+        LEFT JOIN anrui_portal.sys_staffinfo st ON cct.staffSid = st.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -247,6 +249,23 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="exportExcel" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo">
+        SELECT cct.*,
+        st.name as staffName,
+        (SELECT COUNT(*)
+        FROM crm_vehicledemand cv
+        WHERE cct.sid = cv.customerSid
+        AND states = 1) yxcounts,
+        (SELECT COUNT(*)
+        FROM crm_visit cvi
+        WHERE cct.sid = cvi.customerSid) gjcounts
+        FROM crm_customer_temp cct
+        LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
+        LEFT JOIN anrui_portal.sys_staffinfo st ON cct.staffSid = st.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
     <update id="updateIdBySid">
         update crm_customer_temp
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
index ecc8b8473d..c69318d535 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
@@ -1,12 +1,17 @@
 package com.yxt.anrui.crm.biz.crmcustomertemp;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleExportVo;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
 import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.*;
 import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -18,6 +23,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -49,7 +59,8 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
 
     @Autowired
     private SysUserFeign sysUserFeign;
-
+    @Autowired
+    private HttpServletResponse response;
     @Override
     public ResultBean<PagerVo<CrmCustomerTempVo>> listPage(@RequestBody PagerQuery<CrmCustomerTempQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -119,6 +130,22 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.billApplicatSaveCust(dto);
     }
 
+    @Override
+    public void exportExcel(CrmCustomerTempQuery crmCustomerTempQuery) {
+        //得到所有要导出的数据
+        List<CrmCustomerTempExportVo> CrmCustomerTempExportVoList = crmCustomerTempService.exportExcel(crmCustomerTempQuery);
+        //定义导出的excel名字
+        String excelName = "客户信息列表";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //导出车辆管理列表
+        ExportExcelUtils.export(fileNameURL, CrmCustomerTempExportVoList, CrmCustomerTempExportVo.class, response);
+    }
+
     /**
      * 潜在客户修改保存
      *
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 c17e755c11..9952cfe86e 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
@@ -59,6 +59,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -215,11 +217,19 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         if (StringUtils.isNotBlank(query.getMobile())) {
             qw.like("cct.mobile", query.getMobile());
         }
+        if (StringUtils.isNotBlank(query.getStaffName())) {
+            qw.like("st.name", query.getStaffName());
+        }
         String remindStartDay = query.getRemindStartDay();
         String remindEndDay = query.getRemindEndDay();
         qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
                 );
+        String createStartDate = query.getCreateStartDate();
+        String createEndDate = query.getCreateEndDate();
+        qw.apply(StringUtils.isNotBlank(createStartDate), "date_format (cct.createTime,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndDate), "date_format (cct.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
+                );
         IPage<CrmCustomerTemp> page = PagerUtil.queryToPage(pq);
         IPage<CrmCustomerTempVo> pagging = baseMapper.selectPageVo(page, qw);
         for (CrmCustomerTempVo record : pagging.getRecords()) {
@@ -227,8 +237,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             String staffSid = record.getStaffSid();
             String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
             record.setCreateOrgName(createOrgName);
-            String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName();
-            record.setStaffName(staffName);
+//            String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName();
+//            record.setStaffName(staffName);
             List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
             for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
@@ -1223,6 +1233,87 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     }
 
     public void updateIdBySid(String idCard, String custSid) {
-        baseMapper.updateIdBySid(idCard,custSid);
+        baseMapper.updateIdBySid(idCard, custSid);
+    }
+
+    public List<CrmCustomerTempExportVo> exportExcel(CrmCustomerTempQuery query) {
+        QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
+        String userSid = query.getUserSid();
+        //根据用户的组织机构查询分公司
+        String orgSidPath = query.getOrgSidPath();
+        String orgSid = "";//分公司sid
+        if (StringUtils.isNotBlank(orgSidPath)) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
+        } else {
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+            if (sysOrganizationVo != null) {
+                orgSid = sysOrganizationVo.getSid();
+            }
+        }
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)) {
+            orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("so.orgSidPath", orgSidPath);
+        } else if ("3".equals(orgLevelKey)) {
+            qw.eq("cct.createOrgSid", orgSid);
+        }
+        if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
+            qw.eq("cct.customerTypeKey", query.getCustomerTypeKey());
+        }
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("cct.name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getLevelKey())) {
+            qw.eq("cct.levelKey", query.getLevelKey());
+        }
+
+        if (StringUtils.isNotBlank(query.getMobile())) {
+            qw.like("cct.mobile", query.getMobile());
+        }
+        if (StringUtils.isNotBlank(query.getStaffName())) {
+            qw.like("st.name", query.getStaffName());
+        }
+        String remindStartDay = query.getRemindStartDay();
+        String remindEndDay = query.getRemindEndDay();
+        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
+                );
+        String createStartDate = query.getCreateStartDate();
+        String createEndDate = query.getCreateEndDate();
+        qw.apply(StringUtils.isNotBlank(createStartDate), "date_format (cct.createTime,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndDate), "date_format (cct.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
+                );
+        List<CrmCustomerTempExportVo> records = baseMapper.exportExcel(qw);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        int id = 1;
+        if (!records.isEmpty()) {
+            for (CrmCustomerTempExportVo record : records) {
+                try {
+                    Date date = sdf.parse(record.getCreateTime());
+                    record.setCreateTime(sdf.format(date));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                String createOrgSid = record.getCreateOrgSid();
+                String staffSid = record.getStaffSid();
+                String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
+                record.setCreateOrgName(createOrgName);
+                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
+                for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
+                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
+                    String psid = sysOrganizationVo.getPsid();
+                    if (psid.equals(createOrgSid)) {
+                        String orgName = sysStaffOrgVo.getOrgName();
+                        record.setDeptName(orgName);
+                    }
+                }
+                record.setRankNo(id);
+                id = id + 1;
+            }
+        }
+        return records;
     }
 }
\ No newline at end of file