问题修改
This commit is contained in:
@@ -117,4 +117,8 @@ public interface MessageListFeign {
|
|||||||
@ApiOperation("PC端待阅已阅列表")
|
@ApiOperation("PC端待阅已阅列表")
|
||||||
@PostMapping("/todoAllReadList")
|
@PostMapping("/todoAllReadList")
|
||||||
public ResultBean<PagerVo<MessageReadListPCVo>> todoAllReadList(@RequestBody PagerQuery<MessageReadListQuery> pq);
|
public ResultBean<PagerVo<MessageReadListPCVo>> todoAllReadList(@RequestBody PagerQuery<MessageReadListQuery> pq);
|
||||||
|
|
||||||
|
@ApiOperation(value = "业务系统查询待阅任务列表数量")
|
||||||
|
@GetMapping("/getTodoNum/{userSid}")
|
||||||
|
ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid")String userSid);
|
||||||
}
|
}
|
||||||
@@ -125,4 +125,9 @@ public class MessageListFeignFallback implements MessageListFeign {
|
|||||||
public ResultBean<PagerVo<MessageReadListPCVo>> todoAllReadList(PagerQuery<MessageReadListQuery> pq) {
|
public ResultBean<PagerVo<MessageReadListPCVo>> todoAllReadList(PagerQuery<MessageReadListQuery> pq) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ResultBean<Integer> getTodoNum(String userSid) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -91,4 +91,6 @@ public interface MessageListMapper extends BaseMapper<MessageList> {
|
|||||||
List<String> selectByMsgSid(String s);
|
List<String> selectByMsgSid(String s);
|
||||||
|
|
||||||
IPage<MessageReadListPCVo> todoAllReadList(IPage<MessageReadListQuery> iPage,@Param(Constants.WRAPPER) QueryWrapper<MessageList> qw);
|
IPage<MessageReadListPCVo> todoAllReadList(IPage<MessageReadListQuery> iPage,@Param(Constants.WRAPPER) QueryWrapper<MessageList> qw);
|
||||||
|
|
||||||
|
Integer getTodoNum(String userSid);
|
||||||
}
|
}
|
||||||
@@ -178,8 +178,7 @@
|
|||||||
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
|
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
|
||||||
WHERE ml.receiverSid = #{userSid}
|
WHERE ml.receiverSid = #{userSid}
|
||||||
AND mt.sid = #{msgTypeSid}
|
AND mt.sid = #{msgTypeSid}
|
||||||
ORDER BY ml.id desc
|
ORDER BY ml.id desc LIMIT 1
|
||||||
LIMIT 1
|
|
||||||
</select>
|
</select>
|
||||||
<select id="getAppMsgListByUserSid" resultType="com.yxt.messagecenter.api.messagelist.app.AppMessageListVo">
|
<select id="getAppMsgListByUserSid" resultType="com.yxt.messagecenter.api.messagelist.app.AppMessageListVo">
|
||||||
SELECT ml.sid,
|
SELECT ml.sid,
|
||||||
@@ -257,4 +256,12 @@
|
|||||||
</where>
|
</where>
|
||||||
ORDER BY ml.id DESC
|
ORDER BY ml.id DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getTodoNum" resultType="java.lang.Integer">
|
||||||
|
select COUNT(ml.sid)
|
||||||
|
FROM message_list ml
|
||||||
|
LEFT JOIN message m ON ml.msgSid = m.sid
|
||||||
|
where receiverSid = #{userSid}
|
||||||
|
and m.msgType = "抄送"
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -255,4 +255,13 @@ public class MessageListRest implements MessageListFeign {
|
|||||||
}
|
}
|
||||||
return new ResultBean<PagerVo<MessageReadListPCVo>>().success().setData(pagerVo);
|
return new ResultBean<PagerVo<MessageReadListPCVo>>().success().setData(pagerVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ResultBean<Integer> getTodoNum(String userSid) {
|
||||||
|
ResultBean<Integer> rb=ResultBean.fireFail();
|
||||||
|
if(StringUtils.isBlank(userSid)){
|
||||||
|
return rb.setMsg("用户sid不能为空");
|
||||||
|
}
|
||||||
|
return messageListService.getTodoNum(userSid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.yxt.common.base.config.component.FileUploadComponent;
|
|||||||
import com.yxt.common.base.service.MybatisBaseService;
|
import com.yxt.common.base.service.MybatisBaseService;
|
||||||
import com.yxt.common.base.utils.PagerUtil;
|
import com.yxt.common.base.utils.PagerUtil;
|
||||||
import com.yxt.common.core.query.PagerQuery;
|
import com.yxt.common.core.query.PagerQuery;
|
||||||
|
import com.yxt.common.core.result.ResultBean;
|
||||||
import com.yxt.common.core.vo.PagerVo;
|
import com.yxt.common.core.vo.PagerVo;
|
||||||
import com.yxt.messagecenter.api.messagelist.*;
|
import com.yxt.messagecenter.api.messagelist.*;
|
||||||
import com.yxt.messagecenter.api.messagelist.app.*;
|
import com.yxt.messagecenter.api.messagelist.app.*;
|
||||||
@@ -450,4 +451,10 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
|
|||||||
pagerVo.setMsg("共查询出" + pagerVo.getTotal() + "条消息");
|
pagerVo.setMsg("共查询出" + pagerVo.getTotal() + "条消息");
|
||||||
return pagerVo;
|
return pagerVo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ResultBean<Integer> getTodoNum(String userSid) {
|
||||||
|
ResultBean rb = new ResultBean<>();
|
||||||
|
Integer todoNum = baseMapper.getTodoNum(userSid);
|
||||||
|
return rb.success().setData(todoNum);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user