DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 查询全部用户

Browse Source
This commit is contained in:
bupengxiang
2023-05-17 15:37:35 +08:00
parent e6379e6ae7
commit be5c2ff02c
6 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+12 -10
View File
@@ -163,16 +163,18 @@ public class TaskController {
}
}else {
Object endTime = historicTaskInstance.get("endTime");
map.put("endTime",historicTaskInstance.get("endTime"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date endTimed = sdf.parse((String)endTime);
LocalDateTime en =
LocalDateTime.ofInstant(endTimed.toInstant(), ZoneId.systemDefault());
LocalDateTime startDateTime = LocalDateTime.ofInstant(busProcessEntrust.getCreateTime().toInstant()
, ZoneId.systemDefault());
LocalDateTime endDateTime = LocalDateTime.ofInstant(endTimed.toInstant(), ZoneId.systemDefault());
long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
map.put("approvalTime",days + "天");
if (endTime != null){
map.put("endTime",historicTaskInstance.get("endTime"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date endTimed = sdf.parse((String)endTime);
LocalDateTime en =
LocalDateTime.ofInstant(endTimed.toInstant(), ZoneId.systemDefault());
LocalDateTime startDateTime = LocalDateTime.ofInstant(busProcessEntrust.getCreateTime().toInstant()
, ZoneId.systemDefault());
LocalDateTime endDateTime = LocalDateTime.ofInstant(endTimed.toInstant(), ZoneId.systemDefault());
long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
map.put("approvalTime",days + "天");
}
}
QueryWrapper<BusProcessApprove> datasQueryWrapper = new QueryWrapper<>();
datasQueryWrapper.lambda().eq(BusProcessApprove::getTaskId,historicTaskInstance.get("id"));