客户添加业务员检索条件，业务员客户统计

hx-admin/src/main/resources/application-dev.yml

@@ -1,124 +1,3 @@
-## 数据源配置
-#spring:
-#    datasource:
-#        dynamic:
-#            strict: true
-#            primary: base
-#            datasource:
-#                victoriatourist:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                common:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                oa:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                mes:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                wms:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                item:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                supply:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                base:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                iot:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                customer:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                purchase:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                account:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                sale:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                mail:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                kd100:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                ehsd:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                jxst:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#
-#    # redis 配置
-#    redis:
-#        # 地址
-#        host: 139.9.102.170
-#        # 端口，默认为6379
-#        port: 9673
-#        # 数据库索引
-#        database: 1
-#        # 密码
-#        password: ss34dsA3DdsF
-#        # 连接超时时间
-#        timeout: 10s
-#        lettuce:
-#            pool:
-#                # 连接池中的最小空闲连接
-#                min-idle: 0
-#                # 连接池中的最大空闲连接
-#                max-idle: 8
-#                # 连接池的最大数据库连接数
-#                max-active: 8
-#                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-#                max-wait: -1ms
-#
-#server:
-#    servlet:
-#        context-path: /prod-api
-#
-#mail:
-#    # 调用邮箱服务url前缀
-#    urlPrefix: http://localhost:8088/mailService/
-#    abroadUrlPrefix:
-#    #abroadUrlPrefix: http://159.138.54.234:8088/mailService/
-#
-#hx:
-#    httpUrl: http://139.159.251.109:81/prod-api/
-#
-## token配置
-#token:
-#    # 令牌自定义标识
-#    header: Authorization
-#    # 令牌密钥
-#    secret: abcdefghijklmnopqrstuvwxyz
-#    # 令牌有效期（默认30分钟）
-#    expireTime: 240
-
 # 数据源配置
 spring:
     datasource:
@@ -127,84 +6,84 @@ spring:
             primary: base
             datasource:
                 victoriatourist:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 common:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 oa:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 mes:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 wms:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 item:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 supply:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 base:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 iot:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 customer:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 purchase:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 account:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 sale:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 mail:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 kd100:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 ehsd:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 jxst:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://139.9.102.170:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
 
     # redis 配置
     redis:
         # 地址
-        host: 121.37.194.75
+        host: 139.9.102.170
         # 端口，默认为6379
-        port: 30103
+        port: 9673
         # 数据库索引
         database: 5
         # 密码
-        password: Fjhx@pwd123
+        password: ss34dsA3DdsF
         # 连接超时时间
         timeout: 10s
         lettuce:

hx-admin/src/main/resources/application-test.yml

@@ -6,84 +6,84 @@ spring:
             primary: base
             datasource:
                 victoriatourist:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 common:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 oa:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 mes:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 wms:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 item:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 supply:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 base:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 iot:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 customer:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 purchase:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 account:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 sale:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 mail:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 kd100:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 ehsd:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
                 jxst:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
 
     # redis 配置
     redis:
         # 地址
-        host: 121.37.194.75
+        host: 127.0.0.1
         # 端口，默认为6379
-        port: 30103
+        port: 9673
         # 数据库索引
         database: 5
         # 密码
-        password: Fjhx@pwd123
+        password: ss34dsA3DdsF
         # 连接超时时间
         timeout: 10s
         lettuce:

hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerController.java

@@ -7,6 +7,7 @@ import com.fjhx.common.utils.Assert;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
+import com.fjhx.customer.entity.customer.vo.SaleUserStatisticsVo;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.customer.service.xiaoman.XiaomanApiService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -143,6 +145,14 @@ public class CustomerController {
     }
 
     /**
+     * 客户来源统计
+     */
+    @PostMapping("/saleUserStatistics")
+    public List<SaleUserStatisticsVo> saleUserStatistics() {
+        return customerService.saleUserStatistics();
+    }
+
+    /**
      * 刷新小满信息
      */
     @PostMapping("/refreshXiaomanInfo")

