jianjun
|
a1fd29d2c4
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jianjun
|
9d0fdef91b
|
按日部门统计
|
5 years ago |
|
jianjun
|
090bf3fed3
|
按日部门统计
|
5 years ago |
zhaoqifeng
|
d1c1cf8259
|
机关议题日统计
|
5 years ago |
sunyuchao
|
c5d0299961
|
数据-项目-机关日、月统计-部分代码提交
|
5 years ago |
|
sunyuchao
|
93faf6d43e
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
sunyuchao
|
c6489e4d08
|
数据-项目-机关月统计-部分代码提交
|
5 years ago |
wxz
|
59a9694d5f
|
1.解决冲突
|
5 years ago |
|
wxz
|
9527951fe6
|
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/src/main/java/com/epmet/controller/DimController.java
|
5 years ago |
|
wxz
|
ec4d5f11af
|
1.新增按季度维度生成
|
5 years ago |
|
jianjun
|
2aa5532b36
|
按日统计文章总数
|
5 years ago |
|
jianjun
|
dbbcda5fd1
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jianjun
|
db753a8c01
|
添加日志及修改sql错误
|
5 years ago |
wangchao
|
1d57419d0f
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/pom.xml
|
5 years ago |
|
wangchao
|
e44bc02046
|
机关维度
|
5 years ago |
|
jianjun
|
0247505e40
|
添加获取周Id的方法
|
5 years ago |
yinzuomei
|
db1196ebd0
|
支部管理联调1
|
5 years ago |
|
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 |
