elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/hotfix/selectDate'

feature/dangjian
李鹏飞 5 years ago
parent
205c041e65 0958699276
commit
8e20228c8f
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
  2. 26
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

6
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
View File

@ -256,9 +256,9 @@
FROM
epdc_user uu
where uu.DEL_FLAG = '0'
<if test="realName != null and realName != '' ">and uu.REAL_NAME = #{realName}</if>
<if test="mobile != null and mobile != '' ">and uu.MOBILE = #{mobile}</if>
<if test="identityNo != null and identityNo != '' ">and uu.IDENTITY_NO = #{identityNo}</if>
<if test="realName != null and realName != '' ">and uu.REAL_NAME like '%${realName}%'</if>
<if test="mobile != null and mobile != '' ">and uu.MOBILE like '%${mobile}%'</if>
<if test="identityNo != null and identityNo != '' ">and uu.IDENTITY_NO like '%${identityNo}%'</if>
<if test="registFlag != null and registFlag != '' ">and uu.REGIST_FLAG = #{registFlag}</if>
<if test="startTime != null and startTime != '' ">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') >= #{startTime}</if>
<if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>

26
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
View File

@ -643,10 +643,10 @@
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
<if test="realName != '' and realName != null">and USER.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and USER.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and USER.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and USER.identity_no like '%${identityNo}%'</if>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},USER.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},USER.ALL_DEPT_IDS))
@ -754,10 +754,10 @@
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
<if test="realName != '' and realName != null">and user.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and user.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and user.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and user.identity_no like '%${identityNo}%'</if>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
@ -848,10 +848,10 @@
#{deptId}
</foreach>
and user.AUTHENTICATED_TYPE is null
<if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
<if test="realName != '' and realName != null">and user.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and user.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and user.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and user.identity_no like '%${identityNo}%'</if>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
@ -1249,7 +1249,7 @@
epdc_user uu
where uu.DEL_FLAG = '0'
<if test="startTime != '' and endTime != ''">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
<if test="realName != '' and realName != null">and uu.real_name uu '%${realName}%'</if>
<if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and uu.identity_no like '%${identityNo}%'</if>

Write Preview
Loading…
Cancel
Save