hx-customer/src/main/java/com/fjhx/customer/entity/customer/vo/SaleUserStatisticsVo.java

@@ -0,0 +1,12 @@
+package com.fjhx.customer.entity.customer.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SaleUserStatisticsVo {
+    private Long userId;
+    private String nickName;
+    private Integer customerCount;
+}

hx-customer/src/main/java/com/fjhx/customer/mapper/customer/CustomerMapper.java

@@ -7,6 +7,7 @@ import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.vo.CustomerFollowRecordsVo;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
+import com.fjhx.customer.entity.customer.vo.SaleUserStatisticsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,11 +31,12 @@ public interface CustomerMapper extends BaseMapper<Customer> {
     /**
      * 客户表分页
      */
-    Page<CustomerVo> getPage(@Param("page") Page<Object> page, @Param("ew")IWrapper<CustomerVo> wrapper);
+    Page<CustomerVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<CustomerVo> wrapper);
 
 
     /**
      * 来源存量（客户分析）
+     *
      * @param query
      * @return
      */
@@ -42,6 +44,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
 
     /**
      * 来源增量（客户分析）
+     *
      * @param query
      * @return
      */
@@ -59,4 +62,10 @@ public interface CustomerMapper extends BaseMapper<Customer> {
     List<CustomerFollowRecordsVo> getFollowUp(@Param("id") Long id, @Param("tenantId") String tenantId);
 
     List<Customer> sourceCount(@Param("ew") QueryWrapper<Customer> wrapper);
+
+    /**
+     * 业务员客户统计
+     */
+    List<SaleUserStatisticsVo> saleUserStatistics(@Param("ew") QueryWrapper<Customer> wrapper);
+
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/CustomerService.java

@@ -6,6 +6,7 @@ import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
+import com.fjhx.customer.entity.customer.vo.SaleUserStatisticsVo;
 import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
@@ -71,6 +72,11 @@ public interface CustomerService extends BaseService<Customer> {
     Map<String, Object> sourceStatistics(CustomerSelectDto customerDto);
 
     /**
+     * 业务员客户统计
+     */
+    List<SaleUserStatisticsVo> saleUserStatistics();
+
+    /**
      * 客户分配
      */
     void customerAllocation(CustomerDto dto);

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -20,6 +20,7 @@ import com.fjhx.customer.entity.customer.po.CustomerTop;
 import com.fjhx.customer.entity.customer.po.CustomerUser;
 import com.fjhx.customer.entity.customer.vo.CustomerFollowRecordsVo;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
+import com.fjhx.customer.entity.customer.vo.SaleUserStatisticsVo;
 import com.fjhx.customer.mapper.customer.CustomerMapper;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.customer.service.customer.CustomerTopService;
@@ -33,11 +34,13 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -60,6 +63,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 
     @Autowired
     private DictTenantDataService dictTenantDataService;
+    @Resource
+    private ISysUserService sysUserService;
 
 
     /**
@@ -126,6 +131,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         wrapper.like("c", Customer::getName, dto.getName());
         // 业务员查询
         wrapper.eq("c", Customer::getUserId, dto.getUserId());
+
+
         // 关键字
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
             List<Long> cuIds = customerUserService.listObject(CustomerUser::getCustomerId, q -> q
@@ -136,12 +143,22 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
                     .isNotNull(CustomerUser::getCustomerId)
                     .groupBy(CustomerUser::getCustomerId)
             );
+
+            //用户名检索
+            DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+            List<SysUser> userList = sysUserService.list(Wrappers.<SysUser>query().like("nick_name", dto.getKeyword()));
+            DynamicDataSourceContextHolder.poll();
+            List<Long> userIds = userList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+
             wrapper.and(q -> q
                     .like("c", Customer::getName, dto.getKeyword()).or()
                     .like(Customer::getCode, dto.getKeyword()).or()
-                    .in(Customer::getId, cuIds)
+                    .in(Customer::getId, cuIds).or()
+                    .in(Customer::getUserId, userIds)
             );
         }
+
+
         //客户联系人过滤
         if (ObjectUtil.isNotEmpty(dto.getContactName())) {
             List<Long> cuIds = customerUserService.listObject(CustomerUser::getCustomerId, q -> q
@@ -514,6 +531,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         return reData;
     }
 
+    @Override
+    public List<SaleUserStatisticsVo> saleUserStatistics() {
+        return baseMapper.saleUserStatistics(Wrappers.query());
+    }
+
     /**
      * 客户分配
      */

hx-customer/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -2,69 +2,50 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.customer.mapper.customer.CustomerMapper">
     <update id="customerAllocation">
-        update customer set user_id = #{userId},update_time = now(),allocation_time = now() where id = #{id}
+        update customer
+        set user_id         = #{userId},
+            update_time     = now(),
+            allocation_time = now()
+        where id = #{id}
     </update>
-    <select id="getList" resultType="com.fjhx.customer.entity.customer.vo.CustomerVo">
-        select
-            c.id,
-            c.customer_code,
-            c.code,
-            c.country_id,
-            c.province_id,
-            c.city_id,
-            c.address,
-            c.zip_code,
-            c.name,
-            c.status,
-            c.source,
-            c.user_id,
-            c.create_user,
-            c.create_time,
-            c.update_user,
-            c.update_time,
-            c.tag,
-            c.company_id,
-            c.short_name,
-            c.homepage,
-            c.scale_id,
-            c.fax,
-            c.tel_area_code,
-            c.tel,
-            c.remark,
-            c.xm_country_name
+    <sql id="list">
+        select c.id,
+               c.customer_code,
+               c.code,
+               c.country_id,
+               c.province_id,
+               c.city_id,
+               c.address,
+               c.zip_code,
+               c.name,
+               c.status,
+               c.source,
+               c.user_id,
+               c.create_user,
+               c.create_time,
+               c.update_user,
+               c.update_time,
+               c.tag,
+               c.company_id,
+               c.short_name,
+               c.homepage,
+               c.scale_id,
+               c.fax,
+               c.tel_area_code,
+               c.tel,
+               c.remark,
+               c.xm_country_name
         from customer c
-            ${ew.customSqlSegment}
+    </sql>
+
+    <select id="getList" resultType="com.fjhx.customer.entity.customer.vo.CustomerVo">
+        <include refid="list"/>
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getPage" resultType="com.fjhx.customer.entity.customer.vo.CustomerVo">
-        select
-            c.id,
-            c.customer_code,
-            c.code,
-            c.country_id,
-            c.province_id,
-            c.city_id,
-            c.address,
-            c.zip_code,
-            c.name,
-            c.status,
-            c.source,
-            c.user_id,
-            c.create_user,
-            c.create_time,
-            c.update_user,
-            c.update_time,
-            c.tag,
-            c.company_id,
-            c.short_name,
-            c.homepage,
-            c.scale_id,
-            c.fax,
-            c.tel_area_code,
-            c.tel,
-            c.xm_country_name
-        from customer c
-            ${ew.customSqlSegment}
+        <include refid="list"/>
+        ${ew.customSqlSegment}
     </select>
 
 
@@ -141,5 +122,16 @@
         GROUP BY
         dcd.dict_key
     </select>
+    <select id="saleUserStatistics" resultType="com.fjhx.customer.entity.customer.vo.SaleUserStatisticsVo">
+        SELECT su.user_id,
+               su.nick_name,
+               count(cu.id) AS customerCount
+        FROM customer cu
+                 RIGHT JOIN bytesailing_base.sys_user su ON su.user_id = cu.user_id AND su.del_flag = 0
+                 JOIN bytesailing_base.sys_user_role sur ON sur.user_id = su.user_id
+                 JOIN bytesailing_base.sys_role sr ON sr.role_id = sur.role_id AND sr.del_flag = 0
+        WHERE sr.role_key = 'salesman'
+        GROUP BY su.user_id
+    </select>
 
 </mapper>