增加业务员搜索

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

@@ -117,3 +117,117 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
     expireTime: 2880
+
+
+
+## 数据源配置
+#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
+#
+#    # redis 配置
+#    redis:
+#        # 地址
+#        host: 139.159.251.109
+#        # 端口，默认为6379
+#        port: 31347
+#        # 数据库索引
+#        database: 1
+#        # 密码
+#        password: w3G_11h4YjrsO_6P5Oi
+#        # 连接超时时间
+#        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: 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

hx-sale/src/main/java/com/fjhx/sale/entity/sample/dto/SampleSelectDto.java

@@ -18,4 +18,9 @@ public class SampleSelectDto extends BaseSelectDto {
      * 审批状态
      */
     private String status;
+
+    /**
+     * 业务员ID
+     */
+    private String userId;
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -265,7 +265,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
         }
-
+        if (StringUtils.isNotEmpty(dto.getUserId())) {
+            wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());
+        }
         //根据客户id关联
         wrapper.eq(ContractVo::getBuyCorporationId, dto.getCustomerId());
 

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -11,6 +11,7 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.entity.sample.dto.SampleDto;
 import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
@@ -63,6 +64,9 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("s", Sample::getStatus, dto.getStatus());
         }
+        if (StringUtils.isNotEmpty(dto.getUserId())) {
+            wrapper.eq("s", Sample::getCreateUser, dto.getUserId());
+        }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("s", Sample::getCode));
         }