diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/CensServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/CensServiceImpl.java index 93df9d2..a8a4018 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/CensServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/CensServiceImpl.java @@ -66,7 +66,7 @@ public class CensServiceImpl implements CensService { // 操作票查询 LambdaQueryWrapper operateWrapper = Wrappers.lambdaQuery() .between(StandardTicketInfoEntity::getCreateTime,param.getStartTime(),param.getEndTime()) - .in(StandardTicketInfoEntity::getCreateDept,depts); + .in(StandardTicketInfoEntity::getCreateDept,depts.stream().map(Dept::getId).collect(Collectors.toList())); if(!StringUtil.isEmpty(param.getFlowTaskName())){ operateWrapper.eq("FLOW_TASK_NAME",param.getFlowTaskName()); } @@ -74,7 +74,7 @@ public class CensServiceImpl implements CensService { // 工作票查询 LambdaQueryWrapper workWrapper = Wrappers.lambdaQuery() .between(StandardTicketInfoEntity::getCreateTime,param.getStartTime(),param.getEndTime()) - .in(StandardTicketInfoEntity::getCreateDept,depts); + .in(StandardTicketInfoEntity::getCreateDept,depts.stream().map(Dept::getId).collect(Collectors.toList())); if(!StringUtil.isEmpty(param.getFlowTaskName())){ workWrapper.eq("FLOW_TASK_NAME",param.getFlowTaskName()); } @@ -92,7 +92,7 @@ public class CensServiceImpl implements CensService { if(CollectionUtil.isEmpty(works)){ cens.setWorkCount(0L); }else{ - cens.setOperateCount(works.stream().filter(work->work.getCreateDept().equals(dept.getId())).count()); + cens.setWorkCount(works.stream().filter(work->work.getCreateDept().equals(dept.getId())).count()); } cens.setWorkTaskCount((long)new Random().nextInt(10)); return cens; @@ -141,7 +141,7 @@ public class CensServiceImpl implements CensService { // 操作票查询 LambdaQueryWrapper operateWrapper = Wrappers.lambdaQuery() .between(StandardTicketInfoEntity::getCreateTime,param.getStartTime(),param.getEndTime()) - .in(StandardTicketInfoEntity::getCreateDept,depts); + .in(StandardTicketInfoEntity::getCreateDept,depts.stream().map(Dept::getId).collect(Collectors.toList())); if(!StringUtil.isEmpty(param.getFlowTaskName())){ operateWrapper.eq("FLOW_TASK_NAME",param.getFlowTaskName()); } @@ -149,7 +149,7 @@ public class CensServiceImpl implements CensService { // 工作票查询 LambdaQueryWrapper workWrapper = Wrappers.lambdaQuery() .between(StandardTicketInfoEntity::getCreateTime,param.getStartTime(),param.getEndTime()) - .in(StandardTicketInfoEntity::getCreateDept,depts); + .in(StandardTicketInfoEntity::getCreateDept,depts.stream().map(Dept::getId).collect(Collectors.toList())); if(!StringUtil.isEmpty(param.getFlowTaskName())){ workWrapper.eq("FLOW_TASK_NAME",param.getFlowTaskName()); } @@ -158,6 +158,7 @@ public class CensServiceImpl implements CensService { CensYearVo censYear = new CensYearVo(); censYear.setDeptId(dept.getId()); censYear.setDeptName(dept.getDeptName()); + List censs = new ArrayList<>(); for(int mon = 1 ; mon <= 12 ;mon++){ String strMon = param.getYear() + "-" + (mon > 9 ? mon : "0" + mon); CensVo cens = new CensVo(); @@ -170,10 +171,12 @@ public class CensServiceImpl implements CensService { if(CollectionUtil.isEmpty(works)){ cens.setWorkCount(0L); }else{ - cens.setOperateCount(works.stream().filter(work->work.getCreateDept().equals(dept.getId()) && DateUtil.format(work.getCreateTime(),"yyyy-MM").equals(strMon)).count()); + cens.setWorkCount(works.stream().filter(work->work.getCreateDept().equals(dept.getId()) && DateUtil.format(work.getCreateTime(),"yyyy-MM").equals(strMon)).count()); } cens.setWorkTaskCount((long)new Random().nextInt(10)); + censs.add(cens); } + censYear.setCenss(censs); return censYear; }).collect(Collectors.toList()); }