Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
M
mzyy
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
mzyy
Commits
0647eb3c
提交
0647eb3c
authored
7月 30, 2019
作者:
xinjunguo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
ddd72632
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
87 行增加
和
5 行删除
+87
-5
OrganMemberController.java
...x/member/bg/omember/controller/OrganMemberController.java
+37
-4
OrganMemberMapper.java
.../com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java
+37
-0
OrganMemberService.java
...om/zrqx/member/bg/omember/service/OrganMemberService.java
+4
-0
OrganMemberServiceImpl.java
...rqx/member/bg/omember/service/OrganMemberServiceImpl.java
+9
-1
没有找到文件。
com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/controller/OrganMemberController.java
浏览文件 @
0647eb3c
package
com
.
zrqx
.
member
.
bg
.
omember
.
controller
;
package
com
.
zrqx
.
member
.
bg
.
omember
.
controller
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
java.util.List
;
import
java.util.List
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -13,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -13,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
tk.mybatis.mapper.entity.Example
;
import
com.zrqx.core.constant.member.MemberRequestPath
;
import
com.zrqx.core.constant.member.MemberRequestPath
;
import
com.zrqx.core.enums.ResponseCodeEnum
;
import
com.zrqx.core.enums.ResponseCodeEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.exception.BaseException
;
...
@@ -20,17 +28,15 @@ import com.zrqx.core.exception.ParameterValidateException;
...
@@ -20,17 +28,15 @@ import com.zrqx.core.exception.ParameterValidateException;
import
com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm
;
import
com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.util.encry.MD5Util
;
import
com.zrqx.core.util.encry.MD5Util
;
import
com.zrqx.core.util.excelutil.ExcelUtil
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo
;
import
com.zrqx.member.bg.member.service.MemberService
;
import
com.zrqx.member.bg.member.service.MemberService
;
import
com.zrqx.member.bg.omember.service.OrganMemberService
;
import
com.zrqx.member.bg.omember.service.OrganMemberService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
tk.mybatis.mapper.entity.Example
;
/**
/**
* 机构用户信息 Controller
* 机构用户信息 Controller
*/
*/
...
@@ -74,4 +80,31 @@ public class OrganMemberController {
...
@@ -74,4 +80,31 @@ public class OrganMemberController {
}
}
return
CallBack
.
success
(
service
.
page
(
form
,
pageParam
));
return
CallBack
.
success
(
service
.
page
(
form
,
pageParam
));
}
}
@ApiOperation
(
"导出机构会员信息Excel"
)
@GetMapping
(
MemberRequestPath
.
EXPORT
)
public
CallBack
<?>
exportOrganMember
(
QueryOrganMemberForm
query
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
// 查询条件 query
List
<
ExcelOrganMemberExportVo
>
list
=
service
.
importOrganMember
(
query
);
for
(
ExcelOrganMemberExportVo
excelMemberExportVo
:
list
)
{
if
(
"0"
.
equals
(
excelMemberExportVo
.
getStatus
())){
excelMemberExportVo
.
setStatus
(
"禁用"
);
}
else
{
excelMemberExportVo
.
setStatus
(
"启用"
);
}
if
(
"1"
.
equals
(
excelMemberExportVo
.
getType
())){
excelMemberExportVo
.
setType
(
"正式"
);
}
else
{
excelMemberExportVo
.
setType
(
"试用"
);
}
}
try
{
ExcelUtil
.
getInstance
().
exportExcel
(
list
,
ExcelOrganMemberExportVo
.
class
,
"机构用户信息.xlsx"
,
response
,
request
);
}
catch
(
Exception
e
)
{
return
CallBack
.
fail
(
e
.
getMessage
());
}
return
CallBack
.
success
();
}
}
}
com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java
浏览文件 @
0647eb3c
...
@@ -9,6 +9,7 @@ import com.zrqx.core.mapper.BaseMapper;
...
@@ -9,6 +9,7 @@ import com.zrqx.core.mapper.BaseMapper;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo
;
public
interface
OrganMemberMapper
extends
BaseMapper
<
OrganMember
>{
public
interface
OrganMemberMapper
extends
BaseMapper
<
OrganMember
>{
@Select
(
"select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
@Select
(
"select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
...
@@ -48,4 +49,40 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
...
@@ -48,4 +49,40 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
+
"</if>"
+
"</if>"
+
"</script>"
)
+
"</script>"
)
public
List
<
OrganMemberListVO
>
page
(
QueryOrganMemberForm
form
);
public
List
<
OrganMemberListVO
>
page
(
QueryOrganMemberForm
form
);
/**
* 导出机构会员信息
* @param query
* @return
*/
@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>"
)
public
List
<
ExcelOrganMemberExportVo
>
list
(
QueryOrganMemberForm
query
);
}
}
com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/service/OrganMemberService.java
浏览文件 @
0647eb3c
package
com
.
zrqx
.
member
.
bg
.
omember
.
service
;
package
com
.
zrqx
.
member
.
bg
.
omember
.
service
;
import
java.util.List
;
import
com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm
;
import
com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm
;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.service.BaseService
;
...
@@ -7,8 +9,10 @@ import com.zrqx.core.util.page.PageInfo;
...
@@ -7,8 +9,10 @@ import com.zrqx.core.util.page.PageInfo;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo
;
public
interface
OrganMemberService
extends
BaseService
<
OrganMember
,
Integer
>
{
public
interface
OrganMemberService
extends
BaseService
<
OrganMember
,
Integer
>
{
OrganMemberVO
getById
(
Integer
id
);
OrganMemberVO
getById
(
Integer
id
);
PageInfo
<
OrganMemberListVO
>
page
(
QueryOrganMemberForm
form
,
PageParam
pageParam
);
PageInfo
<
OrganMemberListVO
>
page
(
QueryOrganMemberForm
form
,
PageParam
pageParam
);
List
<
ExcelOrganMemberExportVo
>
importOrganMember
(
QueryOrganMemberForm
query
);
}
}
com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/service/OrganMemberServiceImpl.java
浏览文件 @
0647eb3c
...
@@ -13,6 +13,7 @@ import com.zrqx.core.util.page.PageInfo;
...
@@ -13,6 +13,7 @@ import com.zrqx.core.util.page.PageInfo;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberListVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.member.OrganMemberVO
;
import
com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo
;
import
com.zrqx.member.bg.omember.mapper.OrganMemberMapper
;
import
com.zrqx.member.bg.omember.mapper.OrganMemberMapper
;
@Service
@Service
...
@@ -33,5 +34,12 @@ public class OrganMemberServiceImpl extends BaseServiceImpl<OrganMember,Integer>
...
@@ -33,5 +34,12 @@ public class OrganMemberServiceImpl extends BaseServiceImpl<OrganMember,Integer>
List
<
OrganMemberListVO
>
list
=
mapper
.
page
(
form
);
List
<
OrganMemberListVO
>
list
=
mapper
.
page
(
form
);
return
new
PageInfo
<
OrganMemberListVO
>(
list
);
return
new
PageInfo
<
OrganMemberListVO
>(
list
);
}
}
/**
* 导出机构会员信息
*/
@Override
public
List
<
ExcelOrganMemberExportVo
>
importOrganMember
(
QueryOrganMemberForm
query
)
{
return
mapper
.
list
(
query
);
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论