feat:搜索结果页

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/mapper/ebook/EbookMapper.java

@@ -322,7 +322,7 @@ public interface EbookMapper extends BaseMapper<Ebook> {
     List<ResourceListInfoVO> queryResourcePageInfoList(@Param("form") ResourceQueryForm form);
     @Select("<script>"
              + "SELECT DISTINCT "
-             + " bb.id,2 as resourceType,t1.cover,bb.name,ba.author,t1.synopsis,t1.browseNum,t1.price,t1.realPrice "
+             + " bb.id,2 as resourceType,t1.cover,bb.name,ba.author,t1.synopsis,t1.browseNum,t1.price,t1.realPrice,bb.publishTime,bb.publisher,rr.projectId "
              + " FROM res_book bb "
              + " LEFT JOIN res_ebook t1 ON bb.id = t1.id "
              + " LEFT JOIN res_ebook_diy_type bdt ON t1.id = bdt.ebookId"

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/vo/ResourceListInfoVO.java

@@ -45,4 +45,12 @@ public class ResourceListInfoVO {
     private String video;
     @ApiModelProperty(value = "创建时间")
     private Date createdTime;
+    @ApiModelProperty("出版时间")
+    private Date publishTime;
+    @ApiModelProperty("出版单位")
+    private String publisher;
+    @ApiModelProperty("专题id，新增时不需要填写")
+    private String projectId;
+    @ApiModelProperty("专题名称")
+    private String projectName;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/ResourceRelationServiceImpl.java

@@ -390,6 +390,16 @@ public class ResourceRelationServiceImpl extends ServiceImpl<ResourceRelationMap
         }
         if(form.getResourceType().equals(AllResourceTypeEnum.EBOOK.getCode())){
             list=ebookMapper.searchResource(form);
+            if(list.size()>0){
+                for (ResourceListInfoVO vo:list) {
+                    if(StringUtils.isNotBlank(vo.getProjectId())){
+                        ProjectLibrary sc = projectLibraryMapper.selectById(list.get(0).getProjectId());
+                        if (sc != null) {
+                            vo.setProjectName(sc.getName());
+                        }
+                    }
+                }
+            }
         }
         if(form.getResourceType().equals(AllResourceTypeEnum.GOODS.getCode())){
             list=goodsLibraryMapper.searchResource(form);