BJ_ZTEITS-Developers / zteits-oa

Commit 53dc000514f255ea07afb8565c3bba44660dbc16

Authored by 王富生
1 parent 8f6cbf12

提交

Inline Side-by-side
Showing 4 changed files with 32 additions and 5 deletions
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
  View file @53dc000
... ... @@ -78,11 +78,13 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
78 78 }
79 79  
80 80 //2.查询今日日报填写人数
81   - AsraDailyExample exampleTwo = new AsraDailyExample();
  81 + /**AsraDailyExample exampleTwo = new AsraDailyExample();
82 82 exampleTwo.createCriteria().andAsarOpIdIn(request.getOpIds())
83 83 .andDailyDateEqualTo(DateUtil.parse(DateUtil.format(new Date(),DateUtil.NORM_DATE_PATTERN),DateUtil.NORM_DATE_PATTERN))
84   - .andDataStateEqualTo(1);
85   - int countByExample = (int)asraDailyMapper.countByExample(exampleTwo);
  84 + .andDataStateEqualTo(1);*/
  85 + request.setBeginTime(DateUtil.format(new Date(),DateUtil.NORM_DATE_PATTERN));
  86 + int countByExample = asraDailySmapper.queryAsraDailyOpNumForCurrentDay(request);
  87 +
86 88 asraDailyOpNumForCurrentDayDO.setCurrentDayCommitEmployeeNum(countByExample);
87 89 asraDailyOpNumForCurrentDayDO.setEmployeeTotal(employeeTotal);
88 90 asraDailyOpNumForCurrentDayDO.setCurrentDayNotCommitEmployeeNum(employeeTotal - countByExample);
... ...
src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
  View file @53dc000
... ... @@ -13,4 +13,11 @@ public interface AsraDailySmapper {
13 13 * 2018年8月1日 wangfs.<br/>
14 14 */
15 15 List<AsraDailyDO> queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
  16 +
  17 + /**
  18 + * 查询当天填报人数.<br/>
  19 + * @param request
  20 + * @return
  21 + */
  22 + int queryAsraDailyOpNumForCurrentDay(AsraDailyForTotalNumAndDetailReq request);
16 23 }
17 24 \ No newline at end of file
... ...
src/main/resources/application.properties
  View file @53dc000
1 1 spring.application.name=zteits-oa
2   -server.port=8100
  2 +server.port=8101
3 3  
4 4 #spring.profiles.active=prod
5 5 # logging
... ...
src/main/resources/mybatis/smapper/AsraDailySmapper.xml
  View file @53dc000
... ... @@ -69,5 +69,23 @@
69 69 a.id
70 70 order by a.project_id asc,asar_op_id asc,a.daily_date desc
71 71 </select>
72   -
  72 + <!-- 查询当天填报人数-->
  73 + <select id="queryAsraDailyOpNumForCurrentDay" parameterType="com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq"
  74 + resultType="java.lang.Integer">
  75 + select count(1) from (
  76 + SELECT
  77 + a.asar_op_id,a.daily_date
  78 + FROM
  79 + asra_daily a
  80 + where 1=1
  81 + and a.data_state=1
  82 + and a.daily_date = #{beginTime}
  83 + and a.asar_op_id in
  84 + <foreach collection="opIds" item="opId" open="(" close=")" separator=",">
  85 + #{opId}
  86 + </foreach>
  87 +
  88 + group by a.asar_op_id,a.daily_date)c
  89 +
  90 + </select>
73 91 </mapper>
74 92 \ No newline at end of file
... ...