WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息搜索

Browse Source
This commit is contained in:
zhn
2022-11-09 11:07:32 +08:00
parent 7671e43ac2
commit 8192de0fb2
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
+3 -2
View File
@@ -213,7 +213,8 @@ public class SysAnnouncementSendController {
@GetMapping(value = "/getMyAnnouncementSend")
public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
String cut) {
Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
@@ -221,7 +222,7 @@ public class SysAnnouncementSendController {
announcementSendModel.setPageNo((pageNo-1)*pageSize);
announcementSendModel.setPageSize(pageSize);
Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel,cut);
result.setResult(pageList);
result.setSuccess(true);
return result;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+3
View File
@@ -72,6 +72,9 @@
</if>
<if test="announcementSendModel.msgContent !=null and announcementSendModel.msgContent != ''">
and sa.msg_content LIKE concat(concat('%',#{announcementSendModel.msgContent}),'%')
</if>
<if test="announcementSendModel.msgContentCn !=null and announcementSendModel.msgContentCn != ''">
and sa.msg_content_cn LIKE concat(concat('%',#{announcementSendModel.msgContentCn}),'%')
</if>
order by sas.read_flag,sa.send_time desc
</select>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java
+1 -1
View File
@@ -23,7 +23,7 @@ public interface ISysAnnouncementSendService extends IService<SysAnnouncementSen
* @param announcementSendModel
* @return
*/
public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel);
public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel,String cut);
List<AnnouncementSendModel> getMessageUnreadList();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
+6 -1
View File
@@ -4,6 +4,7 @@ import java.util.List;
import javax.annotation.Resource;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.system.entity.SysAnnouncementSend;
import com.jero.modules.system.mapper.SysAnnouncementSendMapper;
@@ -34,7 +35,11 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl<SysAnnouncementS
@Override
public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,
AnnouncementSendModel announcementSendModel) {
AnnouncementSendModel announcementSendModel,String cut) {
if(CutEnum.CN.getValue().equals(cut)){
announcementSendModel.setMsgContentCn(announcementSendModel.getMsgContent());
announcementSendModel.setMsgContent(null);
}
return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel));
}