report

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

@@ -0,0 +1,14 @@
+package com.yxt.supervise.report.api.messagepushlog;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/5/28 15:54
+ */
+@Data
+public class MessageLogVo {
+    private String sid;
+    private String name;
+    private String date;
+}

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

@@ -172,11 +172,16 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         int pendingMessages = baseMapper.getCountByUser(sysUser.getAppletOpenid(), "0");
         int readMessage = baseMapper.getCountByUser(sysUser.getAppletOpenid(), "1");
         Integer integer = flowTaskFeign.getTodoNum(userSid).getData();
-        List<String> list = new ArrayList<>();
+        List<MessageLogVo> list = new ArrayList<>();
-        list.add("【一级风险】");
+        MessageLogVo vo=new MessageLogVo();
-        list.add("【二级风险】");
+        vo.setDate("2024-05-28");
-        list.add("【三级风险】");
+        vo.setName("【一级风险】");
-        list.add("【四级风险】");
+        vo.setSid("1");
+        MessageLogVo vo1=new MessageLogVo();
+        vo1.setDate("2024-05-28");
+        vo1.setName("【二级风险】");
+        vo1.setSid("1");
+        list.add(vo1);
         String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"};
         map.put("readMessage", readMessage);
         map.put("pendingMessages", pendingMessages);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -96,7 +96,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
     public IPage<ProjectDaily> listPage(PagerQuery<ProjectDailyQuery> pq,HttpServletRequest request) {
         ProjectDailyQuery params = pq.getParams();
         SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(request.getHeader("token")).getData();
-        List<String> list=crmMapper.getProjectSidByUserSid(sysUserVo.getSid(),"b2a9f856-016e-4880-ba1c-261ac4edc8ec");
+        List<String> list=crmMapper.getProjectSidByUserSid(sysUserVo.getSid());
         QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
         qw.gt("id", 0);
         if (StrUtil.isNotBlank(params.getDataDateStart())) {
@@ -121,7 +121,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         return projectInformationFeign.listAll(request.getHeader("token"));
     }
     public Map<String,Object> selectList(ProjectDailyQuery params) {
-        List<UserProject> userProjects=crmMapper.getProjectByUserSid(params.getUserSid());
+        List<UserProject> userProjects=crmMapper.getProjectByUserSid(params.getUserSid(),"b2a9f856-016e-4880-ba1c-261ac4edc8ec");
         List<ProjectDailyVos> list=new ArrayList<>();
         Map<String,Object> map=new HashMap<>();
         double creditLimitTotal=0;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@@ -43,16 +43,16 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     int countByUserProjectSid(@Param("userProjectSid") String userProjectSid,@Param("templateSid") String templateSid);
 
 
-    @Select("select * from user_project where userSid=#{userSid}")
+    @Select("select * from user_project a left join project_information b on b.sid=a.projectSid where a.userSid=#{userSid} and b.stateSid=#{stateSid}")
-    List<UserProject> getProjectByUserSid(@Param("userSid") String userSid);
+    List<UserProject> getProjectByUserSid(@Param("userSid") String userSid,@Param("stateSid")String stateSid);
     //
     @Select("select * from project_account where sid=#{sid}")
     ProjectAccount getAccountBySid(@Param("sid")String sid );
     @Update("update project_account set balance=#{balance} where sid=#{sid}")
     int updateBalanceBySid(@Param("balance") BigDecimal balance, @Param("sid")String sid);
 
-    @Select("select projectSid from user_project a left join project_information b on b.sid=a.projectSid where a.userSid=#{userSid} and b.stateSid=#{stateSid}")
+    @Select("select projectSid from user_project a  where a.userSid=#{userSid}")
-    List<String> getProjectSidByUserSid(@Param("userSid") String userSid,@Param("stateSid")String stateSid);
+    List<String> getProjectSidByUserSid(@Param("userSid") String userSid);
     @Select("select p.*,e.enterpriseName as enterpriseName from project_account p left join enterprise_information e on e.sid =p.enterpriseSid " +
             "where projectSid=#{projectSid} ")
     List<ProjectAccountVo> getAccountByProjectSid(@Param("projectSid")String projectSid);