sunyuchao
|
c972cb7774
|
Merge branch 'dev'
|
4 years ago |
zhaoqifeng
|
8c14aa3fc8
|
Merge branch 'dev_point_rank_bugfix' into dev
|
4 years ago |
|
zhaoqifeng
|
21e5d95b4c
|
小组成员积分排行bug修改
|
4 years ago |
yinzuomei
|
12bcd65af0
|
平阴大屏网格员数，新增一列。脚本上传
|
4 years ago |
zxc
|
54ae4f9ec7
|
街道：注册党员数、网格数、网格员数查询字段修改
|
4 years ago |
|
zxc
|
e3e5fce2fb
|
中央区事件分析-项目分布修改查询时间
|
4 years ago |
|
zxc
|
61942ef747
|
红黄绿事件修改查询时间，统一改为查询一个月
|
4 years ago |
jianjun
|
9dbbbf1cd6
|
查询先进**排行 关联组织
|
4 years ago |
|
jianjun
|
f3c03897b9
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
4 years ago |
|
jianjun
|
49304c1c0d
|
查询先进排行关联组织
|
4 years ago |
|
zhaoqifeng
|
6886ffd0ad
|
党员先锋-下级组织排行修改
|
4 years ago |
|
jianjun
|
f605590fa8
|
查询先进排行关联组织
|
4 years ago |
wxz
|
fee63064d9
|
版本升级
|
4 years ago |
|
wxz
|
5432fffc04
|
Merge branch 'dev_fix_dim'
|
4 years ago |
|
wxz
|
7280c167f0
|
Merge branches 'dev' and 'dev_fix_dim' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim
|
4 years ago |
|
wxz
|
9846a04006
|
修复：agency,grid,dept的del_flag改为1的时候，指标库的相关维度表不更新del_flag的问题
|
4 years ago |
|
zxc
|
96dd6b945f
|
红黄绿事件修改
|
4 years ago |
|
zxc
|
ec88b107f4
|
streetdetail-py
红黄绿事件
|
4 years ago |
|
jianjun
|
93c9d33072
|
查询下级等级指标分数关联组织
|
4 years ago |
|
jianjun
|
8668d94b76
|
查询下级等级指标分数关联组织
|
4 years ago |
|
jianjun
|
f84f78e8fd
|
查询下级等级指标分数关联组织接口错误
|
4 years ago |
|
wxz
|
e8c0153acb
|
版本升级
|
4 years ago |
|
wxz
|
bcb8b1b42a
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
a536f16146
|
Merge branches 'dev' and 'dev_party_group_discuss' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_party_group_discuss
|
4 years ago |
|
jianjun
|
49c461ecee
|
查询下级等级指标分数关联组织
|
4 years ago |
|
zhaoqifeng
|
8311d35774
|
小组积分排行bug修改
|
4 years ago |
|
wxz
|
ee7c8038ca
|
Merge branches 'dev' and 'dev_fix_dim' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim
|
4 years ago |
|
jianjun
|
1de35ecc5c
|
网格级的保留小数
|
4 years ago |
|
jianjun
|
bb440a72e8
|
本级及下级分数保留一位小数返回
|
4 years ago |
|
yinzuomei
|
c6c1f05d8b
|
/data/stats/screencoll/usertotaldata新增gridMemberTotal
|
4 years ago |
|
yinzuomei
|
53982e3023
|
/resi/group/topic/getlatestv2空指针修改
|
4 years ago |
|
yinzuomei
|
0b1c84c089
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
948eb789f5
|
组内近十条消息
|
4 years ago |
|
jianjun
|
d21fc7bf3f
|
保留小数处理
|
4 years ago |
|
zhaoqifeng
|
6e5b67eff9
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
|
sunyuchao
|
ea1945336d
|
bug修改
|
4 years ago |
|
jianjun
|
4cc170e377
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_third_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
|
4 years ago |
|
sunyuchao
|
5bd44b8f84
|
解决缓存中user的showname和组员member中usershowname没值的问题
|
4 years ago |
|
sunyuchao
|
8df3698896
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
714375e75f
|
解决缓存中user的showname和组员member中usershowname没值的问题
|
4 years ago |
|
zhaoqifeng
|
fd6989e4ff
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
|
yinzuomei
|
8745b52bf0
|
组织层级治理指数table语句，取消注释。
|
4 years ago |
|
jianjun
|
e813d2ec3e
|
空指针-上线
|
4 years ago |
|
jianjun
|
c66eb2b715
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
6dd54db032
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
94df654ce7
|
空指针
|
4 years ago |
|
jianjun
|
dc82133696
|
空指针
|
4 years ago |
|
jianjun
|
3bfcc2e960
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
50eae57f37
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
a74b652378
|
代码微调
|
4 years ago |
