Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
M
master-5.0
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
master-5.0
Commits
20d354eb
提交
20d354eb
authored
11月 01, 2019
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
bfedf9f4
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
203 行增加
和
145 行删除
+203
-145
DistributorMapper.java
.../zrqx/member/bg/distributor/mapper/DistributorMapper.java
+2
-1
ExpertMemberMapper.java
...com/zrqx/member/bg/emember/mapper/ExpertMemberMapper.java
+9
-6
MemberMapper.java
...n/java/com/zrqx/member/bg/member/mapper/MemberMapper.java
+46
-54
OrganMemberMapper.java
.../com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java
+83
-61
PmMemberMapper.java
...ain/java/com/zrqx/member/bg/pm/mapper/PmMemberMapper.java
+10
-2
PersonalMemberMapper.java
...m/zrqx/member/bg/pmember/mapper/PersonalMemberMapper.java
+16
-5
FgMemberMapper.java
...java/com/zrqx/member/fg/member/mapper/FgMemberMapper.java
+20
-11
FgPermissionsController.java
...m/zrqx/member/fg/permissions/FgPermissionsController.java
+5
-3
FgPrivateMessageMapper.java
.../com/zrqx/member/fg/pm/mapper/FgPrivateMessageMapper.java
+11
-2
pom.xml
pom.xml
+1
-0
没有找到文件。
app/member/src/main/java/com/zrqx/member/bg/distributor/mapper/DistributorMapper.java
浏览文件 @
20d354eb
...
...
@@ -14,7 +14,8 @@ import com.zrqx.core.vo.member.bg.distributor.DistributorListVO;
@Mapper
public
interface
DistributorMapper
extends
BaseMapper
<
Distributor
>
{
@Select
(
"<script> SELECT DISTINCT d.* ,memberNum "
@Select
(
"<script> "
+
" SELECT DISTINCT d.* ,memberNum "
+
" FROM distributor d ,(SELECT o.*,COUNT(om.id) memberNum FROM m_organ o LEFT JOIN m_organ_member om ON o.id = om.oid GROUP BY om.oid ) oom "
+
" WHERE d.code = oom.code "
+
" LIKE(d.name,form.name) "
...
...
app/member/src/main/java/com/zrqx/member/bg/emember/mapper/ExpertMemberMapper.java
浏览文件 @
20d354eb
package
com
.
zrqx
.
member
.
bg
.
emember
.
mapper
;
import
org.apache.ibatis.annotations.Select
;
import
org.apache.ibatis.annotations.Param
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.member.ExpertMember
;
import
com.zrqx.core.vo.member.bg.member.EMemberVO
;
public
interface
ExpertMemberMapper
extends
BaseMapper
<
ExpertMember
>{
@Select
(
"select m.id,account,nickName,phone,status,email,remark,authorId,name,organName,sex,img from m_Member m "
+
"left join m_Expert_Member em "
+
"on m.id = em.id "
+
"where m.id = #{id}"
)
public
EMemberVO
getById
(
Integer
id
);
@Select
(
"<script>"
+
" select m.id,account,nickName,phone,status,email,remark,authorId,name,organName,sex,img from m_Member m "
+
" left join m_Expert_Member em "
+
" on m.id = em.id "
+
" where 1=1 "
+
" eq(m.id,id) "
+
"</script>"
)
public
EMemberVO
getById
(
@Param
(
"id"
)
Integer
id
);
}
app/member/src/main/java/com/zrqx/member/bg/member/mapper/MemberMapper.java
浏览文件 @
20d354eb
...
...
@@ -14,32 +14,39 @@ import com.zrqx.core.vo.member.bg.pm.PmMemberListVO;
public
interface
MemberMapper
extends
BaseMapper
<
Member
>{
@Select
(
"<script> select m.id,account,status,phone,level,a.balance,createTime "
+
"from m_member m left join m_assets a "
+
"on m.id = a.id "
+
"where status != 2 and level = 0 "
+
"<if test = '"
+
NOTBLANK
+
"(account)' >"
+
" and m.account like concat(#{account},'%') "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(phone)' >"
+
" and m.phone like concat(#{phone},'%') "
+
"</if>"
+
"<if test = 'status != null' >"
+
" and m.status = #{status} "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(beginTime)' >"
String
DEFAULT_PARAM
=
" like(m.account,form.account) "
+
" like(m.phone,form.phone) "
+
" eq(m.status,form.status) "
+
"<if test = '"
+
NOTBLANK
+
"(form.beginTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+
" and date_format(m.createTime,'%Y-%m-%d') >= #{
form.
beginTime} "
+
"]]>"
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(endTime)' >"
+
"<if test = '"
+
NOTBLANK
+
"(
form.
endTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+
" and date_format(m.createTime,'%Y-%m-%d') <= #{
form.
endTime} "
+
"]]>"
+
"</if>"
+
"</if>"
;
String
DEFAULT_SQL
=
" select m.id,account,status,phone,level,a.balance,createTime "
+
" from m_member m left join m_assets a "
+
" on m.id = a.id "
+
" where status != 2 and level = 0 "
;
@Select
(
"<script> "
+
DEFAULT_SQL
+
DEFAULT_PARAM
+
"</script>"
)
public
List
<
MemberListVO
>
page
(
QueryMemberForm
form
);
@Select
(
"<script> select id,account,status,phone,level,createTime from m_member m"
public
List
<
MemberListVO
>
page
(
@Param
(
"form"
)
QueryMemberForm
form
);
@Select
(
"<script> "
+
" select id,account,status,phone,level,createTime from m_member m "
+
" where status = 1 "
+
"<if test = '"
+
NOTBLANK
+
"(a2p)' >"
+
" and (m.account like concat(#{a2p},'%') or m.phone like concat(#{a2p},'%'))"
...
...
@@ -53,40 +60,25 @@ public interface MemberMapper extends BaseMapper<Member>{
* @param account
* @return
*/
@Select
(
"<script>
select count(id) from m_member
"
+
"
where account =#{account}
"
+
"
<if test = 'id != null' >
"
+
"
and id != #{id}
"
+
"
</if>
"
@Select
(
"<script>"
+
"
select count(id) from m_member m
"
+
"
where 1=1
"
+
"
eq(m.account,account)
"
+
"
eq(m.id,id)
"
+
"</script>"
)
public
int
isExist
(
@Param
(
"id"
)
Integer
id
,
@Param
(
"account"
)
String
account
);
@Select
(
"<script> select m.id,account,status,phone,level,a.balance,createTime "
+
"from m_member m left join m_assets a "
+
"on m.id = a.id "
+
"where status != 2 and level = 0 "
+
"<if test = '"
+
NOTBLANK
+
"(account)' >"
+
" and m.account like concat(#{account},'%') "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(phone)' >"
+
" and m.phone like concat(#{phone},'%') "
+
"</if>"
+
"<if test = 'status != null' >"
+
" and m.status = #{status} "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(beginTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+
"]]>"
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(endTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+
"]]>"
+
"</if>"
@Select
(
"<script> "
+
DEFAULT_SQL
+
DEFAULT_PARAM
+
" order by createTime desc "
+
"</script>"
)
public
List
<
ExcelMemberExportVo
>
list
(
QueryMemberForm
query
);
public
List
<
ExcelMemberExportVo
>
list
(
@Param
(
"form"
)
QueryMemberForm
query
);
/**
* 判断 手机号是否已存在
...
...
@@ -94,11 +86,11 @@ public interface MemberMapper extends BaseMapper<Member>{
* @param account
* @return
*/
@Select
(
"<script>
select count(id) from m_member
"
+
"
where phone =#{phone}
"
+
"
<if test = 'id != null' >
"
+
"
and id != #{id}
"
+
"
</if>
"
@Select
(
"<script>"
+
"
select count(id) from m_member m
"
+
"
where 1=1
"
+
"
eq(m.phone,phone)
"
+
"
eq(m.id,id)
"
+
"</script>"
)
public
int
isExistPhone
(
@Param
(
"id"
)
Integer
id
,
@Param
(
"phone"
)
String
phone
);
}
app/member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java
浏览文件 @
20d354eb
...
...
@@ -2,9 +2,9 @@ package com.zrqx.member.bg.omember.mapper;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.form.member.bg.member.QueryMemberForm
;
import
com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.member.OrganMember
;
...
...
@@ -13,72 +13,94 @@ import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
public
interface
OrganMemberMapper
extends
BaseMapper
<
OrganMember
>{
@Select
(
"select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
+
"left join m_Organ_Member om "
+
"on m.id = om.id "
+
"left join m_Organ o "
+
"on om.oid = o.id "
+
"where m.id = #{id}"
)
public
OrganMemberVO
getById
(
Integer
id
);
@Select
(
"<script> SELECT m.id,m.account,m.status,o.name,o.type,m.createTime,o.endTime from m_Organ_Member om "
+
"left join m_member m "
+
"on m.id = om.id "
+
"left join m_Organ o "
+
"on om.oid = o.id "
+
" where status != 2"
+
"<if test = '"
+
NOTBLANK
+
"(account)' >"
+
" and m.account like concat(#{account},'%') "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(name)' >"
+
" and o.name like concat(#{name},'%') "
+
"</if>"
+
"<if test = 'status != null' >"
+
" and m.status = #{status} "
+
"</if>"
+
"<if test = 'type != null' >"
+
" and o.type = #{type} "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(beginTime)' >"
String
DEFAULT_PARAM
=
" SELECT m.id,m.account,m.status,o.name,o.type,m.createTime,o.endTime from m_Organ_Member om "
+
" left join m_member m "
+
" on m.id = om.id "
+
" left join m_Organ o "
+
" on om.oid = o.id "
+
" where status != 2 "
+
" like(m.account,form.account) "
+
" like(o.name,form.name) "
+
" eq(m.status,form.status) "
+
" eq(o.type,form.type) "
+
"<if test = '"
+
NOTBLANK
+
"(form.beginTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+
" and date_format(m.createTime,'%Y-%m-%d') >= #{
form.
beginTime} "
+
"]]>"
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(endTime)' >"
+
"<if test = '"
+
NOTBLANK
+
"(
form.
endTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+
" and date_format(m.createTime,'%Y-%m-%d') <= #{
form.
endTime} "
+
"]]>"
+
"</if>"
+
"</if>"
;
//@Select("select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
// + "left join m_Organ_Member om "
// + "on m.id = om.id "
// + "left join m_Organ o "
// + "on om.oid = o.id "
// + "where m.id = #{id}")
@Select
(
"<script>"
+
" select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
+
" left join m_Organ_Member om "
+
" on m.id = om.id "
+
" left join m_Organ o "
+
" on om.oid = o.id "
+
" where 1=1 "
+
" eq(m.id,id) "
+
"</script>"
)
public
List
<
OrganMemberListVO
>
page
(
QueryOrganMemberForm
form
);
@Select
(
"<script> SELECT m.id,m.account,m.status,o.name,o.type,m.createTime,o.endTime from m_Organ_Member om "
+
"left join m_member m "
+
"on m.id = om.id "
+
"left join m_Organ o "
+
"on om.oid = o.id "
+
" where status != 2"
+
"<if test = '"
+
NOTBLANK
+
"(account)' >"
+
" and m.account like concat(#{account},'%') "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(name)' >"
+
" and o.name like concat(#{name},'%') "
+
"</if>"
+
"<if test = 'status != null' >"
+
" and m.status = #{status} "
+
"</if>"
+
"<if test = 'type != null' >"
+
" and o.type = #{type} "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(beginTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+
"]]>"
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(endTime)' >"
+
"<![CDATA["
+
" and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+
"]]>"
+
"</if>"
public
OrganMemberVO
getById
(
@Param
(
"id"
)
Integer
id
);
// @Select("<script> SELECT m.id,m.account,m.status,o.name,o.type,m.createTime,o.endTime from m_Organ_Member om "
// + "left join m_member m "
// + "on m.id = om.id "
// + "left join m_Organ o "
// + "on om.oid = o.id "
// + " where status != 2"
// + "<if test = '"+NOTBLANK+"(account)' >"
// + " and m.account like concat(#{account},'%') "
// + "</if>"
// + "<if test = '"+NOTBLANK+"(name)' >"
// + " and o.name like concat(#{name},'%') "
// + "</if>"
// + "<if test = 'status != null' >"
// + " and m.status = #{status} "
// + "</if>"
// + "<if test = 'type != null' >"
// + " and o.type = #{type} "
// + "</if>"
// + "<if test = '"+NOTBLANK+"(beginTime)' >"
// + "<![CDATA["
// + " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
// + "]]>"
// + "</if>"
// + "<if test = '"+NOTBLANK+"(endTime)' >"
// + "<![CDATA["
// + " and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
// + "]]>"
// + "</if>"
// + "</script>")
@Select
(
"<script> "
+
DEFAULT_PARAM
+
"</script>"
)
public
List
<
OrganMemberListVO
>
page
(
@Param
(
"form"
)
QueryOrganMemberForm
form
);
@Select
(
"<script> "
+
DEFAULT_PARAM
+
"</script>"
)
public
List
<
ExcelOrganMemberExportVo
>
list
(
QueryOrganMemberForm
query
);
}
app/member/src/main/java/com/zrqx/member/bg/pm/mapper/PmMemberMapper.java
浏览文件 @
20d354eb
...
...
@@ -2,6 +2,7 @@ package com.zrqx.member.bg.pm.mapper;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
...
...
@@ -15,6 +16,13 @@ public interface PmMemberMapper extends BaseMapper<PmMember>{
* @param pmid
* @return
*/
@Select
(
"select account from m_member m join m_private_message_member pmm on m.id = pmm.memberId and pmid = #{pmid}"
)
public
List
<
String
>
getAccountList
(
Integer
pmid
);
//@Select("select account from m_member m join m_private_message_member pmm on m.id = pmm.memberId and pmid = #{pmid}")
@Select
(
"<script>"
+
" select account "
+
" from "
+
" m_member m "
+
" join m_private_message_member pmm on m.id = pmm.memberId "
+
" and pmid = #{pmid} "
+
"</script>"
)
public
List
<
String
>
getAccountList
(
@Param
(
"pmid"
)
Integer
pmid
);
}
app/member/src/main/java/com/zrqx/member/bg/pmember/mapper/PersonalMemberMapper.java
浏览文件 @
20d354eb
package
com
.
zrqx
.
member
.
bg
.
pmember
.
mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
...
...
@@ -7,9 +8,19 @@ import com.zrqx.core.model.member.PersonalMember;
import
com.zrqx.core.vo.member.bg.member.PMemberVO
;
public
interface
PersonalMemberMapper
extends
BaseMapper
<
PersonalMember
>{
@Select
(
"select m.id,account,nickName,phone,status,email,remark,title,dept,academic,name,organName,sex,img,password from m_Member m "
+
"left join m_Personal_Member pm "
+
"on m.id = pm.id "
+
"where m.id = #{id}"
)
public
PMemberVO
getById
(
Integer
id
);
// @Select("select m.id,account,nickName,phone,status,email,remark,title,dept,academic,name,organName,sex,img,password from m_Member m "
// + "left join m_Personal_Member pm "
// + "on m.id = pm.id "
// + "where m.id = #{id}")
@Select
(
"<script>"
+
" select m.id,account,nickName,phone,status,email,remark,title,dept,academic,name,organName,sex,img,password "
+
" from m_Member m "
+
" left join m_Personal_Member pm "
+
" on m.id = pm.id "
+
" where 1=1 "
+
" eq(m.id,id) "
+
"</script>"
)
public
PMemberVO
getById
(
@Param
(
"id"
)
Integer
id
);
}
app/member/src/main/java/com/zrqx/member/fg/member/mapper/FgMemberMapper.java
浏览文件 @
20d354eb
...
...
@@ -15,17 +15,26 @@ public interface FgMemberMapper extends BaseMapper<Member>{
* @param phone
* @return
*/
@Select
(
"<script>select count(id) from m_member "
+
"where 1=1 "
+
"<if test = '"
+
NOTBLANK
+
"(account)' >"
+
" and account = #{account} "
+
"</if>"
+
"<if test = 'id != null' >"
+
" and id != #{id} "
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(phone)' >"
+
" and phone = #{phone} "
+
"</if>"
// @Select("<script>select count(id) from m_member "
// + "where 1=1 "
// + "<if test = '"+NOTBLANK+"(account)' >"
// + " and account = #{account} "
// + "</if>"
// + "<if test = 'id != null' >"
// + " and id != #{id} "
// + "</if>"
// + "<if test = '"+NOTBLANK+"(phone)' >"
// + " and phone = #{phone} "
// + "</if>"
// + "</script>")
//
@Select
(
"<script>"
+
" select count(id) from m_member m "
+
" where 1=1 "
+
" eq(m.account,account) "
+
" eq(m.id,id) "
+
" eq(m.phone,phone) "
+
"</script>"
)
public
int
isExist
(
@Param
(
"id"
)
Integer
id
,
@Param
(
"account"
)
String
account
,
@Param
(
"phone"
)
String
phone
);
}
app/member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java
浏览文件 @
20d354eb
...
...
@@ -309,9 +309,11 @@ public class FgPermissionsController {
if
(!
form
.
getCode
().
toLowerCase
().
equals
(
redisCode
.
toLowerCase
()))
{
throw
new
BaseException
(
3
,
"验证码有误"
);
}
if
(
StringUtils
.
isBlank
(
form
.
getQqKey
())
&&
StringUtils
.
isBlank
(
form
.
getWechatKey
()))
{
throw
new
BaseException
(
9
,
"第三方账号不能为空"
);
}
if
(
StringUtils
.
isBlank
(
form
.
getQqKey
())
&&
StringUtils
.
isBlank
(
form
.
getWechatKey
()))
{
throw
new
BaseException
(
9
,
"第三方账号不能为空"
);
}
redis
.
delete
(
form
.
getPhone
());
if
(
mService
.
isExistByAccount
(
null
,
form
.
getAccount
()))
{
throw
new
BaseException
(
99
,
"已被注册"
);
...
...
app/member/src/main/java/com/zrqx/member/fg/pm/mapper/FgPrivateMessageMapper.java
浏览文件 @
20d354eb
...
...
@@ -12,9 +12,18 @@ import com.zrqx.core.vo.member.fg.pm.FgPrivateMessageListVO;
* 站内信
*/
public
interface
FgPrivateMessageMapper
extends
BaseMapper
<
PrivateMessage
>{
@Select
(
"select pm.id,pmm.id pmmId,title,content,sendTime "
// @Select("select pm.id,pmm.id pmmId,title,content,sendTime "
// + "from m_private_message_member pmm left join m_private_message pm "
// + "on pm.id = pmm.pmid "
// + "where memberId = #{memberId} and status !=2")
@Select
(
"<script>"
+
"select pm.id,pmm.id pmmId,title,content,sendTime "
+
"from m_private_message_member pmm left join m_private_message pm "
+
"on pm.id = pmm.pmid "
+
"where memberId = #{memberId} and status !=2"
)
+
" where 1=1 and status !=2 "
+
" eq(pmm.memberId,memberId) "
+
"</script>"
)
List
<
FgPrivateMessageListVO
>
page
(
@Param
(
"memberId"
)
Integer
memberId
);
}
pom.xml
浏览文件 @
20d354eb
...
...
@@ -113,6 +113,7 @@
</dependencies>
</dependencyManagement>
<build>
<defaultGoal>
compile
</defaultGoal>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论