From 334cfae105e4f605b1cc530044de27b7ce206a74 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 11 Oct 2023 23:48:11 +0800
Subject: [PATCH] update code

---
 .../ProjectQuarterlyAssessController.java           | 11 +++++++++++
 .../web/controller/ProjectScheduleController.java   |  9 ++++++++-
 .../project/SmzProjectQuarterlyAssessMapper.xml     | 13 +++++++++++++
 .../mapper/project/SurProjectScheduleMapper.xml     |  6 ++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java
index cb50b172..8d32e2bd 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java
@@ -34,6 +34,11 @@ public class ProjectQuarterlyAssessController extends BaseController {
         }
         SmzProjectQuarterlyAssess smzProjectQuarterlyAssess=new SmzProjectQuarterlyAssess();
         smzProjectQuarterlyAssess.setDeptId(deptId);
+        if(deptId==null || deptId<=0){
+            if (SecurityUtils.isUserB()) {
+                smzProjectQuarterlyAssess.setPrjIds(getProjectIds());
+            }
+        }
         Calendar calendar=Calendar.getInstance();
         smzProjectQuarterlyAssess.setYear((long)calendar.get(Calendar.YEAR));
         int month=calendar.get(Calendar.MONTH);
@@ -55,6 +60,12 @@ public class ProjectQuarterlyAssessController extends BaseController {
         if(obj!=null){
             return AjaxResult.success(obj);
         }
+        Long deptId= where.getDeptId();
+        if(deptId==null || deptId<=0){
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
         List list=smzProjectQuarterlyAssessService.queryByProjectType(where);
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java
index 948649fc..430efd63 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java
@@ -1,8 +1,10 @@
 package com.yanzhu.jh.bigscreen.web.controller;
 
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.yanzhu.jh.project.domain.SurProjectSchedule;
 import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere;
 import com.yanzhu.jh.project.service.ISurProjectScheduleService;
@@ -16,7 +18,7 @@ import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("/bgscreen/schedule")
-public class ProjectScheduleController {
+public class ProjectScheduleController extends BaseController {
 
     @Autowired
     private ISurProjectScheduleService isurProjectScheduleService;
@@ -43,6 +45,11 @@ public class ProjectScheduleController {
         SurProjectScheduleWhere where =new SurProjectScheduleWhere();
         where.setPrjType(type);
         where.setDeptId(deptId);
+        if(deptId==null || deptId<=0){
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
         List<SurProjectSchedule> list=isurProjectScheduleService.selectByProjectType(where);
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
index 26713354..23aa8534 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
@@ -65,6 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     (SELECT id FROM sur_project
         <where>
             <if test="deptId>0"> deptid=#{deptId} </if>
+            <if test="prjIds !=null and prjIds.size()>0">
+                and id in
+                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         ) AND a.project_id=p.id and  plan_target is not null AND p.deptId=d.dept_id
 
@@ -79,6 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sur_project p LEFT JOIN smz_project_quarterly_assess a ON a.project_id=p.id
         WHERE p.projecttype=#{id} AND a.year=#{year} AND a.quarterly=#{quarterly} AND p.isdel=0
         <if test="deptId>0">and p.deptId=#{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and p.id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         order by p.projectSort
     </select>
     <select id="selectSmzProjectQuarterlyAssessList" parameterType="SmzProjectQuarterlyAssess" resultMap="SmzProjectQuarterlyAssessResult">
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
index f0a2cabd..0d2b1675 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
@@ -182,6 +182,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 SELECT id FROM sur_project WHERE
                 isdel=0 AND projecttype=#{prjType}
                 <if test="deptId>0">and deptId=#{deptId}</if>
+                <if test="prjIds !=null and prjIds.size()>0">
+                    and id in
+                    <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
                 ) AND IF(is_del IS NULL ,0,is_del)=0
             GROUP BY project_id
         )