From d85f89d7df5e34f5c99309f8bd942a442b23b0e6 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Mon, 7 Aug 2023 17:58:10 +0800
Subject: [PATCH] 8-7

---
 .../projectinformation/ProjectInformationService.java | 11 +++++++++++
 .../crm/biz/userproject/UserProjectService.java       |  5 +++++
 .../report/biz/stock/ReportStockDayService.java       |  8 ++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
index 6b935a2b..6f592f96 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
@@ -18,6 +18,8 @@ import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo;
 import com.yxt.supervise.crm.biz.bankmanager.BankManagerService;
 import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
 import com.yxt.supervise.crm.biz.loanbankinformation.LoanBankInformationService;
+import com.yxt.supervise.crm.biz.userproject.UserProject;
+import com.yxt.supervise.crm.biz.userproject.UserProjectService;
 import com.yxt.supervise.crm.feign.system.SysUserFeign;
 import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
 import com.yxt.supervise.system.sysuser.SysUser;
@@ -44,6 +46,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
     BankManagerService bankManagerService;
     @Autowired
     LoanBankInformationService bankInformationService;
+    @Autowired
+    UserProjectService userProjectService;
     public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq) {
         ProjectInformationQuery query = pq.getParams();
         QueryWrapper<ProjectInformation> qw = new QueryWrapper<>();
@@ -129,6 +133,13 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             return bank;
         }else if(s.getUserType()==1){
             //监管人员
+            List<UserProject> projectSidListByUserSid = userProjectService.getProjectSidListByUserSid(sid);
+            List<ProjectInformationVo> list = new ArrayList<>();
+            for (UserProject userProject : projectSidListByUserSid) {
+                ProjectInformationVo project = getProjectBySid(userProject.getProjectSid());
+                list.add(project);
+            }
+            return list;
         }
         List<ProjectInformationVo> bank=baseMapper.getProjectByUser(s.getStaffSid());
         return bank;
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java
index ccc4eb27..781001ed 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java
@@ -60,4 +60,9 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         baseMapper.delete(new QueryWrapper<UserProject>().eq("sid",sid));
         return rb.success().setMsg("删除项目类型成功");
     }
+
+    //查询该sid下所有的项目sid
+    public List<UserProject> getProjectSidListByUserSid(String sid){
+        return baseMapper.selectList(new QueryWrapper<UserProject>().eq("userSid",sid));
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java
index e5925335..9d390e32 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java
@@ -118,10 +118,10 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
         reportStockDayStoreService.saveBatch(insertStoreList);
         reportStockDayProductService.saveBatch(insertProductList);
         try {
-//            Map<String, List<ReportStockDayProduct>> collect = insertProductList.stream().collect(Collectors.groupingBy(it -> it.getStoreName()));
-//            Map<String, String> map = exportExcel(collect, pi.getEntryName());
-//            BeanUtil.copyProperties(map,rsd);
-//            baseMapper.updateById(rsd);
+            Map<String, List<ReportStockDayProduct>> collect = insertProductList.stream().collect(Collectors.groupingBy(it -> it.getStoreName()));
+            Map<String, String> map = exportExcel(collect, pi.getEntryName());
+            BeanUtil.copyProperties(map,rsd);
+            baseMapper.updateById(rsd);
         }catch (Exception e){
             e.printStackTrace();
         }