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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2023-11-11 10:12:13 +08:00
parent 75b93ff7f0 53bb1fbc34
commit 866062f79f
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java
View File

@ -65,5 +65,5 @@ public interface IFlowBusinessKeyService {
public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where); public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
public List<FlowTaskEntity> groupByProject(); public List<FlowTaskEntity> groupByProject(long deptId);
} }

4
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java
View File

@ -130,7 +130,7 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService {
} }
@Override @Override
public List<FlowTaskEntity> groupByProject() { public List<FlowTaskEntity> groupByProject(long deptId) {
return flowBusinessKeyMapper.groupByProject(); return flowBusinessKeyMapper.groupByProject(deptId);
} }
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java
View File

@ -57,5 +57,5 @@ public interface FlowBusinessKeyMapper {
public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where); public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
public List<FlowTaskEntity> groupByProject(); public List<FlowTaskEntity> groupByProject(long deptId);
} }

3
ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
View File

@ -334,9 +334,10 @@
</where> </where>
</select> </select>
<select id="groupByProject" resultType="com.ruoyi.system.domain.FlowTaskEntity"> <select id="groupByProject" resultType="com.ruoyi.system.domain.FlowTaskEntity" parameterType="long">
SELECT a.businessKey,a.cnt duration ,b.projectName businessKeyName FROM ( SELECT a.businessKey,a.cnt duration ,b.projectName businessKeyName FROM (
SELECT businessKey,COUNT(1) cnt FROM vw_flow_all WHERE taskName!='提交申请' SELECT businessKey,COUNT(1) cnt FROM vw_flow_all WHERE taskName!='提交申请'
<if test="deptId !=null and deptId>0">and businessDeptId=#{deptId}</if>
GROUP BY businessKey ) a,sur_project b WHERE a.businessKey=b.id GROUP BY businessKey ) a,sur_project b WHERE a.businessKey=b.id
ORDER BY a.cnt DESC ORDER BY a.cnt DESC

4
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java
View File

@ -133,8 +133,8 @@ public class FloweController extends BaseController {
} }
@GetMapping("/groupByProject") @GetMapping("/groupByProject")
public AjaxResult groupByProject(){ public AjaxResult groupByProject(long deptId){
List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject(); List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject(deptId);
return AjaxResult.success(list); return AjaxResult.success(list);
} }