Browse Source

Merge branch 'master' of http://121.42.41.42:7070/r/esua-epdc-cloud

feature/dangjian
李鹏飞 4 years ago
parent
commit
71048a7323
  1. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
  2. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  3. 1
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

1
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@ -318,6 +318,7 @@
<foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
</select>
<resultMap id="pendingResponseMap" type="com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO">

1
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@ -500,6 +500,7 @@
<foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
</select>
<resultMap id="workIssueList" type="com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO">

1
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@ -337,6 +337,7 @@
FROM
epdc_user u
where u.DEL_FLAG = '0'
and date_format( u.CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
<choose>
<when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
<otherwise>

Loading…
Cancel
Save