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 by senderIds had been completed

Browse Source
This commit is contained in:
cccccyb
2023-06-04 17:27:02 +08:00
parent 42168ab54c
commit 68e6625b26
9 changed files with 62 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,10 +8,10 @@ import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.INoticeReceiveService;
import com.cfive.pinnacle.service.INoticeService;
import com.cfive.pinnacle.utils.WebUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -39,7 +39,8 @@ 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,String userName) {
public ResponseResult<List<Notice>> selectPageNotice(Integer currentPage, Integer pageSize, String title, String type, String startTime, String endTime,String userIdList) {
List<Long> userIds = WebUtil.convertStringToList(userIdList, Long.class);
Page<Notice> noticePage;
if (null != currentPage && null != pageSize) {
noticePage = PageDTO.of(currentPage, pageSize);
@@ -47,7 +48,7 @@ public class NoticeController {
// 不进行分页
noticePage = PageDTO.of(1, -1);
}
IPage<Notice> noticeIPage = noticeService.selectPageNotice(noticePage, title.trim(), type.trim(), startTime.trim(), endTime.trim(),userName.trim());
IPage<Notice> noticeIPage = noticeService.selectPageNotice(noticePage, title.trim(), type.trim(), startTime.trim(), endTime.trim(),userIds);
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());

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

@@ -20,6 +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,String userName);
IPage<Notice> selectPageNotice(IPage<?> page, String title, String type, LocalDateTime startTime, LocalDateTime endTime,List<Long> userIdList);
}

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,String userName);
IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime,List<Long> userIdList);
}

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,String userName) {
public IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime,List<Long> userIdList) {
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,userName);
return noticeMapper.selectPageNotice(page, title, type, start, end,userIdList);
}
@Override

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

@@ -50,12 +50,12 @@
<if test="null!=startTime">
and n.send_time &gt;= #{startTime}
</if>
<if test="null !=endTime">
<if test="null != endTime">
and n.end_time &lt; #{endTime}
</if>
<if test="null!=userName and userName!=''">
and u.username = #{userName}
</if>
<foreach collection="userIdList" item="item" index="index" open="and u.id in (" separator="," close=")">
#{item}
</foreach>
and n.deleted = 0
and n.old = 0
</where>