待阅已阅

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Mapper
 public interface UserProjectMapper extends BaseMapper<UserProject> {
     IPage<UserProjectVo> selectPageVo(IPage<UserProject> page, @Param(Constants.WRAPPER) Wrapper<UserProject> qw);
-    List<UserProjectVo> typeList();
+    List<UserProjectVo> userProjectList();
-    UserProjectVo getProjectTypeBySid( @Param("sid") String sid);
+    UserProjectVo getUserProjectBySid( @Param("projectSid") String projectSid,@Param("userType")String userType);
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml

@@ -12,13 +12,11 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="typeList" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
+    <select id="userProjectList" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
         SELECT *
         FROM user_project
     </select>
-    <select id="getProjectTypeBySid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
+    <select id="getUserProjectBySid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
-        SELECT *
+        SELECT * FROM user_project WHERE projectSid=#{projectSid} and userType=#{userType}
-        FROM user_project
-        WHERE sid=#{sid}
     </select>
 </mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java

@@ -36,7 +36,7 @@ public class UserProjectRest {
     @PostMapping("/list")
     public ResultBean<List<UserProjectVo>> listPage() {
         ResultBean rb = ResultBean.fireFail();
-        List<UserProjectVo> pv = UserProjectService.typeList();
+        List<UserProjectVo> pv = UserProjectService.userProjectList();
         return rb.success().setData(pv);
     }
     @ApiOperation("保存")
@@ -50,12 +50,16 @@ public class UserProjectRest {
         return UserProjectService.update(dto);
     }
     @ApiOperation("根据sid查询")
-    @GetMapping("/getProjTypeBySid/{sid}")
+    @GetMapping("/getUserProjectBySid/{projectSid}/{userType}")
-    public ResultBean getWarehouse(@PathVariable String sid){
+    public ResultBean getWarehouse(@PathVariable String projectSid,@PathVariable String userType){
         ResultBean rb = ResultBean.fireFail();
-        UserProjectVo UserProjectVo=UserProjectService.getProjectTypeBySid(sid);
+        UserProjectVo UserProjectVo=UserProjectService.getUserProjectBySid(projectSid,userType);
         return rb.success().setData(UserProjectVo);
     }
+    //获取银行
+//    public ResultBean getAllUser(String userType){
+//
+//    }
     @ApiOperation("删除")
     @DeleteMapping("/delete/{sid}")
     public ResultBean delete(@PathVariable String sid) {

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java

@@ -33,8 +33,8 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         PagerVo<UserProjectVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<UserProjectVo> typeList() {
+    public List<UserProjectVo> userProjectList() {
-        List<UserProjectVo> pagging = baseMapper.typeList();
+        List<UserProjectVo> pagging = baseMapper.userProjectList();
         return pagging;
     }
     public ResultBean save(UserProjectDto dto) {
@@ -54,8 +54,8 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         baseMapper.updateById(entity);
         return rb.success().setMsg("修改项目类型成功");
     }
-    public UserProjectVo getProjectTypeBySid(String sid){
+    public UserProjectVo getUserProjectBySid(String projectSid,String userType){
-        UserProjectVo bank=baseMapper.getProjectTypeBySid(sid);
+        UserProjectVo bank=baseMapper.getUserProjectBySid(projectSid,userType);
         return bank;
     }
     public ResultBean delete(String sid) {

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushLogQuery.java

@@ -10,4 +10,5 @@ import lombok.Data;
 @Data
 public class MessagePushLogQuery implements Query {
     private String userSid;
+    private String state;//0全部  1 已读 2未读
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Mapper
 public interface MessagePushLogMapper extends BaseMapper<MessagePushLog> {
-    @Select("select * from message_push_log l left join message_openid o on o.messageSid=l.sid  where o.openId=#{openid}")
+    @Select("select count(o.id) from message_push_log l left join message_openid o on o.messageSid=l.sid  where o.openId=#{openid} and o.state=#{state}")
-   MessagePushLogVo getAllByUserSid(@Param("openid") String openid);
+   int getAllByUserSid(@Param("openid") String openid,@Param("state")String state);
     IPage<MessagePushLogVo> selectPageVo(IPage<MessagePushLog> page, @Param(Constants.WRAPPER) Wrapper<MessagePushLog> qw);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogRest.java

@@ -41,6 +41,18 @@ public class MessagePushLogRest {
         PagerVo<MessagePushLogVo> pv = messagePushLogService.listPage(pq);
         return rb.success().setData(pv);
     }
+
+    /**
+     * 查询待阅 已阅消息数量
+     * @param userSid
+     * @param state
+     * @return
+     */
+    @GetMapping("/numberOfJobs/{userSid}/{state}")
+    public ResultBean numberOfJobs(@PathVariable("userSid")String userSid,@PathVariable("state") String state){
+        return messagePushLogService.numberOfJobs(userSid,state);
+    }
+
     @PostMapping("/changeState")
     public ResultBean changeState(@RequestBody PagerQuery<MessagePushLogQuery> pq){
         ResultBean rb = ResultBean.fireFail();

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -23,7 +24,6 @@ import com.yxt.supervise.report.api.reportsalesdaytobaccostore.ReportSalesDayTob
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.system.dicttype.DictType;
 import com.yxt.supervise.system.dicttype.DictTypeVo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -65,10 +65,26 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         IPage<MessagePushLog> page = PagerUtil.queryToPage(pq);
         QueryWrapper<MessagePushLog> qw = new QueryWrapper<>();
         qw.eq("o.openId",openid);
+        if(StringUtils.isNotNull(query.getState())){
+            if(query.getState().equals("0")){}
+            else if(query.getState().equals("1")){
+                qw.eq("o.state",0);
+            }else if(query.getState().equals("2")){
+                qw.eq("o.state",1);
+            }
+        }
         IPage<MessagePushLogVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<MessagePushLogVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public ResultBean numberOfJobs(String userSid,String state){
+        ResultBean rb =new ResultBean();
+        String openid=systemMapper.getAppletOpenidByUsersid(userSid);
+        int count=baseMapper.getAllByUserSid(openid,state);
+        return rb.success().setData(count);
+    }
+
+
     public PagerVo<MessagePushLogVo> changeState(PagerQuery<MessagePushLogQuery> pq) {
         ResultBean rb=new ResultBean();
         MessagePushLogQuery query = pq.getParams();