jianjun
|
ae92d5d234
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
jianjun
|
e8573f8ca1
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
49c461ecee
|
查询下级等级指标分数关联组织
|
4 years ago |
zhaoqifeng
|
c1141ee0ee
|
Merge branch 'dev_point_rank_bugfix' into dev_temp
|
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
|
b518285651
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
1de35ecc5c
|
网格级的保留小数
|
4 years ago |
|
jianjun
|
8934db060e
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
bb440a72e8
|
本级及下级分数保留一位小数返回
|
4 years ago |
yinzuomei
|
c6c1f05d8b
|
/data/stats/screencoll/usertotaldata新增gridMemberTotal
|
4 years ago |
zxc
|
948eb789f5
|
组内近十条消息
|
4 years ago |
|
jianjun
|
a047fed6c6
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
d21fc7bf3f
|
保留小数处理
|
4 years ago |
|
zhaoqifeng
|
29f60c8908
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
6e5b67eff9
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
sunyuchao
|
fc240f94da
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
sunyuchao
|
ea1945336d
|
bug修改
|
4 years ago |
|
jianjun
|
82c5dfc7f3
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
# Conflicts:
# 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 |
|
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
|
3d263217f5
|
Merge branch 'dev_bug_usershowname_syc' into dev_temp
|
4 years ago |
|
sunyuchao
|
714375e75f
|
解决缓存中user的showname和组员member中usershowname没值的问题
|
4 years ago |
|
zhaoqifeng
|
fd6989e4ff
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
|
yinzuomei
|
8745b52bf0
|
组织层级治理指数table语句，取消注释。
|
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
|
50eae57f37
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
a74b652378
|
代码微调
|
4 years ago |
|
jianjun
|
6524ec2be0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7d5ebc0421
|
正负相关一直没起作用的bug
|
4 years ago |
|
zxc
|
de2114f00b
|
Merge branch 'dev_0521yzm' into dev_temp
|
4 years ago |
|
yinzuomei
|
618e2890ce
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev
|
4 years ago |
|
zxc
|
eb2c4d9fa1
|
项目来源是议题的在执行新逻辑
|
4 years ago |
|
yinzuomei
|
07a908247c
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev
|
4 years ago |
|
jianjun
|
a7c508b16a
|
日志打印错误
|
4 years ago |
|
zhaoqifeng
|
d2d80cc775
|
Merge branch 'dev_staff_transfer_bugfix' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
a3a51074a4
|
工作人员调动bug修改
|
4 years ago |
|
yinzuomei
|
a05358b94c
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
|
4 years ago |
|
jianjun
|
e4d8e69ab2
|
部门总分和下级 计算错误
|
4 years ago |
|
yinzuomei
|
fe65d9e3b9
|
去其他网格看看，bug修改测试
|
4 years ago |
|
zhaoqifeng
|
4b0c913729
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
|
yinzuomei
|
41c173b711
|
暂存一下
|
4 years ago |
|
jianjun
|
1679db8620
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
cd34ec78f6
|
取之错误修改
|
4 years ago |
|
sunyuchao
|
06ff14e103
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
sunyuchao
|
a7501bd188
|
遗漏修改点
|
4 years ago |
|
jianjun
|
6f86840107
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
f7d78efa1d
|
判断调整
|
4 years ago |
|
jianjun
|
cf23c6ec40
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
