Commit 128a579d authored by 李秀明's avatar 李秀明

feat(knowledgebase): 知识库列表接口增加查询条件

parent bd8b0548
...@@ -164,7 +164,7 @@ public class DocLibraryService { ...@@ -164,7 +164,7 @@ public class DocLibraryService {
Page page = new Page(); Page page = new Page();
int total = docContentService.getBaseMapper().queryDocBaseInfoTotal(paramsMap); int total = docContentService.getBaseMapper().queryDocBaseInfoTotal(paramsMap);
page.setTotal(total); page.setTotal(total);
if (total > 0 && total > offset) { if (total > 0) {
List<Map<String, Object>> list = docContentService.getBaseMapper().queryDocBaseInfoList(paramsMap); List<Map<String, Object>> list = docContentService.getBaseMapper().queryDocBaseInfoList(paramsMap);
list.stream().map(x -> { list.stream().map(x -> {
x.put("createTime", x.get("createTime").toString().replace("T", " ")); x.put("createTime", x.get("createTime").toString().replace("T", " "));
...@@ -283,7 +283,13 @@ public class DocLibraryService { ...@@ -283,7 +283,13 @@ public class DocLibraryService {
commonFiltersMap.put("directoryIdList", directoryIdList); commonFiltersMap.put("directoryIdList", directoryIdList);
} }
if (!ValidationUtil.isEmpty(docTitle)) { if (!ValidationUtil.isEmpty(docTitle)) {
commonFiltersMap.put("docTitle", docTitle); if (docTitle.contains(";")) {
String[] vars = docTitle.split(";");
Set<String> docTitleLike = new HashSet<>(Arrays.asList(vars));
commonFiltersMap.put("docTitleLike", docTitleLike);
} else {
commonFiltersMap.put("docTitle", docTitle);
}
} }
if (!ValidationUtil.isEmpty(docStatus)) { if (!ValidationUtil.isEmpty(docStatus)) {
commonFiltersMap.put("docStatus", docStatus); commonFiltersMap.put("docStatus", docStatus);
......
...@@ -118,6 +118,12 @@ ...@@ -118,6 +118,12 @@
<if test="commonFilters.docTitle != null and commonFilters.docTitle.length > 0"> <if test="commonFilters.docTitle != null and commonFilters.docTitle.length > 0">
AND DOC_TITLE LIKE CONCAT("%", #{commonFilters.docTitle}, "%") AND DOC_TITLE LIKE CONCAT("%", #{commonFilters.docTitle}, "%")
</if> </if>
<if test="commonFilters.docTitleLike != null and commonFilters.docTitleLike.size > 0">
AND
<foreach collection="commonFilters.docTitleLike" item="docTitle" open="(" close=")" separator="or">
DOC_TITLE LIKE CONCAT("%", #{docTitle}, "%")
</foreach>
</if>
<if test="commonFilters.docStatus != null and commonFilters.docStatus.length > 0"> <if test="commonFilters.docStatus != null and commonFilters.docStatus.length > 0">
AND DOC_STATUS = #{commonFilters.docStatus} AND DOC_STATUS = #{commonFilters.docStatus}
</if> </if>
...@@ -201,6 +207,12 @@ ...@@ -201,6 +207,12 @@
<if test="commonFilters.docTitle != null and commonFilters.docTitle.length > 0"> <if test="commonFilters.docTitle != null and commonFilters.docTitle.length > 0">
AND DOC_TITLE LIKE CONCAT("%", #{commonFilters.docTitle}, "%") AND DOC_TITLE LIKE CONCAT("%", #{commonFilters.docTitle}, "%")
</if> </if>
<if test="commonFilters.docTitleLike != null and commonFilters.docTitleLike.size > 0">
AND
<foreach collection="commonFilters.docTitleLike" item="docTitle" open="(" close=")" separator="or">
DOC_TITLE LIKE CONCAT("%", #{docTitle}, "%")
</foreach>
</if>
<if test="commonFilters.docStatus != null and commonFilters.docStatus.length > 0"> <if test="commonFilters.docStatus != null and commonFilters.docStatus.length > 0">
AND DOC_STATUS = #{commonFilters.docStatus} AND DOC_STATUS = #{commonFilters.docStatus}
</if> </if>
...@@ -248,7 +260,7 @@ ...@@ -248,7 +260,7 @@
</if> </if>
</where> </where>
</select> </select>
<select id="getAllPublishedDocIds" resultType="long"> <select id="getAllPublishedDocIds" resultType="long">
SELECT SEQUENCE_NBR FROM knowledge_doc_content WHERE DOC_STATUS = "PUBLISHED" SELECT SEQUENCE_NBR FROM knowledge_doc_content WHERE DOC_STATUS = "PUBLISHED"
</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