Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
494 commits
Select commit Hold shift + click to select a range
b741cf6
修正部分物资模块
Mar 3, 2019
bd7a677
修改归还物资接口
Mar 3, 2019
7f53e10
bug部分修复(3)
cpp-wen Mar 3, 2019
d9e9afb
修改归还物资
Mar 3, 2019
076e1f0
bug部分修复(4)
cpp-wen Mar 4, 2019
90d35b1
1.添加财务验权
MessiahJK Mar 4, 2019
ddca236
Merge branch 'dev' of https://github.com/BetaSummer/haetae
MessiahJK Mar 4, 2019
4374022
1.修正导入
MessiahJK Mar 5, 2019
5e74616
数据库更改
cpp-wen Mar 10, 2019
ea9612f
1.专业定义
MessiahJK Mar 12, 2019
01eaae4
1.财务模块开设黑名单接口和修改预算接口
MessiahJK Mar 12, 2019
a9a7d4a
权限注释删除
cpp-wen Mar 13, 2019
bdfc358
1.修正
MessiahJK Mar 13, 2019
a06fe56
Merge branch 'dev' of https://github.com/BetaSummer/haetae
MessiahJK Mar 13, 2019
3021cd7
1.修正代码
MessiahJK Mar 14, 2019
0f3668c
1.合并
MessiahJK Mar 17, 2019
53f166c
1. 修复懒更新盖章员信息bug
Outside-man Mar 17, 2019
cdcca15
修正代码
cpp-wen Mar 20, 2019
c5d3703
代码更正
cpp-wen Mar 20, 2019
40b8fd3
bug
cpp-wen Mar 21, 2019
19611a2
1. 创建组织模块
Outside-man Mar 25, 2019
4227338
1. 误伤修复
Outside-man Mar 25, 2019
ae44710
Merge branch 'master' into dev1
Outside-man Mar 25, 2019
1d8c622
1. 配置组织模块日志
Outside-man Mar 25, 2019
bbce908
1. 构建组织BO模型
Outside-man Mar 25, 2019
273dd3a
1. readme 增加业务码描述
Outside-man Mar 25, 2019
e41acfe
update
Outside-man Mar 25, 2019
46f30ab
组织仓储初步完成
Outside-man Mar 25, 2019
e31fa4c
1. 组织模块仓储服务完成
Outside-man Mar 25, 2019
aeac0b2
1. 创建组织领域能力验证完毕
Outside-man Mar 25, 2019
e5f32a2
1. 领域成员管理能力
Outside-man Mar 26, 2019
6236da5
1. 旧组织功能替换成新模块功能
Outside-man Mar 26, 2019
16b788f
1. biz层组织创建开发完毕
Outside-man Mar 26, 2019
302b221
修复bug
Mar 27, 2019
1cbe0fc
1. 组织成员管理(含权限)完成
Outside-man Mar 27, 2019
b11f0ce
1. 组织解散开发完成
Outside-man Mar 27, 2019
4de4c7e
1. 接口基本开发完毕,已验证
Outside-man Mar 27, 2019
c79e5a8
Merge remote-tracking branch 'origin/dev2' into dev2
cpp-wen Mar 27, 2019
31646ad
分割物资模块对活动模块依赖(未测试)
cpp-wen Mar 27, 2019
4d7a15a
物资接口重测完成
cpp-wen Mar 28, 2019
a420f8e
1.修正财务内容
MessiahJK Mar 29, 2019
3cd459c
包结构创建
cpp-wen Mar 30, 2019
ae332e5
添加模块依赖
cpp-wen Mar 30, 2019
828d57e
1.修正README
MessiahJK Mar 31, 2019
d53b8ab
1.小红本功能实现
MessiahJK Apr 3, 2019
f42e37b
实体类搭建完成
cpp-wen Apr 3, 2019
e40f202
资格证书core搭建完成
cpp-wen Apr 5, 2019
1f410c9
创建竞赛证书基本完成 未测试
cpp-wen Apr 7, 2019
a8d7a71
fix bug
Outside-man Apr 8, 2019
739ecfd
更改字段名rank
Apr 8, 2019
f73360b
修复部分拼写错误
Apr 8, 2019
1420a77
1.修正
MessiahJK Apr 8, 2019
cf2fdb6
1.完善证书core层内容
cpp-wen Apr 8, 2019
46fa613
1.增加创建组织时带id的情况
MessiahJK Apr 9, 2019
438f3c4
Merge branch 'dev1' of https://github.com/BetaSummer/haetae into dev3
MessiahJK Apr 9, 2019
7ceddbf
Merge branch 'dev1'
Outside-man Apr 11, 2019
f9c8f3f
Merge branch 'master' into dev3
Outside-man Apr 11, 2019
592cfe1
更新readme
Outside-man Apr 11, 2019
894b195
fix bug
Outside-man Apr 11, 2019
51426dd
日志保存时长修改
Outside-man Apr 11, 2019
46d1ae7
1.切分活动管理员,增加角色
MessiahJK Apr 11, 2019
515b608
增加修改证书
Apr 15, 2019
0e57f72
1.添加竞赛证书团队id 删除竞赛证书类型
cpp-wen Apr 16, 2019
42ffeea
1.证书删除接口完成
cpp-wen Apr 17, 2019
c08b8ba
1.core/user增加班级/专业/年级的录入接口
MessiahJK Apr 18, 2019
72b1084
修改竞赛证书完成
Apr 18, 2019
50b2e19
修改竞赛证书完成
Apr 18, 2019
77e99a9
增加证书查询功能
Apr 19, 2019
04b0a35
增加证书查询接口
Apr 19, 2019
d92489c
增加修改技能证书(未测试)
Apr 20, 2019
74825d3
1.学生部分证书基本完成2.管理端未完成3.学生部分接口未测试
cpp-wen Apr 20, 2019
7e93b28
完善修改竞赛证书
Apr 20, 2019
12ed2f0
1.竞赛证书更新修改
cpp-wen Apr 21, 2019
2ddd6ee
1.证书创建接口 竞赛证书stuid转换userid更正
cpp-wen Apr 21, 2019
5510570
1.除证书修改接口,其他接口均测试
cpp-wen Apr 21, 2019
5d0a396
1.信息录入接口完成
MessiahJK Apr 22, 2019
7fb61b9
1.dev2
cpp-wen Apr 22, 2019
1864844
1.增加创建组织时带id的情况
MessiahJK Apr 22, 2019
b7b5fae
1.证书模块表名修改
cpp-wen Apr 23, 2019
234d1c7
1.fix
MessiahJK Apr 23, 2019
d5658be
Merge branches 'dev3' and 'master' of https://github.com/BetaSummer/h…
MessiahJK Apr 23, 2019
c58cda3
Merge branch 'master' of https://github.com/BetaSummer/haetae into dev3
MessiahJK Apr 23, 2019
9d73472
fix
MessiahJK Apr 23, 2019
7690f1c
1.证书更新接口完成
cpp-wen Apr 24, 2019
426ba1f
Merge remote-tracking branch 'origin/dev2' into dev2
cpp-wen Apr 24, 2019
16ba54e
1.错误提交修改
cpp-wen Apr 24, 2019
eb3fc6b
增加创建修改四六级证书功能(已测试)
Apr 24, 2019
3d3eed0
删去准考证字段。修复bug
Apr 25, 2019
d12c895
1.证书模块错误修改
cpp-wen Apr 26, 2019
125f9bb
Merge remote-tracking branch 'origin/dev2' into dev2
cpp-wen Apr 26, 2019
51695bd
1.证书模块修改(删除准考证号,添加资格证书等级字段)
cpp-wen Apr 26, 2019
61e15f7
将四六级改为单个种类证书
Apr 26, 2019
870a444
Merge remote-tracking branch 'origin/dev2' into dev2
Apr 26, 2019
7815168
1.四六级证书修改
cpp-wen Apr 28, 2019
99764d1
1.证书模块权限搭建
cpp-wen May 1, 2019
94bf806
fix
MessiahJK May 4, 2019
57f69bd
1.证书审核员接口完成
cpp-wen May 5, 2019
6fb9e8d
修复精度问题
MessiahJK May 5, 2019
cf26321
1.添加证书审核员
cpp-wen May 7, 2019
20f82ec
Merge branch 'master' into dev2
cpp-wen May 7, 2019
74dddfa
1.竞赛证书添加学号异常报错
cpp-wen May 10, 2019
6fdc0ca
1.竞赛证书 空学生学号验证
cpp-wen May 10, 2019
7a55a71
1.竞赛证书 详细信息 返回userid转stuid
cpp-wen May 10, 2019
06fb778
1.fix 证书审核竞赛证书后 userid变为stuid
cpp-wen May 11, 2019
428c539
1.fix
cpp-wen May 11, 2019
15a6fee
1.fix 四六级证书添加成绩判断
cpp-wen May 12, 2019
bc7e459
1.fix 竞赛证书 队员学号去重
cpp-wen May 14, 2019
2abb54b
1.fix 竞赛证书 队员学号去重改为异常抛出
cpp-wen May 14, 2019
360611d
1.fix 竞赛证书 修改证书bug修复
cpp-wen May 14, 2019
220aa89
1.add 赋权证书审核员和删除审核员
cpp-wen May 18, 2019
02cd179
增加根据学号修改密码接口
May 19, 2019
7344c1c
1.add 证书管理员脚本 四六级脚本
cpp-wen May 23, 2019
51addb3
Merge remote-tracking branch 'origin/dev2' into dev2
cpp-wen May 23, 2019
99cf8a2
以往信息导入
MessiahJK May 23, 2019
198db15
Merge branch 'master' of https://github.com/BetaSummer/haetae into dev3
MessiahJK May 23, 2019
80b95ce
数据导入
MessiahJK May 30, 2019
438a507
场地模块的添加
NathanDai Jul 2, 2019
1949f71
添加了BO2DO和DO2BO
NathanDai Jul 2, 2019
3e4f3b2
添加了biz的locale
NathanDai Jul 2, 2019
b9efc63
新建了第一个Controller
NathanDai Jul 3, 2019
77f62d4
添加了CopyRight 和@author @version
NathanDai Jul 3, 2019
305d178
添加了查询可用场地的接口
NathanDai Jul 4, 2019
3f09e2f
添加了新建场地 场地占用 场地申请的接口
NathanDai Jul 4, 2019
1dda1b7
新建场地占用 场地申请的接口
NathanDai Jul 4, 2019
51cdd80
完成了各个接口的设计
NathanDai Jul 4, 2019
6101d8f
添加了建造者的代码
NathanDai Jul 5, 2019
0a76313
1.add 证书图片路径
cpp-wen Jul 6, 2019
238b242
初步完成了场地占用和场地查询的功能
NathanDai Jul 6, 2019
4f35184
初步实现了场地申请的接口
NathanDai Jul 6, 2019
6f63d71
初步完成了场地申请
NathanDai Jul 7, 2019
427a878
初步完成了场地申请状态修改
NathanDai Jul 7, 2019
0dba93c
初步完成了场地申请查找
NathanDai Jul 8, 2019
31498d9
完善了查询场地申请的流程
NathanDai Jul 9, 2019
aa5c967
修改了部分注释
NathanDai Jul 9, 2019
e8142dc
添加报名信息查询功能
Jul 9, 2019
92dc350
报名状态修改
Jul 9, 2019
e24ed4c
移除了不需要的方法
NathanDai Jul 9, 2019
40d0ffc
添加了权限类型
NathanDai Jul 9, 2019
86090c3
添加了权限规则
NathanDai Jul 10, 2019
44d7be9
修改了部分方法的写法 改成了lamba表达式
NathanDai Jul 11, 2019
cffbe27
占用场地前确定场地是否被占用
NathanDai Jul 11, 2019
554bffe
修复了检验场地是否被占用的报错,添加场地申请的同时修改场地占用状态
NathanDai Jul 11, 2019
6c254f8
更新了一下注释
NathanDai Jul 11, 2019
11448ce
1.查询场地完全实现了
NathanDai Jul 12, 2019
b205470
后端流程走通了
NathanDai Jul 12, 2019
56a0933
update README.md
NathanDai Jul 12, 2019
05e9828
添加了查询场地名称的功能
NathanDai Jul 25, 2019
b370a40
更新了部分不标准的写法
NathanDai Jul 26, 2019
96a3fe5
添加了docker打包
NathanDai Jul 29, 2019
23678e2
在BO中添加了LocaleName 在查询申请的时候可以显示LocaleName
NathanDai Jul 30, 2019
de12133
Merge pull request #1 from NathanDai/master
NathanDai Jul 30, 2019
523ba0b
添加了权限和角色初始化
NathanDai Jul 31, 2019
e75f3a8
添加了一些注释 修改了pom文件
NathanDai Jul 31, 2019
5b7d9c5
Merge pull request #2 from NathanDai/dev4/docker
NathanDai Jul 31, 2019
7fbd95b
add 场地申请超过两天未审批 自动将申请取消
NathanDai Aug 1, 2019
28fdf6b
Merge branch 'dev6' into master
NathanDai Aug 1, 2019
a43e95a
Merge pull request #1 from NathanDai/master
MessiahJK Aug 1, 2019
dd9d82c
1.创建报名信息2.查询创建的报名信息3.导出报名记录4.用户报名
Aug 2, 2019
f97e44a
报名信息修改功能 | pom.xml
Aug 3, 2019
7f6c87b
系统结束报名
Aug 3, 2019
bcca514
发布报名
Aug 3, 2019
43c60cc
fix
Aug 3, 2019
41c3d18
查询信用分,活动结束添加失信人员记录
Aug 3, 2019
6c5577c
活动盖章时标记出席
Aug 3, 2019
fcfe48e
fix
Aug 3, 2019
b06efa9
1.角色管理
cpp-wen Aug 16, 2019
b554014
fix
MessiahJK Aug 22, 2019
ee2c634
1.用户权限角色管理搭建
cpp-wen Aug 24, 2019
c60be6a
add ActivityEntryId field
Aug 24, 2019
e860ceb
信用系统fix
Aug 25, 2019
9708bc1
1.导入盖章
cpp-wen Aug 25, 2019
4e8555a
fix
Aug 25, 2019
a7e35c1
fix
MessiahJK Aug 27, 2019
1d8177d
Merge branch 'dev2' of https://github.com/BetaSummer/haetae into dev3
MessiahJK Aug 27, 2019
d707b42
1.import model
cpp-wen Aug 27, 2019
3978e91
Merge branch 'dev2' of https://github.com/BetaSummer/haetae into dev3
MessiahJK Aug 27, 2019
1d86e61
1.添加跨域 注解
cpp-wen Aug 27, 2019
1e0c792
Merge branch 'dev2' of https://github.com/BetaSummer/haetae into dev3
MessiahJK Jul 27, 2019
338fa99
更新
Sep 18, 2019
2d7474d
添加业务码描述
Sep 19, 2019
4a53cbc
Merge branch 'dev2' of https://github.com/BetaSummer/haetae into dev3
MessiahJK Nov 30, 2019
942e78e
fix
MessiahJK Nov 30, 2019
ebe536b
新增证书管理员获取全部证书接口
radebit Feb 22, 2020
d785b21
证书管理员修复权限问题
radebit Feb 22, 2020
d47ecd6
新增四六级证书导入
radebit Feb 23, 2020
989755a
update .gitignore
radebit Feb 23, 2020
93da948
完成证书后台导入功能
radebit Feb 23, 2020
7b41032
修复比赛证书缺失,新增返回接口字段
radebit Feb 24, 2020
d6a0d42
完善管理员删除证书功能
radebit Feb 25, 2020
c53fd26
修复竞赛证书导入和删除的BUG
radebit Mar 2, 2020
d19f6d2
Merge pull request #2 from BetaSummer/dev8
radebit Mar 2, 2020
1cf1882
添加取消报名接口
Mar 5, 2020
34d2455
删除记录改为修改状态
Mar 14, 2020
541186d
Merge branch 'master' into dev7
radebit Mar 14, 2020
c352456
Merge pull request #3 from BetaSummer/dev7
radebit Mar 14, 2020
4807042
update utils->pom.xml and dev7 import
radebit Mar 15, 2020
ad84c03
提供检测活动存在接口
kana-cr Aug 14, 2020
edaa3fc
给报名人记录增添了订阅字段,新增了微信订阅工具类和微信accessToken获取工具类
kana-cr Aug 28, 2020
932ee9f
给报名人记录增添了订阅字段,新增了微信订阅工具类和微信accessToken获取工具类
kana-cr Aug 29, 2020
81c64ef
给报名人记录增添了订阅字段,新增了微信订阅工具类和微信accessToken获取工具类
kana-cr Aug 29, 2020
c1a9ceb
给报名人记录增添了订阅字段,新增了微信订阅工具类和微信accessToken获取工具类
kana-cr Aug 30, 2020
be8bdea
增添了审核发布 优化了一下accessToken的令牌过期获取(aqs锁)
kana-cr Aug 30, 2020
afca37d
再次提交
kana-cr Aug 30, 2020
64ec361
修复一个bug
kana-cr Aug 30, 2020
0d05507
合并
kana-cr Sep 6, 2020
a479689
推送证书bug修复
kana-cr Sep 24, 2020
933bcf7
新增学期列表
radebit Oct 8, 2020
eaa4771
commit
Kagantuya Oct 30, 2020
d80adda
Merge pull request #7 from kana-cr/master
radebit Oct 30, 2020
06dee9a
commit
Kagantuya Oct 30, 2020
6701bee
Merge branch 'master' into master
radebit Oct 30, 2020
1f04b6f
Merge pull request #8 from Kagantuya/master
radebit Oct 30, 2020
13aca56
修复合并后的错误
Kagantuya Oct 31, 2020
e848cb9
Merge pull request #9 from Kagantuya/master
radebit Oct 31, 2020
5e7d8ff
增加cooike
kana-cr Nov 8, 2020
cdeb874
增加cooike
kana-cr Nov 8, 2020
d4692a4
增加根据token获取对应的用户信息接口
kana-cr Nov 8, 2020
75ef479
重启活动修改为可上线
Kagantuya Nov 10, 2020
0afc090
增加@CheckLogin校验
kana-cr Nov 10, 2020
9b14fed
Merge pull request #11 from kana-cr/master
radebit Nov 10, 2020
f308fe9
增加了用户管理角色,以及增加了重置密码权限,对按照学号修改用户密码的接口进行了鉴权
kana-cr Nov 13, 2020
aa5f264
Merge pull request #12 from kana-cr/master
radebit Nov 13, 2020
359b1ae
Merge pull request #13 from Kagantuya/chest
radebit Nov 13, 2020
7944890
补充完善了手动导章功能
Kagantuya Aug 6, 2021
1aed18d
需求一:改动位置web/src/main/java/us/betahouse/haetae/controller/user/UserCon…
XDorz Sep 15, 2021
9b007db
增加一个模板下载和模板文件
XDorz Sep 19, 2021
a3a263f
6.ActivityController getActivityListByUserID 根据user_id获取该活动负责人的活动 get…
toWide Oct 2, 2021
81dce50
需求一:改动位置web/src/main/java/us/betahouse/haetae/controller/user/UserCon…
XDorz Oct 7, 2021
065dbe5
Merge remote-tracking branch 'origin/master' into dev-web
XDorz Oct 7, 2021
207c2ae
Merge branch 'dev-web' of https://github.com/BetaSummer/haetae into d…
XDorz Oct 8, 2021
96ac249
Merge branch 'dev-web' of https://github.com/BetaSummer/haetae into d…
XDorz Oct 8, 2021
f44a3e2
Merge remote-tracking branch 'origin/master' into dev-web
XDorz Oct 8, 2021
f5a23e6
需求一:改动位置web/src/main/java/us/betahouse/haetae/controller/user/UserCon…
XDorz Oct 9, 2021
c446187
添加了查询本周添加的活动
oooFLYooo Oct 10, 2021
dbb640e
更改已审批状态变为 去除approved和cancel
toWide Oct 10, 2021
033396b
Merge branch 'dev-web' of https://github.com/BetaSummer/haetae into d…
toWide Oct 10, 2021
4bc344f
修改本周活动查询条件
oooFLYooo Oct 10, 2021
6edd7a2
Merge remote-tracking branch 'haetae/dev-web' into dev-web
oooFLYooo Oct 10, 2021
9d332f5
userInfoDO添加辅导员姓名、联系方式属性
oooFLYooo Oct 11, 2021
0a40b4e
添加活动审批通过及活动驳回接口
oooFLYooo Oct 12, 2021
4a56b20
还原了userController 里的返回roleinfo部分,现在是先登录再请求路由表
XDorz Oct 12, 2021
c9bff02
添加了一个注释
XDorz Oct 13, 2021
b394cff
添加modified属性
oooFLYooo Oct 13, 2021
aa79c28
Merge branch 'master' of https://github.com/BetaSummer/haetae into de…
toWide Oct 13, 2021
72e30a9
更改活动 将活动时间改为扫章时间,更改按条件查询,更改已审批通过活动状态为多个
toWide Oct 13, 2021
4ac6f3e
更改 checklogin
toWide Oct 13, 2021
015bd87
修改活动申请,修改前判断是否已经修改过一次,如果修改过则抛出异常
oooFLYooo Oct 14, 2021
31a5156
Merge remote-tracking branch 'origin/dev-web' into dev-web
oooFLYooo Oct 14, 2021
381b269
修改添加权限后,无法导入数据,修改covert转换 userid和createrid重复问题
toWide Oct 14, 2021
01fc483
Merge remote-tracking branch 'haetae/dev-web' into dev-web
toWide Oct 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*.iws
*.iml
*.ipr
*.yml

