From 624707bd1e94af6ada3483622f0bd0361ec36a18 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 14 Oct 2023 19:51:45 +0800 Subject: [PATCH] update code --- .../web/controller/ProjectController.java | 22 +++++++++++++++++-- .../ProjectQuarterlyAssessController.java | 6 +++++ .../controller/ProjectScheduleController.java | 5 +++++ .../jh/project/mapper/SurProjectMapper.java | 4 ++-- .../project/service/ISurProjectService.java | 4 ++-- .../service/impl/SurProjectServiceImpl.java | 8 +++---- .../SmzProjectQuarterlyAssessMapper.xml | 6 +++++ .../mapper/project/SurProjectMapper.xml | 22 +++++++++++++++++-- 8 files changed, 65 insertions(+), 12 deletions(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java index eca6f06d..0346f622 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java @@ -80,7 +80,16 @@ public class ProjectController extends BaseController { return AjaxResult.success(obj); } - List list= isurProjectService.selectProgressProjects(deptId); + SurProject where=new SurProject(); + if(deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + }else{ + where.setDeptId(deptId); + } + + List list= isurProjectService.selectProgressProjects(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } @@ -92,7 +101,16 @@ public class ProjectController extends BaseController { if(obj!=null){ return AjaxResult.success(obj); } - List list= isurProjectService.groupByProjectCategory(deptId); + SurProject where=new SurProject(); + if(deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + }else{ + where.setDeptId(deptId); + } + + List list= isurProjectService.groupByProjectCategory(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/ProjectQuarterlyAssessController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java index 0bf4930d..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 @@ -60,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 81df5125..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 @@ -45,6 +45,11 @@ public class ProjectScheduleController extends BaseController { SurProjectScheduleWhere where =new SurProjectScheduleWhere(); where.setPrjType(type); where.setDeptId(deptId); + if(deptId==null || deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } List 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/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java index 4f45019d..1130e914 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java @@ -74,9 +74,9 @@ public interface SurProjectMapper */ public List groupByLevel(SurProject surProject); - public List selectProgressProjects(long deptId); + public List selectProgressProjects(SurProject surProject); - public List groupByProjectCategory(long deptId); + public List groupByProjectCategory(SurProject surProject); /** * 监理单位、总包单位、分包单位用户不展示项目概况菜单,二级菜单只展示自已参与的项目 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java index ee5af959..34119f5f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java @@ -59,9 +59,9 @@ public interface ISurProjectService */ public int deleteSurProjectById(Long id); - public List selectProgressProjects(long deptId); + public List selectProgressProjects(SurProject surProject); - public List groupByProjectCategory(long deptId); + public List groupByProjectCategory(SurProject surProject); public List groupByCategory(SurProject surProject); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java index 783cddee..304156b8 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java @@ -97,13 +97,13 @@ public class SurProjectServiceImpl implements ISurProjectService } @Override - public List selectProgressProjects(long deptId) { - return surProjectMapper.selectProgressProjects(deptId); + public List selectProgressProjects(SurProject surProject) { + return surProjectMapper.selectProgressProjects(surProject); } @Override - public List groupByProjectCategory(long deptId) { - return surProjectMapper.groupByProjectCategory(deptId); + public List groupByProjectCategory(SurProject surProject) { + return surProjectMapper.groupByProjectCategory(surProject); } @Override diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index 326e3f69..1bde75d1 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -107,6 +107,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and finish_date = #{finishDate} and status = #{status} and is_del = #{isDel} + + and project_id in + + #{item} + + diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml index b76af84b..9cdf4bbb 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml @@ -327,19 +327,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where progressVisible = 0 and deptid=#{deptId} + + and id in + + #{item} + + order by projectSort,projectName - SELECT d.dict_value dept_name,d.dict_label projectName,p.projectSchedule ,COUNT(1) deptId FROM (SELECT * FROM sys_dict_data WHERE dict_type='project_category') d LEFT JOIN (SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule FROM sur_project WHERE isDel=0 and deptid=#{deptId} + + and id in + + #{item} + + ) p ON p.projectType=d.dict_value GROUP BY d.dict_value,d.dict_label,p.projectSchedule @@ -355,6 +367,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{deptId} and spui.del_flag=0) + + and sp.id in + + #{item} + + ) as sp left join sys_dept d on d.dept_id = sp.deptId left join china_area a on sp.projectRegional = a.id