BJ_ZTEITS-Developers / zteits-oa

Commit a128cae0f045164a4db8bd697c19d2391c4af9e4

Authored by 王富生
1 parent 2e6a8b6f

提交

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
  View file @a128cae
... ... @@ -68,7 +68,6 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
68 68 @Override
69 69 public AsraDailyOpNumForCurrentDayDO queryAsraDailyOpNumForCurrentDay(AsraDailyForTotalNumAndDetailReq request) {
70 70 AsraDailyOpNumForCurrentDayDO asraDailyOpNumForCurrentDayDO = new AsraDailyOpNumForCurrentDayDO();
71   - List<Long> opList = new ArrayList<>();
72 71  
73 72 //1.总人数获取
74 73 int employeeTotal = 0;
... ... @@ -78,11 +77,12 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
78 77  
79 78 //2.查询今日日报填写人数
80 79 AsraDailyExample exampleTwo = new AsraDailyExample();
81   - exampleTwo.createCriteria().andAsarOpIdIn(opList)
  80 + exampleTwo.createCriteria().andAsarOpIdIn(request.getOpIds())
82 81 .andDailyDateEqualTo(DateUtil.parse(DateUtil.format(new Date(),DateUtil.NORM_DATE_PATTERN),DateUtil.NORM_DATE_PATTERN))
83 82 .andDataStateEqualTo(1);
84 83 int countByExample = (int)asraDailyMapper.countByExample(exampleTwo);
85 84 asraDailyOpNumForCurrentDayDO.setCurrentDayCommitEmployeeNum(countByExample);
  85 + asraDailyOpNumForCurrentDayDO.setEmployeeTotal(employeeTotal);
86 86 asraDailyOpNumForCurrentDayDO.setCurrentDayNotCommitEmployeeNum(employeeTotal - countByExample);
87 87 return asraDailyOpNumForCurrentDayDO;
88 88 }
... ...