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 eee2440..49da979 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
@@ -78,11 +78,13 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
}
//2.查询今日日报填写人数
- AsraDailyExample exampleTwo = new AsraDailyExample();
+ /**AsraDailyExample exampleTwo = new AsraDailyExample();
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);
+ .andDataStateEqualTo(1);*/
+ request.setBeginTime(DateUtil.format(new Date(),DateUtil.NORM_DATE_PATTERN));
+ int countByExample = asraDailySmapper.queryAsraDailyOpNumForCurrentDay(request);
+
asraDailyOpNumForCurrentDayDO.setCurrentDayCommitEmployeeNum(countByExample);
asraDailyOpNumForCurrentDayDO.setEmployeeTotal(employeeTotal);
asraDailyOpNumForCurrentDayDO.setCurrentDayNotCommitEmployeeNum(employeeTotal - countByExample);
diff --git a/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java b/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
index 65f1cbc..6c72802 100644
--- a/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
+++ b/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
@@ -13,4 +13,11 @@ public interface AsraDailySmapper {
* 2018年8月1日 wangfs.
*/
List queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
+
+ /**
+ * 查询当天填报人数.
+ * @param request
+ * @return
+ */
+ int queryAsraDailyOpNumForCurrentDay(AsraDailyForTotalNumAndDetailReq request);
}
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c8b3888..19d3d01 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
spring.application.name=zteits-oa
-server.port=8100
+server.port=8101
#spring.profiles.active=prod
# logging
diff --git a/src/main/resources/mybatis/smapper/AsraDailySmapper.xml b/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
index 03c3728..a958b33 100644
--- a/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
+++ b/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
@@ -69,5 +69,23 @@
a.id
order by a.project_id asc,asar_op_id asc,a.daily_date desc
-
+
+
\ No newline at end of file