From 53dc000514f255ea07afb8565c3bba44660dbc16 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Tue, 7 Aug 2018 10:27:02 +0800
Subject: [PATCH] 提交

---
 src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java       |  8 +++++---
 src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java |  7 +++++++
 src/main/resources/application.properties                               |  2 +-
 src/main/resources/mybatis/smapper/AsraDailySmapper.xml                 | 20 +++++++++++++++++++-
 4 files changed, 32 insertions(+), 5 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 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.<br/>
 	 */
     List<AsraDailyDO> queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
+
+	/**
+	 * 查询当天填报人数.<br/>
+	 * @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
   </select>
- 
+	<!-- 查询当天填报人数-->
+	<select id="queryAsraDailyOpNumForCurrentDay" parameterType="com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq"
+			resultType="java.lang.Integer">
+		select count(1) from (
+		   SELECT
+		  a.asar_op_id,a.daily_date
+		FROM
+			asra_daily a
+		where 1=1
+		   and a.data_state=1
+		   and a.daily_date = #{beginTime}
+		   and a.asar_op_id in
+			<foreach collection="opIds" item="opId" open="(" close=")" separator=",">
+				#{opId}
+			</foreach>
+
+		group by a.asar_op_id,a.daily_date)c
+
+	</select>
 </mapper>
\ No newline at end of file
--
libgit2 0.21.4