|
|
@@ -1,8 +1,12 @@
|
|
|
package com.fjhx.common.service.employee.impl;
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
|
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.fjhx.common.constant.SourceConstant;
|
|
|
import com.fjhx.common.entity.employee.dto.EmployeeHandoverDto;
|
|
|
import com.fjhx.common.entity.employee.dto.EmployeeHandoverSelectDto;
|
|
|
import com.fjhx.common.entity.employee.po.EmployeeHandover;
|
|
|
@@ -11,9 +15,10 @@ import com.fjhx.common.mapper.employee.EmployeeHandoverMapper;
|
|
|
import com.fjhx.common.service.CommService;
|
|
|
import com.fjhx.common.service.employee.EmployeeHandoverService;
|
|
|
import com.fjhx.common.utils.Assert;
|
|
|
+import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
-import com.ruoyi.common.utils.wrapper.SqlField;
|
|
|
+import com.ruoyi.system.service.ISysUserService;
|
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -34,16 +39,25 @@ public class EmployeeHandoverServiceImpl extends ServiceImpl<EmployeeHandoverMap
|
|
|
|
|
|
@Autowired
|
|
|
private CommService commService;
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService userService;
|
|
|
|
|
|
@Override
|
|
|
public Page<EmployeeHandoverVo> getPage(EmployeeHandoverSelectDto dto) {
|
|
|
IWrapper<EmployeeHandover> wrapper = getWrapper();
|
|
|
//关键字搜索
|
|
|
- wrapper.keyword(dto.getKeyword(),
|
|
|
- new SqlField(EmployeeHandoverVo::getReason),
|
|
|
- new SqlField(EmployeeHandoverVo::getRemark),
|
|
|
- new SqlField(EmployeeHandoverVo::getContent)
|
|
|
- );
|
|
|
+ if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
|
+ DynamicDataSourceContextHolder.push(SourceConstant.BASE);
|
|
|
+ List<Object> objects = userService.listObjs(Wrappers.<SysUser>lambdaQuery().like(SysUser::getNickName, dto.getKeyword()));
|
|
|
+ DynamicDataSourceContextHolder.poll();
|
|
|
+ objects.add(null);
|
|
|
+ wrapper.and(q -> q
|
|
|
+ .like(EmployeeHandoverVo::getReason, dto.getKeyword())
|
|
|
+ .or().like(EmployeeHandoverVo::getRemark, dto.getKeyword())
|
|
|
+ .or().in(EmployeeHandoverVo::getHandoverPersonId, objects)
|
|
|
+ .or().in(EmployeeHandoverVo::getRecipientId, objects)
|
|
|
+ );
|
|
|
+ }
|
|
|
wrapper.orderByDesc("eh", EmployeeHandover::getId);
|
|
|
Page<EmployeeHandoverVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
List<EmployeeHandoverVo> records = page.getRecords();
|
|
|
@@ -61,7 +75,8 @@ public class EmployeeHandoverServiceImpl extends ServiceImpl<EmployeeHandoverMap
|
|
|
Assert.notEmpty(content, "交接内容不能为空");
|
|
|
String[] split = content.split(",");
|
|
|
for (String s : split) {
|
|
|
- if ("客户信息".equals(s)) {
|
|
|
+ //1客户信息
|
|
|
+ if ("1".equals(s)) {
|
|
|
//把交接人的客户信息全部修改至接收人
|
|
|
commService.updateCustomerSalesperson(employeeHandoverDto.getHandoverPersonId(), employeeHandoverDto.getRecipientId());
|
|
|
} else {
|
yzc