|
@@ -12,6 +12,7 @@ import com.example.xiaoshiweixinback.business.utils.CacheUtil;
|
|
|
import com.example.xiaoshiweixinback.business.utils.LoginUtils;
|
|
|
import com.example.xiaoshiweixinback.business.utils.ToolUtil;
|
|
|
import com.example.xiaoshiweixinback.domain.AssoProductFile;
|
|
|
+import com.example.xiaoshiweixinback.domain.Product;
|
|
|
import com.example.xiaoshiweixinback.domain.SearchRecord;
|
|
|
|
|
|
import com.example.xiaoshiweixinback.entity.dto.searchRecord.AddSearchRecordDTO;
|
|
@@ -19,6 +20,7 @@ import com.example.xiaoshiweixinback.entity.dto.searchRecord.SelectSearchRecordD
|
|
|
import com.example.xiaoshiweixinback.entity.vo.PersonnelVO;
|
|
|
import com.example.xiaoshiweixinback.entity.vo.searchRecord.SelectSearchRecordVO;
|
|
|
import com.example.xiaoshiweixinback.mapper.AssoProductFileMapper;
|
|
|
+import com.example.xiaoshiweixinback.mapper.ProductMapper;
|
|
|
import com.example.xiaoshiweixinback.mapper.SearchRecordMapper;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -48,6 +50,9 @@ public class SearchRecordService extends ServiceImpl<SearchRecordMapper, SearchR
|
|
|
@Autowired
|
|
|
private AssoProductFileMapper assoProductFileMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ProductMapper productMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 添加或更新检索记录
|
|
|
*
|
|
@@ -101,6 +106,9 @@ public class SearchRecordService extends ServiceImpl<SearchRecordMapper, SearchR
|
|
|
List<AssoProductFile> productFiles = assoProductFileMapper.selectList(new LambdaQueryWrapper<AssoProductFile>()
|
|
|
.eq(AssoProductFile::getProductId, i.getProductId()));
|
|
|
collect = productFiles.stream().map(AssoProductFile::getFileGuid).collect(Collectors.toList());
|
|
|
+
|
|
|
+ Product product = productMapper.selectById(i.getProductId());
|
|
|
+ recordVO.setProductName(product.getName());
|
|
|
} else {
|
|
|
if (StringUtils.isNotEmpty(i.getGuid())) {
|
|
|
collect.add(i.getGuid());
|