yinzuomei
|
d69f0fb6d8
|
Merge remote-tracking branch 'origin/dev_partybranch' into dev
|
5 years ago |
|
yinzuomei
|
9346840da4
|
Merge branches 'dev', 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
yinzuomei
|
f31d561956
|
支部管理v2bug修改
|
5 years ago |
wxz
|
6360142fee
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
71bb0961c3
|
1.新增维度ID生成工具类
|
5 years ago |
jianjun
|
65629d13ca
|
分页获取客户id方法
|
5 years ago |
yinzuomei
|
6fc1d5fc53
|
user59
|
5 years ago |
|
jianjun
|
209471a0d1
|
添加根据客户id获取网格数据方法
|
5 years ago |
|
yinzuomei
|
9b4c71a6a7
|
Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
|
5 years ago |
|
yinzuomei
|
a91bbe819d
|
<module>data-report</module>重复
|
5 years ago |
|
yinzuomei
|
6b4ed2ffb0
|
Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
|
5 years ago |
|
yinzuomei
|
edfff95989
|
支部管理v2漏题
|
5 years ago |
|
yinzuomei
|
1168041aec
|
支部管理v2
|
5 years ago |
wangchao
|
a975e2ee2c
|
数据统计
|
5 years ago |
|
jianjun
|
83b9fbb204
|
生成宣传能力对应的类
|
5 years ago |
zxc
|
d241208020
|
网格小组日统计补漏
|
5 years ago |
|
zxc
|
a29faa6983
|
网格小组日统计补漏
|
5 years ago |
sunyuchao
|
fa0525804a
|
数据-项目-机关日统计部分代码提交
|
5 years ago |
|
wxz
|
dd433cfe8f
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
Conflicts:
epmet-module/data-statistical/data-statistical-server/pom.xml
|
5 years ago |
|
wxz
|
62a26d92fe
|
1.修复错误
|
5 years ago |
|
zxc
|
a668d5a7a2
|
网格小组日统计
|
5 years ago |
|
wangchao
|
d402ef92b6
|
方法加override
|
5 years ago |
|
wangchao
|
624c36ead3
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDemoService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
|
5 years ago |
|
wangchao
|
270d59862c
|
cascadegencyinfo,级联查出下级机关信息
|
5 years ago |
|
wxz
|
ea5522a652
|
1.新增客户，部门，按月维度的初始化
|
5 years ago |
|
yinzuomei
|
363a1911db
|
支部管理v1
|
5 years ago |
|
wxz
|
0f9cba9e12
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
193560dcd6
|
1.新增：机关单位维度初始化
|
5 years ago |
|
jianjun
|
99ce197cc2
|
配置gov_voice数据库
|
5 years ago |
|
zxc
|
157c09ec11
|
宣传能力模块sql
|
5 years ago |
|
wxz
|
6eefa8bbb2
|
Merge branches 'dev' and 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
37572a4da7
|
1.新增data-report服务
2.修改data-statistical服务，增加Dockerfile，deploy等文件，修改错误的pom配置
|
5 years ago |
|
wxz
|
b81efa3fc7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
wxz
|
1c14c14b84
|
1.添加客户，给客户初始化角色的时候，同时初始化角色的操作列表和范围列表
2.查询一个角色权限的时候，不再同时查询默认表和配置表，改为只查询配置表
|
5 years ago |
|
jianjun
|
e86b68d751
|
党建声音部署-文章精简内容显示 。。。
|
5 years ago |
|
jianjun
|
94e0b3f2bf
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
177bd20055
|
版本号+1
|
5 years ago |
|
jianjun
|
86491ef62c
|
Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
|
5 years ago |
|
jianjun
|
fa05e21e60
|
文章简要内容拼接...
|
5 years ago |
|
yinzuomei
|
6d0f3788c7
|
resi-partymember：新增party_branch_members,partymember_auth_record
|
5 years ago |
|
yinzuomei
|
1309a43973
|
gov-org新增党支部信息，代码生成
|
5 years ago |
|
jianjun
|
551b535f0c
|
党建声音部署-标签初始化代码及标签kredis key调整
|
5 years ago |
|
wxz
|
ac0b0a02ba
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
75d5d7ae43
|
1.增加网格维度初始化
|
5 years ago |
|
jianjun
|
6be724ba2c
|
版本号+1
|
5 years ago |
|
jianjun
|
bd4f558ed4
|
Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
|
5 years ago |
|
jianjun
|
d698569ce4
|
标签key统一到redisKeys中
|
5 years ago |
|
wxz
|
dfa7e3d7b2
|
1.DimController重命名
|
5 years ago |
|
wxz
|
197d73e31f
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
297a136e84
|
1.按日维度初始化完成
|
5 years ago |
