FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

add the function of fuzzy query item

Browse Source
This commit is contained in:
cccccyb
2023-06-04 02:27:47 +08:00
parent 6860f2bdac
commit fe876c5a36
9 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Pinnacle/src/main/java/com/cfive/pinnacle/controller/NoticeController.java
View File

@@ -39,15 +39,15 @@ public class NoticeController {
//分页查询所有公告或分页模糊查询
@GetMapping("/page")
@PreAuthorize("hasAuthority('notice:manage:get')")
public ResponseResult<List<Notice>> selectPageNotice(Integer currentPage, Integer pageSize, String title, String type, String startTime, String endTime) {
Page<Notice> noticePage = null;
public ResponseResult<List<Notice>> selectPageNotice(Integer currentPage, Integer pageSize, String title, String type, String startTime, String endTime,String userName) {
Page<Notice> noticePage;
if (null != currentPage && null != pageSize) {
noticePage = PageDTO.of(currentPage, pageSize);
} else {
// 不进行分页
noticePage = PageDTO.of(1, -1);
}
IPage<Notice> noticeIPage = noticeService.selectPageNotice(noticePage, title.trim(), type.trim(), startTime.trim(), endTime.trim());
IPage<Notice> noticeIPage = noticeService.selectPageNotice(noticePage, title.trim(), type.trim(), startTime.trim(), endTime.trim(),userName.trim());
int code = noticeIPage.getRecords() != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
String msg = noticeIPage.getRecords() != null ? String.valueOf(noticeIPage.getTotal()) : "数据查询失败，请重试！";
return ResponseResult.build(code, msg, noticeIPage.getRecords());

3
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/NoticeMapper.java
View File

@@ -20,5 +20,6 @@ import java.util.List;
public interface NoticeMapper extends BaseMapper<Notice> {
Notice selectByNoticeId(Long nid);
IPage<Notice> selectPageNotice(IPage<?> page, String title, String type, LocalDateTime startTime, LocalDateTime endTime);
IPage<Notice> selectPageNotice(IPage<?> page, String title, String type, LocalDateTime startTime, LocalDateTime endTime,String userName);
}

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/INoticeService.java
View File

@@ -27,5 +27,5 @@ public interface INoticeService extends IService<Notice> {
Boolean addNotice(Notice notice);
IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime);
IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime,String userName);
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java
View File

@@ -44,13 +44,13 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
}
@Override
public IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime) {
public IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime,String userName) {
LocalDateTime start=null,end=null;
if (startTime!=""&&endTime!=""){
start= LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
return noticeMapper.selectPageNotice(page, title, type, start, end);
return noticeMapper.selectPageNotice(page, title, type, start, end,userName);
}
@Override

9
Pinnacle/src/main/resources/mapper/NoticeMapper.xml
View File

@@ -42,16 +42,19 @@
left join t_user u on n.sender_id = u.id
<where>
<if test="null!=title and title!=''">
and instr(title,#{title})&gt;0
and instr(n.title,#{title})&gt;0
</if>
<if test="null!=type and type!=''">
and instr(type.name,#{type})&gt;0
</if>
<if test="null!=startTime">
and send_time &gt;= #{startTime}
and n.send_time &gt;= #{startTime}
</if>
<if test="null !=endTime">
and end_time &lt; #{endTime}
and n.end_time &lt; #{endTime}
</if>
<if test="null!=userName and userName!=''">
and u.username = #{userName}
</if>
and n.deleted = 0
and n.old = 0