diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java index d894841a..1abfbf22 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java @@ -45,4 +45,25 @@ public class BgWorkTrainController extends BaseController { return getDataTable(workTrainService.selectBgscreenWorkTrainListv2(workTrain)); } + /** + * 大屏教训培训,应急演练图标数据查询 + * @return + */ + @GetMapping("/getGroupByDataType") + public AjaxResult getGroupByDataType(String deptId, String projectId){ + WorkTrain workTrain = new WorkTrain(); + if(deptId!=null && !"0".equals(deptId)){ + workTrain.setNowDept(deptId); + }else{ + if (SecurityUtils.isUserB()) { + workTrain.setPrjIds(getProjectIds()); + } + } + if(projectId!=null && !"0".equals(projectId)){ + workTrain.setProjectId(Convert.toLong(projectId)); + } + return AjaxResult.success(workTrainService.getGroupByDataType(workTrain)); + } + + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java index 0109a139..87beb2b5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java @@ -118,4 +118,6 @@ public interface WorkTrainMapper * @return 结果 */ public List> findGroupCountByProjectId(Long projectId); + + public List getGroupByDataType(WorkTrain workTrain); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java index e1f15c28..cb0005b1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java @@ -92,4 +92,6 @@ public interface IWorkTrainService * @return 结果 */ public List> findGroupCountByProjectId(Long projectId); + + public List getGroupByDataType(WorkTrain workTrain); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java index e5121153..82b67678 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java @@ -220,4 +220,9 @@ public class WorkTrainServiceImpl implements IWorkTrainService public List> findGroupCountByProjectId(Long projectId) { return workTrainMapper.findGroupCountByProjectId(projectId); } + + @Override + public List getGroupByDataType(WorkTrain workTrain) { + return workTrainMapper.getGroupByDataType(workTrain); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index a5c4db83..ed496e14 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -199,6 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + update work_train @@ -252,4 +253,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.trainId}, #{item.deptId}, #{item.isMain}) + \ No newline at end of file