Commit 177396ea by 刘正

平台端书刊添加分词搜索

parent cf7d1a2b
...@@ -632,6 +632,12 @@ public class BookBizImpl implements BookBiz { ...@@ -632,6 +632,12 @@ public class BookBizImpl implements BookBiz {
paramMap.put("isCurrentMonth", isCurrentMonth); paramMap.put("isCurrentMonth", isCurrentMonth);
paramMap.put("currentPage", currentPage * numPerPage); paramMap.put("currentPage", currentPage * numPerPage);
paramMap.put("numPerPage", numPerPage); paramMap.put("numPerPage", numPerPage);
if(!StringUtil.isEmpty(bookName)){
String[] bookNameList = bookName.trim().split("\\s+");
paramMap.put("bookNameList",Lists.newArrayList(bookNameList));
}
List<BookDto> bookList = bookDao.getListPage4Platform(paramMap); List<BookDto> bookList = bookDao.getListPage4Platform(paramMap);
// 获取平台端所有账号用户名 // 获取平台端所有账号用户名
......
...@@ -23,6 +23,8 @@ import com.pcloud.common.permission.PermissionException; ...@@ -23,6 +23,8 @@ import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.ListUtils; import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.SessionUtil; import com.pcloud.common.utils.SessionUtil;
import com.pcloud.common.utils.cookie.Cookie; import com.pcloud.common.utils.cookie.Cookie;
import com.pcloud.common.utils.string.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -633,6 +635,10 @@ public class BookFacadeImpl implements BookFacade { ...@@ -633,6 +635,10 @@ public class BookFacadeImpl implements BookFacade {
paramMap.put("bookName", bookName); paramMap.put("bookName", bookName);
paramMap.put("secondTempletId", secondTempletId); paramMap.put("secondTempletId", secondTempletId);
paramMap.put("secondTempletIds",Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList())); paramMap.put("secondTempletIds",Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
if(!StringUtil.isEmpty(bookName)){
String[] bookNameList = bookName.trim().split("\\s+");
paramMap.put("bookNameList",Lists.newArrayList(bookNameList));
}
PageBean pageBean = bookBiz.listBookClassify(new PageParam(currentPage, numPerPage), paramMap); PageBean pageBean = bookBiz.listBookClassify(new PageParam(currentPage, numPerPage), paramMap);
return new ResponseDto<>(pageBean); return new ResponseDto<>(pageBean);
} }
......
...@@ -376,8 +376,14 @@ ...@@ -376,8 +376,14 @@
B.SERIAL_NUMBER LIKE CONCAT('%', #{serialNumber},'%') B.SERIAL_NUMBER LIKE CONCAT('%', #{serialNumber},'%')
</if> </if>
<if test="bookName!=null"> <if test="bookName!=null">
AND AND (
B.BOOK_NAME LIKE CONCAT('%', #{bookName},'%') B.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
<if test="bookNameList != null and bookNameList.size > 0">
<foreach collection="bookNameList" item="item" open=" " separator=" " close=" ">
OR B.BOOK_NAME LIKE CONCAT('%', '${item}','%')
</foreach>
</if>
)
</if> </if>
<if test="isbn!=null"> <if test="isbn!=null">
AND AND
...@@ -429,8 +435,14 @@ ...@@ -429,8 +435,14 @@
B.SERIAL_NUMBER LIKE CONCAT('%', #{serialNumber},'%') B.SERIAL_NUMBER LIKE CONCAT('%', #{serialNumber},'%')
</if> </if>
<if test="bookName!=null"> <if test="bookName!=null">
AND AND (
B.BOOK_NAME LIKE CONCAT('%', #{bookName},'%') B.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
<if test="bookNameList != null and bookNameList.size > 0">
<foreach collection="bookNameList" item="item" open=" " separator=" " close=" ">
OR B.BOOK_NAME LIKE CONCAT('%', '${item}','%')
</foreach>
</if>
)
</if> </if>
<if test="isbn!=null"> <if test="isbn!=null">
AND AND
...@@ -440,10 +452,6 @@ ...@@ -440,10 +452,6 @@
AND AND
B.PUBLISH LIKE CONCAT('%', #{publish},'%') B.PUBLISH LIKE CONCAT('%', #{publish},'%')
</if> </if>
<if test="fundName!=null">
AND
BF.FUND_NAME LIKE CONCAT('%', #{fundName},'%')
</if>
) a ) a
</select> </select>
...@@ -1309,7 +1317,15 @@ ...@@ -1309,7 +1317,15 @@
AND ba.CREATED_DATE <![CDATA[ > ]]> #{startDate} AND ba.CREATED_DATE <![CDATA[ < ]]> #{endDate} AND ba.CREATED_DATE <![CDATA[ > ]]> #{startDate} AND ba.CREATED_DATE <![CDATA[ < ]]> #{endDate}
</if> </if>
<if test="bookName!=null"> <if test="bookName!=null">
AND b.BOOK_NAME LIKE CONCAT('%', #{bookName},'%') AND (
(b.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
<if test="bookNameList != null and bookNameList.size > 0">
<foreach collection="bookNameList" item="item" open=" " separator=" " close=" ">
OR b.BOOK_NAME LIKE CONCAT('%', '${item}','%')
</foreach>
</if>
)
)
</if> </if>
</select> </select>
...@@ -1347,8 +1363,16 @@ ...@@ -1347,8 +1363,16 @@
AND ba.CREATED_DATE <![CDATA[ > ]]> #{startDate} AND ba.CREATED_DATE <![CDATA[ < ]]> #{endDate} AND ba.CREATED_DATE <![CDATA[ > ]]> #{startDate} AND ba.CREATED_DATE <![CDATA[ < ]]> #{endDate}
</if> </if>
<if test="bookName!=null"> <if test="bookName!=null">
AND b.BOOK_NAME LIKE CONCAT('%', #{bookName},'%') AND (
</if> (b.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
<if test="bookNameList != null and bookNameList.size > 0">
<foreach collection="bookNameList" item="item" open=" " separator=" " close=" ">
OR b.BOOK_NAME LIKE CONCAT('%', '${item}','%')
</foreach>
</if>
)
)
</if>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment