From 7221f94146162703991df36995b9e3ca50402ff1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 七月 2025 21:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java | 384 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 248 insertions(+), 136 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
index f6d0d24..a7375b2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
@@ -228,7 +228,7 @@
return R.ok(progressListVOPageInfo);
}
@ApiOperation(value = "任务进度导出")
- @Log(title = "任务进度导出", businessType = BusinessType.EXPORT)
+ @Log(title = "任务进度导出", businessType = BusinessType.OTHER)
@PostMapping(value = "/taskProgressExport")
public void taskProgressExport(@RequestBody TaskProgressQuery query) {
List<SysUser> sysUsers = sysUserService.selectAllList();
@@ -440,64 +440,65 @@
&& locationIds.contains(e.getLocationId())).collect(Collectors.toList());
Integer count = taskList.size();
temp.setLocationNum(count);
- int total = taskList.size();
- int num1 = 0;
- int num2 = 0;
- int num3 = 0;
- int num4 = 0;
- int num5 = 0;
- int num6 = 0;
- int num7 = 0;
- for (TTask tTask : taskList) {
- TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId()) && e.getClearStatus() != null).findFirst().orElse(null);
- if (tTaskDetail!=null){
- switch (tTaskDetail.getClearStatus()) {
- case 1:
- num1++;
- break;
- case 2:
- num2++;
- break;
- }
- }
- // 任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成
- switch (tTask.getStatus()) {
- case 1:
- if (tTaskDetail == null) {
- num3++;
- }
- break;
- case 2:
- num6++;
- break;
- case 3:
- break;
- case 4:
- num4++;
- break;
- case 5:
- num7++;
- break;
- case 6:
- num5++;
- break;
- }
- }
- projectDeptDetailsChildVO.setTotal(total);
- projectDeptDetailsChildVO.setNum1(num1);
- projectDeptDetailsChildVO.setNum2(num2);
- projectDeptDetailsChildVO.setNum3(num3);
- projectDeptDetailsChildVO.setNum4(num4);
- projectDeptDetailsChildVO.setNum5(num5);
- projectDeptDetailsChildVO.setNum6(num6);
- projectDeptDetailsChildVO.setNum7(num7);
+
}
locationTypeListByProjectVOS1.add(temp);
}
+ List<TTask> taskList = tasks.stream().filter(e -> e.getProjectId().equals(projectDeptDetailsChildVO.getProjectId())
+ ).collect(Collectors.toList());
+ int total = taskList.size();
+ int num1 = 0;
+ int num2 = 0;
+ int num3 = 0;
+ int num4 = 0;
+ int num5 = 0;
+ int num6 = 0;
+ int num7 = 0;
+ for (TTask tTask : taskList) {
+ TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId()) && e.getClearStatus() != null).findFirst().orElse(null);
+ if (tTaskDetail!=null&&(tTask.getStatus()==5||tTask.getStatus()==6)){
+ switch (tTaskDetail.getClearStatus()) {
+ case 1:
+ num1++;
+ break;
+ case 2:
+ num2++;
+ break;
+ }
+ }
+ // 任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成
+ switch (tTask.getStatus()) {
+ case 1:
+ if (tTaskDetail == null) {
+ num3++;
+ }
+ break;
+ case 2:
+ num6++;
+ break;
+ case 3:
+ break;
+ case 4:
+ num4++;
+ break;
+ case 5:
+ num7++;
+ break;
+ case 6:
+ num5++;
+ break;
+ }
+ }
+ projectDeptDetailsChildVO.setTotal(total);
+ projectDeptDetailsChildVO.setNum1(num1);
+ projectDeptDetailsChildVO.setNum2(num2);
+ projectDeptDetailsChildVO.setNum3(num3);
+ projectDeptDetailsChildVO.setNum4(num4);
+ projectDeptDetailsChildVO.setNum5(num5);
+ projectDeptDetailsChildVO.setNum6(num6);
+ projectDeptDetailsChildVO.setNum7(num7);
projectDeptDetailsChildVO.setLocationTypeList(locationTypeListByProjectVOS1);
-
}
-
}
return R.ok(res);
}
@@ -547,73 +548,82 @@
locationTypeListByProjectVOS.add(locationTypeListByProjectVO);
}
for (ProjectDeptDetailsVO re : res) {
- List<ProjectDeptDetailsChildVO> projectChild = re.getProjectChild();
- for (ProjectDeptDetailsChildVO projectDeptDetailsChildVO : projectChild) {
+ for (ProjectDeptDetailsChildVO projectDeptDetailsChildVO : re.getProjectChild()) {
int cleanerCount = cleanerService.lambdaQuery().eq(TCleaner::getProjectId, projectDeptDetailsChildVO.getProjectId()).list().size();
projectDeptDetailsChildVO.setCleanerCount(cleanerCount);
+ List<LocationTypeListByProjectVO> locationTypeListByProjectVOS1 = new ArrayList<>();
for (LocationTypeListByProjectVO locationTypeListByProjectVO : locationTypeListByProjectVOS) {
- List<String> locationIds = locations.stream().filter(e -> e.getLocationType().equals(locationTypeListByProjectVO.getId())).map(TLocation::getId).collect(Collectors.toList());
+ LocationTypeListByProjectVO temp = new LocationTypeListByProjectVO();
+ BeanUtils.copyProperties(locationTypeListByProjectVO, temp);
+ List<String> locationIds = locations.stream().filter(e ->
+ e.getProjectId().equals(projectDeptDetailsChildVO.getProjectId())&&
+ e.getLocationType().equals(locationTypeListByProjectVO.getId()))
+ .map(TLocation::getId).collect(Collectors.toList());
if (locationIds.isEmpty()) {
locationTypeListByProjectVO.setLocationNum(0);
} else {
List<TTask> taskList = tasks.stream().filter(e -> e.getProjectId().equals(projectDeptDetailsChildVO.getProjectId())
&& locationIds.contains(e.getLocationId())).collect(Collectors.toList());
Integer count = taskList.size();
- locationTypeListByProjectVO.setLocationNum(count);
- int total = taskList.size();
- int num1 = 0;
- int num2 = 0;
- int num3 = 0;
- int num4 = 0;
- int num5 = 0;
- int num6 = 0;
- int num7 = 0;
- for (TTask tTask : taskList) {
- TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId()) && e.getClearStatus() != null).findFirst().orElse(null);
- if (tTaskDetail!=null){
- switch (tTaskDetail.getClearStatus()) {
- case 1:
- num1++;
- break;
- case 2:
- num2++;
- break;
- }
- }
- // 任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成
- switch (tTask.getStatus()) {
- case 1:
- if (tTaskDetail == null) {
- num3++;
- }
- break;
- case 2:
- num6++;
- break;
- case 3:
- break;
- case 4:
- num4++;
- break;
- case 5:
- num7++;
- break;
- case 6:
- num5++;
- break;
- }
+ temp.setLocationNum(count);
+
+ }
+ locationTypeListByProjectVOS1.add(temp);
+ }
+ List<TTask> taskList = tasks.stream().filter(e -> e.getProjectId().equals(projectDeptDetailsChildVO.getProjectId())
+ ).collect(Collectors.toList());
+ int total = taskList.size();
+ int num1 = 0;
+ int num2 = 0;
+ int num3 = 0;
+ int num4 = 0;
+ int num5 = 0;
+ int num6 = 0;
+ int num7 = 0;
+ for (TTask tTask : taskList) {
+ TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId()) && e.getClearStatus() != null).findFirst().orElse(null);
+ if (tTaskDetail!=null&&(tTask.getStatus()==5||tTask.getStatus()==6)){
+ switch (tTaskDetail.getClearStatus()) {
+ case 1:
+ num1++;
+ break;
+ case 2:
+ num2++;
+ break;
}
- projectDeptDetailsChildVO.setTotal(total);
- projectDeptDetailsChildVO.setNum1(num1);
- projectDeptDetailsChildVO.setNum2(num2);
- projectDeptDetailsChildVO.setNum3(num3);
- projectDeptDetailsChildVO.setNum4(num4);
- projectDeptDetailsChildVO.setNum5(num5);
- projectDeptDetailsChildVO.setNum6(num6);
- projectDeptDetailsChildVO.setNum7(num7);
+ }
+ // 任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成
+ switch (tTask.getStatus()) {
+ case 1:
+ if (tTaskDetail == null) {
+ num3++;
+ }
+ break;
+ case 2:
+ num6++;
+ break;
+ case 3:
+ break;
+ case 4:
+ num4++;
+ break;
+ case 5:
+ num7++;
+ break;
+ case 6:
+ num5++;
+ break;
}
}
- projectDeptDetailsChildVO.setLocationTypeList(locationTypeListByProjectVOS);
+ projectDeptDetailsChildVO.setTotal(total);
+ projectDeptDetailsChildVO.setNum1(num1);
+ projectDeptDetailsChildVO.setNum2(num2);
+ projectDeptDetailsChildVO.setNum3(num3);
+ projectDeptDetailsChildVO.setNum4(num4);
+ projectDeptDetailsChildVO.setNum5(num5);
+ projectDeptDetailsChildVO.setNum6(num6);
+ projectDeptDetailsChildVO.setNum7(num7);
+ projectDeptDetailsChildVO.setLocationTypeList(locationTypeListByProjectVOS1);
}
}
@@ -724,9 +734,20 @@
if (projectIds.isEmpty()){
return R.ok(new ArrayList<>());
}
+ query.setDeptIds(projectIds);
if (StringUtils.hasLength(query.getPhonenumber())){
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().equals(query.getPhonenumber())
+ sysUser.getPhonenumber().contains(query.getPhonenumber())
+ && projectIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
+ if (StringUtils.hasLength(query.getNickName())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getNickName().contains(query.getNickName())
&& projectIds.contains(sysUser.getDeptId())
).map(SysUser::getUserId).collect(Collectors.toList());
if (patrolInspectorIds.isEmpty()){
@@ -737,9 +758,35 @@
}
if (StringUtils.hasLength(query.getPhonenumber())){
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().equals(query.getPhonenumber())
+ sysUser.getPhonenumber().contains(query.getPhonenumber())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (!query.getPatrolInspectorIds().isEmpty()){
+ if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+ }
+ if (StringUtils.hasLength(query.getNickName())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getNickName().contains(query.getNickName())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+ }
+ if (query.getDeptIds()!=null&&!query.getDeptIds().isEmpty()){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ query.getDeptIds().contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
// 取交集
patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
}
@@ -751,10 +798,10 @@
List<PatrolInspectorVO> res = new ArrayList<>();
LambdaQueryWrapper<TTask> tTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.hasLength(query.getStartTime())){
- tTaskLambdaQueryWrapper.ge(TTask::getCreateTime, query.getStartTime()+" :00:00:00");
- tTaskLambdaQueryWrapper.le(TTask::getCreateTime, query.getEndTime()+" :23:59:59");
+ tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, query.getStartTime()+" :00:00:00");
+ tTaskLambdaQueryWrapper.le(TTask::getImplementTime, query.getEndTime()+" :23:59:59");
}
- if(query.getPatrolInspectorIds()!=null){
+ if(query.getPatrolInspectorIds()!=null&& !query.getPatrolInspectorIds().isEmpty()){
tTaskLambdaQueryWrapper.in(TTask::getPatrolInspector, query.getPatrolInspectorIds());
sysUsers = sysUsers.stream().filter(sysUser -> query.getPatrolInspectorIds().contains(sysUser.getUserId())).collect(Collectors.toList());
}
@@ -796,8 +843,18 @@
}
List<TTaskDetail> list = taskDetailService.lambdaQuery()
.eq(TTaskDetail::getAuditStatus, 1)
+ .eq(TTaskDetail::getHandleType,1)
.isNotNull(TTaskDetail::getClearStatus).orderByDesc(BaseModel::getCreateTime)
- .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIdsFinish).groupBy(TTaskDetail::getTaskId).list();
+ .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIdsFinish).list();
+ list = new ArrayList<>(list.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
// 查询clearStatus为1的数量
List<TTaskDetail> clearStatus1 = list.stream().filter(e -> e.getClearStatus().equals(1)).collect(Collectors.toList());
List<TTaskDetail> clearStatus2 = list.stream().filter(e -> e.getClearStatus().equals(2)).collect(Collectors.toList());
@@ -806,8 +863,8 @@
patrolInspectorVO.setNum1(clearStatus1.size());
patrolInspectorVO.setNum2(clearStatus2.size());
patrolInspectorVO.setNum3(!clearStatus1.isEmpty() ?
- (new BigDecimal(clearStatus1.size()).add(new BigDecimal(clearStatus2.size())))
- .divide(new BigDecimal(clearStatus1.size()), 2, RoundingMode.HALF_DOWN)
+ (new BigDecimal(clearStatus1.size()))
+ .divide(new BigDecimal(clearStatus1.size()+clearStatus2.size()), 2, RoundingMode.HALF_DOWN)
.multiply(new BigDecimal(100)):BigDecimal.ZERO);
// 未执行
List<TTask> status1 = taskList.stream().filter(e -> e.getStatus() == 1).collect(Collectors.toList());
@@ -834,13 +891,13 @@
}
@ApiOperation(value = "巡检人员报表导出")
@PostMapping(value = "/patrolInspectorListExport")
- @Log(title = "巡检人员报表导出", businessType = BusinessType.EXPORT)
+ @Log(title = "巡检人员报表导出", businessType = BusinessType.OTHER)
public void patrolInspectorListExport(@RequestBody PatrolInspectorQuery query) {
List<SysUser> sysUsers = sysUserService.selectAllList();
LambdaQueryWrapper<TLeave> tLeaveLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.hasLength(query.getStartTime())){
- tLeaveLambdaQueryWrapper.ge(TLeave::getCreateTime, query.getStartTime());
- tLeaveLambdaQueryWrapper.le(TLeave::getCreateTime, query.getEndTime());
+ tLeaveLambdaQueryWrapper.ge(TLeave::getCreateTime, query.getStartTime()+" :00:00:00");
+ tLeaveLambdaQueryWrapper.le(TLeave::getCreateTime, query.getEndTime()+" :23:59:59");
}
tLeaveLambdaQueryWrapper.eq(TLeave::getAuditStatus,2);
List<TLeave> leaves = leaveService.list(tLeaveLambdaQueryWrapper);
@@ -851,11 +908,22 @@
.stream().map(TDept::getId).collect(Collectors.toList());
projectIds.addAll(deptIds);
if (projectIds.isEmpty()){
- projectIds.add("0");
+ projectIds.add("-1");
}
+ query.setDeptIds(projectIds);
if (StringUtils.hasLength(query.getPhonenumber())){
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().equals(query.getPhonenumber())
+ && projectIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ patrolInspectorIds.add(0L);
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
+ if (StringUtils.hasLength(query.getNickName())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getNickName().contains(query.getNickName())
&& projectIds.contains(sysUser.getDeptId())
).map(SysUser::getUserId).collect(Collectors.toList());
if (patrolInspectorIds.isEmpty()){
@@ -868,7 +936,33 @@
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().equals(query.getPhonenumber())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (!query.getPatrolInspectorIds().isEmpty()){
+ if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ patrolInspectorIds.add(0L);
+ }
+ }
+ if (StringUtils.hasLength(query.getNickName())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getNickName().contains(query.getNickName())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ patrolInspectorIds.add(0L);
+ }
+ }
+ if (query.getDeptIds()!=null&&!query.getDeptIds().isEmpty()){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ query.getDeptIds().contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
// 取交集
patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
}
@@ -880,16 +974,15 @@
List<PatrolInspectorVO> res = new ArrayList<>();
LambdaQueryWrapper<TTask> tTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.hasLength(query.getStartTime())){
- tTaskLambdaQueryWrapper.ge(TTask::getCreateTime, query.getStartTime());
- tTaskLambdaQueryWrapper.le(TTask::getCreateTime, query.getEndTime());
+ tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, query.getStartTime()+" :00:00:00");
+ tTaskLambdaQueryWrapper.le(TTask::getImplementTime, query.getEndTime()+" :23:59:59");
}
- if(query.getPatrolInspectorIds()!=null){
+ if(query.getPatrolInspectorIds()!=null&& !query.getPatrolInspectorIds().isEmpty()){
tTaskLambdaQueryWrapper.in(TTask::getPatrolInspector, query.getPatrolInspectorIds());
sysUsers = sysUsers.stream().filter(sysUser -> query.getPatrolInspectorIds().contains(sysUser.getUserId())).collect(Collectors.toList());
}
List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);
sysUsers = sysUsers.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());
-
for (SysUser sysUser : sysUsers) {
PatrolInspectorVO patrolInspectorVO = new PatrolInspectorVO();
@@ -901,14 +994,14 @@
if (tProjectDept!=null&&!tProjectDept.getParentId().equals("0")){
TProjectDept tProjectDept1 = projectDeptService.getById(tProjectDept.getParentId());
if (tProjectDept1!=null)
- patrolInspectorVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ patrolInspectorVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
}else{
patrolInspectorVO.setDeptName(tProjectDept.getProjectName());
}
}else{
TDept tDept = deptService.getById(sysUser.getDeptId());
if (tDept!=null)
- patrolInspectorVO.setDeptName(tDept.getDeptName());
+ patrolInspectorVO.setDeptName(tDept.getDeptName());
}
// 查询巡检员任务ids
List<String> taskIds = tasks.stream().filter(e->e.getPatrolInspector().equals(sysUser.getUserId()+"")).map(TTask::getId).collect(Collectors.toList());
@@ -926,8 +1019,18 @@
}
List<TTaskDetail> list = taskDetailService.lambdaQuery()
.eq(TTaskDetail::getAuditStatus, 1)
+ .eq(TTaskDetail::getHandleType,1)
.isNotNull(TTaskDetail::getClearStatus).orderByDesc(BaseModel::getCreateTime)
- .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIdsFinish).groupBy(TTaskDetail::getTaskId).list();
+ .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIdsFinish).list();
+ list = new ArrayList<>(list.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
// 查询clearStatus为1的数量
List<TTaskDetail> clearStatus1 = list.stream().filter(e -> e.getClearStatus().equals(1)).collect(Collectors.toList());
List<TTaskDetail> clearStatus2 = list.stream().filter(e -> e.getClearStatus().equals(2)).collect(Collectors.toList());
@@ -936,8 +1039,8 @@
patrolInspectorVO.setNum1(clearStatus1.size());
patrolInspectorVO.setNum2(clearStatus2.size());
patrolInspectorVO.setNum3(!clearStatus1.isEmpty() ?
- (new BigDecimal(clearStatus1.size()).add(new BigDecimal(clearStatus2.size())))
- .divide(new BigDecimal(clearStatus1.size()), 2, RoundingMode.HALF_DOWN)
+ (new BigDecimal(clearStatus1.size()))
+ .divide(new BigDecimal(clearStatus1.size()+clearStatus2.size()), 2, RoundingMode.HALF_DOWN)
.multiply(new BigDecimal(100)):BigDecimal.ZERO);
// 未执行
List<TTask> status1 = taskList.stream().filter(e -> e.getStatus() == 1).collect(Collectors.toList());
@@ -1027,6 +1130,11 @@
tTaskLambdaQueryWrapper.le(TInspector::getCreateTime, query.getEndTime());
}
if(query.getPatrolInspectorIds()!=null){
+ if (query.getPatrolInspectorIds().isEmpty()){
+ List<Long> patrolInspectorIds = query.getPatrolInspectorIds();
+ patrolInspectorIds.add(0L);
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
tTaskLambdaQueryWrapper.in(TInspector::getCommitPerson, query.getPatrolInspectorIds());
sysUsers = sysUsers.stream().filter(sysUser -> query.getPatrolInspectorIds().contains(sysUser.getUserId())).collect(Collectors.toList());
}
@@ -1071,7 +1179,7 @@
}
@ApiOperation(value = "随机督察报表导出")
@PostMapping(value = "/inspectorListExport")
- @Log(title = "随机督察报表导出", businessType = BusinessType.EXPORT)
+ @Log(title = "随机督察报表导出", businessType = BusinessType.OTHER)
public void inspectorListExport(@RequestBody InspectorQuery query) {
List<SysUser> sysUsers = sysUserService.selectAllList();
if (StringUtils.hasLength(query.getDeptName())){
@@ -1115,13 +1223,17 @@
tTaskLambdaQueryWrapper.le(TInspector::getCreateTime, query.getEndTime());
}
if(query.getPatrolInspectorIds()!=null){
+ if (query.getPatrolInspectorIds().isEmpty()){
+ List<Long> patrolInspectorIds = query.getPatrolInspectorIds();
+ patrolInspectorIds.add(0L);
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
tTaskLambdaQueryWrapper.in(TInspector::getCommitPerson, query.getPatrolInspectorIds());
sysUsers = sysUsers.stream().filter(sysUser -> query.getPatrolInspectorIds().contains(sysUser.getUserId())).collect(Collectors.toList());
}
List<InspectorVO> res = new ArrayList<>();
List<TInspector> inspectors = inspectorService.list(tTaskLambdaQueryWrapper);
sysUsers = sysUsers.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());
-
for (SysUser sysUser : sysUsers) {
InspectorVO inspectorVO = new InspectorVO();
inspectorVO.setNickName(sysUser.getNickName());
@@ -1149,11 +1261,11 @@
inspectorVO.setNum1(status1.size());
inspectorVO.setNum2(status2.size());
- inspectorVO.setNum3(!status1.isEmpty()?new BigDecimal(status1.size()).divide(new BigDecimal(status2.size()+status1.size()),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):BigDecimal.ZERO);
+ inspectorVO.setNum3(!status1.isEmpty()||!status2.isEmpty()?new BigDecimal(status1.size()).divide(new BigDecimal(status2.size()+status1.size()),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):BigDecimal.ZERO);
inspectorVO.setNum4(status4.size());
inspectorVO.setNum5(status5.size());
inspectorVO.setNum6(status6.size());
- inspectorVO.setNum7(!status6.isEmpty()?new BigDecimal(status6.size()).divide(new BigDecimal(status5.size()+status6.size()),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):new BigDecimal(0));
+ inspectorVO.setNum7(!status6.isEmpty()||!status5.isEmpty()?new BigDecimal(status6.size()).divide(new BigDecimal(status5.size()+status6.size()),2,RoundingMode.HALF_DOWN).multiply(new BigDecimal(100)):new BigDecimal(0));
res.add(inspectorVO);
}
//1.获取excel模板
--
Gitblit v1.7.1