### NetBeans ###
/nbproject/private/
Expand All @@ -26,4 +27,7 @@

### Other ###
/**/target
.logs/
logs/
/**/logs
.DS_Store
web/src/main/resources/config/application.yml
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ You by any and all Contributors for the Covered Software under Section
2.1 of this License shall terminate.

5.3. In the event of termination under Sections 5.1 or 5.2 above, all
end user license agreements (excluding distributors and resellers) which
activityTime user license agreements (excluding distributors and resellers) which
have been validly granted by You or Your distributors under this License
prior to termination shall survive termination.

Expand Down
124 changes: 124 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# 獬豸

> 獬豸(xiè zhì) haetae
中国上古十大神兽之一,能辨曲直,又有神羊之称,它是勇猛、公正的象征,是司法“正大光明” “清平公正”“光明天下”的象征

![](https://img.shields.io/badge/haetae-building-yellow.svg)

## 1. 项目背景
### 1.1 业务背景
传统纸质材料管理学生活动信息,不仅繁琐耗时,而且可能会出现管理漏洞和僵化管理的问题。haetae 用于 管理学生校园活动、志愿活动、义工活动、社会实践、党建活动等信息,希望能通过技术手段改善现状,优化管理和学生的体验。
同时能方便管理物资,通过二维码扫码的形式借用,归还/报损。借用的时候也能清楚看到物资相关信息,实现透明公开,管理员管理也十分方便。

### 1.2 技术栈&运行环境

```
maven
Java 1.8
Spring boot
Mysql
```

### 1.3 开发人员
> 参与开发人员,排名不分先后

1. [dango.yxm](https://github.com/Outside-man)
2. [Messiah.jk](https://github.com/MessiahJK)
3. [Coink.wc](https://github.com/CoinkWang)

<br/>
<br/>

---
## 2. 项目结构

### 2.1 目录结构
```
|-- biz (业务层)
|-- impl (业务逻辑实现)
|-- core (独立的业务领域核心)
|-- user (用户领域核心)
|-- activity (活动领域核心)
|-- locale (场地领域核心)
|-- asset (物资领域核心)
|-- finance (财务领域核心)
|-- organization(组织领域核心)
|-- certificate (证书领域核心)
|-- web (接口交互层)
|-- util (通用工具模块)
```


### 2.2 模块结构
module | dependency | desc
---- | ---- | ----
util | \ | 通用工具模块
core | util | 领域核心模块
biz | util core | 业务层
web | util biz core | web交互层

1. haetae-parent 管理所有子模块(除util)依赖版本.
2. util 作为基础模块,不能依赖任意其他模块,它独立管理依赖版本.
3. core 层之间模块不能互相依赖.
4. biz 层依赖所有core模块,领域交际部分在biz模块写逻辑.
5. web 层理论不会有任何业务逻辑,仅仅作为接口交互.


### 2.2 业务码使用情况
业务码是在生成唯一32位id时,4位表示业务的标识码

#### user 模块
id | desc | id | desc
---- | ---- | ---- | ----
0001 | user | 0002 | role
0003 | user role relation| 0004 | perm
0005 | role perm relation| 0006 | user perm relation
0007 | user info | 0008 | major

#### activity 模块
id | desc | id | desc
---- | ---- | ---- | ----
1001 | activity | 1002 | activity record
1003 | organization | 1004 | position record
1006 | activity entry | 1007 | activity entry record
1008 | activity blacklist

#### asset 模块
id | desc | id | desc
---- | ---- | ---- | ----
2001 | asset | 2002 | asset loan record
2003 | asset back record

#### finance 模块
id | desc | id | desc
---- | ---- | ---- | ----
3001 | finance message | 3002 | finance total

#### organization 模块
id | desc | id | desc
---- | ---- | ---- | ----
0011 | organization | 0012 | organization member relation
0013 | organization relation

#### locale 模块

id | desc | id | desc
---- | ---- | ---- | ----
4001 | locale | 4002 | locale area
4003 | locale apply ||




<br/>
<br/>

---








20 changes: 20 additions & 0 deletions biz/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,30 @@
<groupId>us.betahouse</groupId>
<artifactId>haetae-user</artifactId>
</dependency>
<dependency>
<groupId>us.betahouse</groupId>
<artifactId>haetae-finance</artifactId>
</dependency>
<dependency>
<groupId>us.betahouse</groupId>
<artifactId>haetae-organization</artifactId>
</dependency>
<dependency>
<groupId>us.betahouse</groupId>
<artifactId>haetae-asset</artifactId>
</dependency>
<dependency>
<groupId>us.betahouse</groupId>
<artifactId>haetae-activity</artifactId>
</dependency>
<dependency>
<groupId>us.betahouse</groupId>
<artifactId>haetae-certificate</artifactId>
</dependency>
<dependency>
<groupId>us.betahouse</groupId>
<artifactId>haetae-locale</artifactId>
</dependency>
</dependencies>


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package us.betahouse.haetae.serviceimpl.activity.builder;

import us.betahouse.haetae.activity.request.ActivityEntryRecordRequest;

/**
* @author zjb
* @version : ActivityEntryRecordRequestBuilder.java 2019/8/1 12:59 zjb
*/
public class ActivityEntryRecordRequestBuilder {

/**
* 报名记录id
*/
private String activityEntryRecordId;

/**
* 关联报名信息id
*/
private String activityEntryId;

/**
* 用户id
*/
private String userId;

/**
* 是否参加
*/
private Boolean isAttend;

/**
* 备注(预留)
*/
private String note;

/**
* 报名选项(预留)
*/
private String choose;

private ActivityEntryRecordRequestBuilder() {
}

public static ActivityEntryRecordRequestBuilder anActivityEntryRecordRequest() {
return new ActivityEntryRecordRequestBuilder();
}

public ActivityEntryRecordRequestBuilder withActivityEntryRecordId(String activityEntryRecordId) {
this.activityEntryRecordId = activityEntryRecordId;
return this;
}

public ActivityEntryRecordRequestBuilder withActivityEntryId(String activityEntryId) {
this.activityEntryId = activityEntryId;
return this;
}

public ActivityEntryRecordRequestBuilder withUserId(String userId) {
this.userId = userId;
return this;
}

public ActivityEntryRecordRequestBuilder withAttend(Boolean attend) {
isAttend = attend;
return this;
}

public ActivityEntryRecordRequestBuilder withNote(String note) {
this.note = note;
return this;
}

public ActivityEntryRecordRequestBuilder withChoose(String choose) {
this.choose = choose;
return this;
}

public ActivityEntryRecordRequest build() {
ActivityEntryRecordRequest activityEntryRecordRequest = new ActivityEntryRecordRequest();
activityEntryRecordRequest.setActivityEntryId(activityEntryId);
activityEntryRecordRequest.setActivityEntryRecordId(activityEntryRecordId);
activityEntryRecordRequest.setUserId(userId);
activityEntryRecordRequest.setAttend(isAttend);
activityEntryRecordRequest.setNote(note);
activityEntryRecordRequest.setChoose(choose);
return activityEntryRecordRequest;
}
}
Loading