From a128cae0f045164a4db8bd697c19d2391c4af9e4 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Thu, 2 Aug 2018 15:42:40 +0800 Subject: [PATCH] 提交 --- src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java b/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java index 5635cec..1bc25ad 100644 --- a/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java +++ b/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java @@ -68,7 +68,6 @@ public class AsraDailyDaoImpl implements AsraDailyDao{ @Override public AsraDailyOpNumForCurrentDayDO queryAsraDailyOpNumForCurrentDay(AsraDailyForTotalNumAndDetailReq request) { AsraDailyOpNumForCurrentDayDO asraDailyOpNumForCurrentDayDO = new AsraDailyOpNumForCurrentDayDO(); - List opList = new ArrayList<>(); //1.总人数获取 int employeeTotal = 0; @@ -78,11 +77,12 @@ public class AsraDailyDaoImpl implements AsraDailyDao{ //2.查询今日日报填写人数 AsraDailyExample exampleTwo = new AsraDailyExample(); - exampleTwo.createCriteria().andAsarOpIdIn(opList) + exampleTwo.createCriteria().andAsarOpIdIn(request.getOpIds()) .andDailyDateEqualTo(DateUtil.parse(DateUtil.format(new Date(),DateUtil.NORM_DATE_PATTERN),DateUtil.NORM_DATE_PATTERN)) .andDataStateEqualTo(1); int countByExample = (int)asraDailyMapper.countByExample(exampleTwo); asraDailyOpNumForCurrentDayDO.setCurrentDayCommitEmployeeNum(countByExample); + asraDailyOpNumForCurrentDayDO.setEmployeeTotal(employeeTotal); asraDailyOpNumForCurrentDayDO.setCurrentDayNotCommitEmployeeNum(employeeTotal - countByExample); return asraDailyOpNumForCurrentDayDO; } -- libgit2 0.21.4