待阅已阅

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java

@@ -41,7 +41,7 @@ public class ProjectInformationRest implements ProjectInformationFeign {
         PagerVo<ProjectInformationVo> pv = ProjectInformationService.listPageVo(pq);
         return rb.success().setData(pv);
     }
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("查询全部")
     @GetMapping("/listAll")
     public ResultBean<List<ProjectInformationVo>> listAll() {
         ResultBean rb = ResultBean.fireFail();
@@ -109,7 +109,7 @@ public class ProjectInformationRest implements ProjectInformationFeign {
     public ResultBean delete(@PathVariable String sid) {
         return ProjectInformationService.delete(sid);
     }
-    @DeleteMapping("/getUserByType/{type}")
+    @GetMapping ("/getUserByType/{type}")
     public ResultBean getUserByType (@PathVariable String type){
         return ProjectInformationService.getUserByType(type);
     }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -153,14 +153,14 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         baseMapper.delete(new QueryWrapper<ProjectInformation>().eq("sid",sid));
         return rb.success().setMsg("删除项目信息成功");
     }
-    public ResultBean getUserByType(String type){
+    public ResultBean getUserByType(String userType){
-        if(type.equals("3")){
+        if(userType.equals("3")){
-            List<SysUserVo> sysUserVos =sysUserFeign.getUserByType(type).getData();
+            List<SysUserVo> sysUserVos =sysUserFeign.getUserByType(userType).getData();
             for(SysUserVo sysUserVo:sysUserVos){
                 BankManager bankManager=bankManagerService.getOne(new QueryWrapper<BankManager>().eq("sid",sysUserVo.getStaffSid()));
                 sysUserVo.setName(bankManager.getName());
             }
         }
-        return sysUserFeign.getUserByType(type);
+        return sysUserFeign.getUserByType(userType);
     }
 }

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

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.crm.api.userproject.UserProjectDto;
 import com.yxt.supervise.crm.api.userproject.UserProjectQuery;
 import com.yxt.supervise.crm.api.userproject.UserProjectVo;
+import com.yxt.supervise.crm.biz.projectinformation.ProjectInformationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,8 @@ public class UserProjectRest {
 
     @Autowired
     UserProjectService UserProjectService;
+    @Autowired
+    ProjectInformationService ProjectInformationService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
@@ -32,7 +35,7 @@ public class UserProjectRest {
         PagerVo<UserProjectVo> pv = UserProjectService.listPageVo(pq);
         return rb.success().setData(pv);
     }
-    @ApiOperation("查询项目类型字典")
+    @ApiOperation("查询项目用户关联")
     @PostMapping("/list")
     public ResultBean<List<UserProjectVo>> listPage() {
         ResultBean rb = ResultBean.fireFail();
@@ -56,10 +59,10 @@ public class UserProjectRest {
         UserProjectVo UserProjectVo=UserProjectService.getUserProjectBySid(projectSid,userType);
         return rb.success().setData(UserProjectVo);
     }
-    //获取银行
+    @GetMapping ("/getUserByType/{userType}")
-//    public ResultBean getAllUser(String userType){
+    public ResultBean getUserByType (@PathVariable String userType){
-//
+        return ProjectInformationService.getUserByType(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/feign/system/SysUserFeign.java

@@ -32,5 +32,5 @@ public interface SysUserFeign {
     @GetMapping("/getUserBySid")
     public ResultBean<SysUser> getUserBySid(@RequestParam("sid")String sid);
     @GetMapping("getUserByType")
-    public ResultBean<List<SysUserVo>> getUserByType(@RequestParam("type") String type);
+    public ResultBean<List<SysUserVo>> getUserByType(@RequestParam("userType") String userType);
 }

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

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

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

@@ -17,6 +17,8 @@ public class MessagePushLogVo implements Vo {
     private String messageTime;
     private String pagepath;
     private String content;
+    //消息状态
+    private String oState;
     private Map<String,String> map;
 
 

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

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.report.api.messagepushlog.MessagePushLogVo">
-        select * from message_push_log l left join message_openid o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
+        select l.*,o.state as oState from message_push_log l left join message_openid o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
     </select>
     <select id="getMessagePushLog" resultType="com.yxt.supervise.report.api.messagepushlog.MessagePushLogVo">
         SELECT

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

@@ -45,12 +45,11 @@ public class MessagePushLogRest {
     /**
      * 查询待阅 已阅消息数量
      * @param userSid
-     * @param state
      * @return
      */
-    @GetMapping("/numberOfJobs/{userSid}/{state}")
+    @GetMapping("/numberOfJobs/{userSid}")
-    public ResultBean numberOfJobs(@PathVariable("userSid")String userSid,@PathVariable("state") String state){
+    public ResultBean numberOfJobs(@PathVariable("userSid")String userSid){
-        return messagePushLogService.numberOfJobs(userSid,state);
+        return messagePushLogService.numberOfJobs(userSid);
     }
 
     @PostMapping("/changeState")

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

@@ -24,11 +24,11 @@ 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 com.yxt.supervise.system.flow.FlowTaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
-import java.util.UUID;
 
 /**
  * @author wangpengfei
@@ -64,12 +64,13 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
         IPage<MessagePushLog> page = PagerUtil.queryToPage(pq);
         QueryWrapper<MessagePushLog> qw = new QueryWrapper<>();
+        System.out.println(query.getState());
         qw.eq("o.openId",openid);
           if(StringUtils.isNotNull(query.getState())){
-            if(query.getState().equals("0")){}
+            if(query.getState().equals("2")){}
-            else if(query.getState().equals("1")){
+            else if(query.getState().equals("0")){
                 qw.eq("o.state",0);
-            }else if(query.getState().equals("2")){
+            }else if(query.getState().equals("1")){
                 qw.eq("o.state",1);
             }
         }
@@ -77,11 +78,23 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         PagerVo<MessagePushLogVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public ResultBean numberOfJobs(String userSid,String state){
+    public ResultBean numberOfJobs(String userSid){
         ResultBean rb =new ResultBean();
+        Map<String,Object> map=new HashMap<>();
         String openid=systemMapper.getAppletOpenidByUsersid(userSid);
-        int count=baseMapper.getAllByUserSid(openid,state);
+        int pendingMessages=baseMapper.getAllByUserSid(openid,"0");
-        return rb.success().setData(count);
+        int readMessage=baseMapper.getAllByUserSid(openid,"1");
+        List<String> list = new ArrayList<>();
+        list.add("【一级风险】");
+        list.add("【二级风险】");
+        list.add("【三级风险】");
+        list.add("【四级风险】");
+        String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"};
+        map.put("readMessage",readMessage);
+        map.put("pendingMessages",pendingMessages);
+        map.put("urls",urls);
+        map.put("notice",list);
+        return rb.success().setData(map);
     }
 
 

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java

@@ -181,5 +181,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUserVo> getUserMessageByRole(@Param("roleSid") String roleSid,@Param("levelOrgSid") String levelOrgSid, @Param("list") List<String> stringList);
 
-    List<SysUserVo> getUserByType(@Param("type")String type);
+    List<SysUserVo> getUserByType(@Param("userType")String userType);
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml

@@ -361,11 +361,11 @@
         </foreach>
     </select>
     <select id="getUserByType" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
-        <if test="type==1">
+        <if test="userType==1">
-            select s.*,f.name as name from sys_user s left join sys_staffinfo f on f.sid=s.staffSid where s.userType=#{type}
+            select s.*,f.name as name from sys_user s left join sys_staffinfo f on f.sid=s.staffSid where s.userType=#{userType}
         </if>
-        <if test="type==3">
+        <if test="userType==3">
-            select * from sys_user s  where s.userType=#{type}
+            select * from sys_user s  where s.userType=#{userType}
         </if>
     </select>
 </mapper>

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java

@@ -695,7 +695,7 @@ public class SysUserRest implements SysUserFeign {
         return sysUserService.selectPasswordByUserSid(userSid);
     }
     @GetMapping("getUserByType")
-    public ResultBean getUserByType(@RequestParam("type") String type){
+    public ResultBean getUserByType(@RequestParam("userType") String userType){
-        return sysUserService.getUserByType(type);
+        return sysUserService.getUserByType(userType);
     }
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -1456,9 +1456,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             return rb.setMsg("注册信息已提交，请耐心等待审核");
         }
     }
-    public ResultBean getUserByType(String type){
+    public ResultBean getUserByType(String userType){
         ResultBean rb=new ResultBean();
-        List<SysUserVo> list=baseMapper.getUserByType(type);
+        List<SysUserVo> list=baseMapper.getUserByType(userType);
         return rb.success().setData(list);
     }
 }