wangchao
|
ed4a5f8c53
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
zxc
|
642a160d05
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zxc
|
1b9b66c89d
|
add网格修改
|
5 years ago |
wxz
|
13f9eb7c28
|
修复错误的FeignClient提交
|
5 years ago |
|
zxc
|
2855f69248
|
add网格修改
|
5 years ago |
|
wxz
|
c394a96217
|
Merge branches 'dev' and 'dev_footbar' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_footbar
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
wangchao
|
0d96028f19
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wxz
|
52d51c432d
|
Merge branch 'dev' into dev_screen_data
|
5 years ago |
|
wxz
|
bcab3028c6
|
修改误提交的FeignClient
|
5 years ago |
|
wxz
|
8766b5642b
|
修改秘钥重置功能，重置db的同时会删除redis中对应的key
|
5 years ago |
|
zxc
|
e89ef5bbce
|
youhua
|
5 years ago |
|
wxz
|
bae12d716b
|
Merge branch 'dev' into dev_externalappauth
|
5 years ago |
jianjun
|
9f73a61cfb
|
添加分数子表
|
5 years ago |
|
jianjun
|
743df9757b
|
去掉一条时给50分
|
5 years ago |
|
jianjun
|
df55e4a6cf
|
将计算结果抽取到 大屏相关数据表
|
5 years ago |
sunyuchao
|
aabec7cfb1
|
Merge branches 'dev' and 'dev_customize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_customize
|
5 years ago |
zhangyongzhangyong
|
b60c2a2d4c
|
将数据抽取到 指数-指数数据(每月数值) 指数-指数数据(按年统计)，接口修改
|
5 years ago |
|
sunyuchao
|
16141cf873
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
sunyuchao
|
c2cca237b2
|
bug修改 关于定制功能顺序不对的问题
|
5 years ago |
|
wxz
|
ab7314466f
|
pom文件增加local配置，用于开发机器调试用
|
5 years ago |
|
jianjun
|
39071e137b
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
30e3dea461
|
计算5级明细指标
|
5 years ago |
|
sunyuchao
|
178ea2f7b5
|
带奇峰修改:党员自动认证失败 详情中值错误问题
|
5 years ago |
|
wangchao
|
b3d5e275fa
|
积分修改
|
5 years ago |
|
zxc
|
c46d36ab0d
|
社区相关优化
|
5 years ago |
yinzuomei
|
4a9b734ceb
|
市北大屏数据采集修改名字
|
5 years ago |
|
zhangyongzhangyong
|
2d01a8faaf
|
04、事件数据 - 图片，修改为批量删除、新增。
02、党建能力-网格相关指标上报，接口入参格式修改
|
5 years ago |
|
jianjun
|
3411d59e6b
|
添加计算指标code
|
5 years ago |
|
jianjun
|
883b33208a
|
添加计算指标code
|
5 years ago |
|
yinzuomei
|
286f501da3
|
大屏采集通用入参
|
5 years ago |
|
yinzuomei
|
bab924b17d
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
76249a1abc
|
KcScreenCollController
|
5 years ago |
|
zxc
|
e250d40cf5
|
communityScore文件挪动，gridScore合并
|
5 years ago |
|
sunyuchao
|
c022bfa2dd
|
解决sql脚本版本号冲突问题
|
5 years ago |
|
jianjun
|
04f6c16f45
|
添加计算指标
|
5 years ago |
|
jianjun
|
c2d6eecf38
|
添加计算指标
|
5 years ago |
|
jianjun
|
ba605db6d8
|
添加计算指标
|
5 years ago |
|
jianjun
|
c814479931
|
添加allParentIndexCode
|
5 years ago |
|
jianjun
|
7ff481c5b2
|
指标计算返回明细分数值
|
5 years ago |
|
zxc
|
1c77abf703
|
删除错误输出
|
5 years ago |
|
zxc
|
2a1674c13b
|
指标计算优化
|
5 years ago |
|
zhangyongzhangyong
|
c1e8b0f102
|
补充提交(恢复 feignClient文件内容)
|
5 years ago |
|
zhangyongzhangyong
|
b109e1ceaa
|
指标采集、大屏数据采集，所有接口，入参修改；
表数据删除，方式修改
|
5 years ago |
|
jianjun
|
f5585b4d89
|
Revert "去除 parent_agency_id字段，communityScore和agencyScore"
This reverts commit d650ef19
|
5 years ago |
|
zxc
|
d650ef1997
|
去除 parent_agency_id字段，communityScore和agencyScore
|
5 years ago |
|
sunyuchao
|
d62a760ffc
|
小程序获取定制功能列表接口调整为一个接口
|
5 years ago |
|
zxc
|
7aba68f0db
|
AVG修改
|
5 years ago |
|
wangchao
|
507594a1cd
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
zhangyongzhangyong
|
bbb4bdf762
|
支持跨年
|
5 years ago |
|
wangchao
|
cbcc5d809d
|
大屏接口，查询机关结构从请求头中获取客户Id，如果为空则默认为市北大屏的数据。
|
5 years ago |
