sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

dev_xds
姜玉琦 2023-08-24 10:00:17 +08:00
parent c598059e02 2f13947a84
commit 4648c5950a
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
View File

@ -73,13 +73,13 @@ public class ProjectController {
}
@GetMapping("groupByProjectCategory")
public AjaxResult groupByProjectCategory(){
String key="bgscreen_prj_groupByProjectCategory";
public AjaxResult groupByProjectCategory(long deptId){
String key="bgscreen_prj_groupByProjectCategory_"+deptId;
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
List<SurProject> list= isurProjectService.groupByProjectCategory();
List<SurProject> list= isurProjectService.groupByProjectCategory(deptId);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
View File

@ -76,6 +76,6 @@ public interface SurProjectMapper
public List<SurProject> selectProgressProjects(long deptId);
public List<SurProject> groupByProjectCategory();
public List<SurProject> groupByProjectCategory(long deptId);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
View File

@ -61,7 +61,7 @@ public interface ISurProjectService
public List<SurProject> selectProgressProjects(long deptId);
public List<SurProject> groupByProjectCategory();
public List<SurProject> groupByProjectCategory(long deptId);
public List<SurProject> groupByCategory(SurProject surProject);

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
View File

@ -102,8 +102,8 @@ public class SurProjectServiceImpl implements ISurProjectService
}
@Override
public List<SurProject> groupByProjectCategory() {
return surProjectMapper.groupByProjectCategory();
public List<SurProject> groupByProjectCategory(long deptId) {
return surProjectMapper.groupByProjectCategory(deptId);
}
@Override

6
yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
View File

@ -312,11 +312,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by projectSort,projectName
</select>
<select id="groupByProjectCategory" parameterType="SurProject" resultMap="SurProjectResult">
<select id="groupByProjectCategory" parameterType="Long" resultMap="SurProjectResult">
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 ) p
(SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule FROM sur_project WHERE isDel=0
<if test="deptId!=null and deptId>0">and deptid=#{deptId}</if>
) p
ON p.projectType=d.dict_value
GROUP BY d.dict_value,d.dict_label,p.projectSchedule
</select>

2
yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
View File

@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
group by wt.id
order by wt.create_time desc
limit 2
limit 20
</select>
<select id="selectWorkTrainById" parameterType="Long" resultMap="WorkTrainWorkTrainDeptResult">