From a7f93267f225f10020150eb57f0cff94b4a8ad2b Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 28 May 2024 11:07:30 +0800
Subject: [PATCH] report

---
 .../report/biz/projectdaily/ProjectDailyService.java          | 3 ++-
 .../main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
index ddd369b9..98623846 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
+++ b/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());
+        List<String> list=crmMapper.getProjectSidByUserSid(sysUserVo.getSid(),"b2a9f856-016e-4880-ba1c-261ac4edc8ec");
         QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
         qw.gt("id", 0);
         if (StrUtil.isNotBlank(params.getDataDateStart())) {
@@ -110,6 +110,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         }else{
             qw.in("projectSid",list);
         }
+
         qw.orderByDesc("orderDate", "createTime");
 
         IPage<ProjectDaily> iPage = PagerUtil.queryToPage(pq);
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
index c379c987..6d547894 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
@@ -51,8 +51,8 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     @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 where userSid=#{userSid}")
-    List<String> getProjectSidByUserSid(@Param("userSid") String userSid);
+    @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}")
+    List<String> getProjectSidByUserSid(@Param("userSid") String userSid,@Param("stateSid")String stateSid);
     @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);