zxc
|
f7205c599c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
|
4 years ago |
|
zxc
|
7bcaae2934
|
街道级别代码微调
|
4 years ago |
sunyuchao
|
5d7215fcf0
|
Merge branch 'dev_notic_bug_syc' into dev_temp
|
4 years ago |
|
zxc
|
87682249bf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
|
4 years ago |
|
sunyuchao
|
de7694f05b
|
日志bug修改
|
4 years ago |
|
zxc
|
e14725ea65
|
community级别 能力指数修改
|
4 years ago |
|
sunyuchao
|
2f4337fdba
|
运营端获取小程序草稿箱接口设置按草稿创建时间降序
|
4 years ago |
jianjun
|
b1c42d3bbe
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
1656ce8f68
|
bug
|
4 years ago |
|
sunyuchao
|
4363bba734
|
Merge branch 'dev_notic_bug_syc' into dev_temp
|
4 years ago |
|
sunyuchao
|
0933e20a74
|
活动。通知用户已读未读状态取VIEW_DETAIL字段值，组长看未读人数取READ_FLAG字段值
|
4 years ago |
|
jianjun
|
fe87ae2e5e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
# 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/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
|
25d4987a95
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
c5e6262187
|
本级和下级分数 保留一位小数
|
4 years ago |
|
zxc
|
d8c32d1824
|
全区能力指数修改
|
4 years ago |
|
sunyuchao
|
d2ed5b35f2
|
Merge branch 'dev_notic_bug_syc' into dev_temp
|
4 years ago |
|
sunyuchao
|
a86aaae641
|
bug修改
|
4 years ago |
zhaoqifeng
|
431d93a549
|
Merge branch 'dev_group_point' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
0a2fcd9de2
|
成就轮播修改
|
4 years ago |
|
zhaoqifeng
|
c434ad6a9c
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
|
jianjun
|
33ce7ee4f5
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
6f5c7b5375
|
特殊处理下%d
|
4 years ago |
|
zxc
|
1045eedced
|
street级别 能力指数修改
|
4 years ago |
|
sunyuchao
|
ab056ec6c0
|
wxcode获取微信信息接口添加日志
|
4 years ago |
|
jianjun
|
6f72eb8d9f
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
48103d32f8
|
平均值数量 不格式化
|
4 years ago |
|
jianjun
|
7fd907f093
|
少一个网格
|
4 years ago |
|
jianjun
|
6dbad74c44
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
83de4c20d8
|
得分说明 保留分数保留一位小数，权重保留整数
|
4 years ago |
yinzuomei
|
776e86aa4a
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
4 years ago |
|
yinzuomei
|
bdabd15c34
|
网格相关、区直部门相关，指标计算，改为以screen_customer_grid、screen_customer_dept为主表。当前部门或网格没有原始指标值时，赋值为0
|
4 years ago |
|
sunyuchao
|
c14e069f77
|
居民端个人中心修改手机号操作必须是居民才可以
|
4 years ago |
|
zhaoqifeng
|
2ff3e1fa6f
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
ea6d23f43d
|
结案项目满意度抽取
|
4 years ago |
|
zhaoqifeng
|
63a5c4d120
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
66ccfbc41f
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
|
jianjun
|
6792d0adda
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
4fddf998fb
|
得分说明 保留分数保留一位小数，权重保留整数
|
4 years ago |
|
yinzuomei
|
1c8c137bff
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
|
4 years ago |
|
yinzuomei
|
284b6e08f1
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev
|
4 years ago |
|
yinzuomei
|
513dd6fdef
|
暂存
|
4 years ago |
|
zhaoqifeng
|
5045c664b2
|
基层治理-组织的治理指数，按天统计
|
4 years ago |
wxz
|
d591423871
|
Merge branch 'dev_party_group_discuss' into dev_temp
|
4 years ago |
|
wxz
|
3fa874a0ba
|
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 |
|
zxc
|
17eaf21880
|
【事件分析】效率分析 排序修改
公众参与各组织排序修改
|
4 years ago |
|
wxz
|
298c51095d
|
Merge branch 'dev_fix_dim' into dev_temp
|
4 years ago |
|
wxz
|
9fe9e3f89a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim
|
4 years ago |
|
wxz
|
a03da0bc1d
|
解决业务库的数据del_flag=1之后，统计库的维度表del_flag无法同步改字段的问题
|
4 years ago |
|
jianjun
|
4d6cbf0900
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
636fbfd30f
|
开发测试机器人地址修改
|
4 years ago |
