wangchao
|
728b9d665b
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
wangchao
|
e12e6071b4
|
大屏接口调整：
->默认查询上个月以及默认查询截至上个月的数据，改成默认查询本月以及默认查询截至本月的数据；
->先进排行榜单-先进组织，根据agenyId查询下级机关排行，当前机关为社区时，查询网格排行；
->先进排行榜单-先进党员，查询所属机关ORG_ID为当前机关Id的党员排行情况;
->政府治理能力榜单，查询本机机关的下级机关，当前机关为社区时，查询网格排行。
|
5 years ago |
wxz
|
768eec9b7a
|
新增工作人员调动的权限枚举
|
5 years ago |
zxc
|
ee11c50ac9
|
data-report服务升级
|
5 years ago |
|
zxc
|
4e666ebfdb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zxc
|
1a0c352156
|
事件
|
5 years ago |
zhangyongzhangyong
|
00e7f6e626
|
statistical服务升级
|
5 years ago |
|
zhangyongzhangyong
|
df0d5e4ca7
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
5c9658ddc8
|
11、基层治理-公众参与 接口平均率计算修改
|
5 years ago |
|
zxc
|
efa762b40a
|
data-report服务升级
|
5 years ago |
|
zxc
|
5ed69f4e85
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zxc
|
b835e8a888
|
党员分布、用户分布、月度指数-柱状图
|
5 years ago |
|
wxz
|
e44dbca94c
|
Merge branch 'dev' into dev_plugins
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
|
5 years ago |
|
zxc
|
f0d7b29aa1
|
data-report服务升级
|
5 years ago |
|
zxc
|
643d9f3a1b
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
|
5 years ago |
|
zxc
|
6927d0c73b
|
月度指数分析-柱状图 customerId写死
|
5 years ago |
yinzuomei
|
94f0f7716e
|
getDetailListByParentCode sql修改
|
5 years ago |
|
wxz
|
6a324d9f13
|
版本升级
|
5 years ago |
sunyuchao
|
cf29024994
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
wxz
|
2bc1dfcbc5
|
Merge branch 'dev' into dev_temp
|
5 years ago |
|
sunyuchao
|
2a90995608
|
居民信息提交验证码非必填
|
5 years ago |
jianjun
|
c9fa62cc8b
|
获取要计算的指标明细权重
|
5 years ago |
|
wxz
|
9395002daa
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
50c45048fc
|
detail添加code
|
5 years ago |
|
zxc
|
e1a3cb3ccb
|
data-report服务升级
|
5 years ago |
|
zxc
|
51ed0f6bb6
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zxc
|
362a930c47
|
组织树修改
|
5 years ago |
|
wxz
|
8d110d85e8
|
Merge branch 'dev' into dev_screen_data
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
|
5 years ago |
|
wxz
|
2670d36a01
|
将dev环境的nacos，由作梅的阿里云服务器改为130:8848端口，并且附带白名单校验，只有130和132的服务可以注册到nacos，其他机器一律403
|
5 years ago |
|
wangchao
|
242e5d3ad1
|
ext govorg user +1
|
5 years ago |
|
wangchao
|
d97ea7454b
|
Merge remote-tracking branch 'origin/dev_plugins' into dev_temp
|
5 years ago |
|
wangchao
|
6be7a5b8b5
|
EXT staffInfo staffPermission接口修改
|
5 years ago |
|
wxz
|
c2fdea8976
|
删除多余代码
|
5 years ago |
|
wxz
|
926d02a15d
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
445fb28380
|
优化的批量分支计算
|
5 years ago |
zhaoqifeng
|
68cc674df6
|
gov-project升级
|
5 years ago |
|
zhaoqifeng
|
b793df0f11
|
Merge branch 'dev' into dev_temp
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/pom.xml
|
5 years ago |
|
zhaoqifeng
|
f2c16f3c2f
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
zhaoqifeng
|
5092b453fe
|
项目详情-跟进部门修改
|
5 years ago |
|
jianjun
|
3538826d9d
|
获取要计算的指标明细权重
|
5 years ago |
|
sunyuchao
|
04a92414bc
|
旧接口改造 服务升级
|
5 years ago |
|
sunyuchao
|
caa0ce5d90
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
941b7ae0d7
|
旧接口根据客户Id查询客户详情接口添加返参logo
|
5 years ago |
|
wxz
|
daf684d800
|
版本升级
|
5 years ago |
|
yinzuomei
|
ecf475b6a0
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
e7866cd5f1
|
暂存
|
5 years ago |
|
wangchao
|
43f1ac9665
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
d9b2ee27d0
|
data-report 版本号+1
|
5 years ago |
|
zhangyongzhangyong
|
477649df03
|
statistical 服务升级
|
5 years ago |
|
wangchao
|
d42cc796d2
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
