yinzuomei
|
ad823e2ed5
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
f6f9bded04
|
最大值最小值通用dto,客户id+monthId通用dto
|
5 years ago |
wangchao
|
cef4f1ed21
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
sunyuchao
|
fa6aa48b93
|
服务升级
|
5 years ago |
|
wangchao
|
af61c7dcca
|
selectUserJoin修改
|
5 years ago |
|
sunyuchao
|
cec750ac2d
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
b760c2dfd7
|
bug修改
|
5 years ago |
zxc
|
f2e107010b
|
data-report服务升级
|
5 years ago |
|
zxc
|
9651a1ffb7
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
zhangyongzhangyong
|
b4aebf6e40
|
获取pc工作端登陆用户信息 接口变更
|
5 years ago |
|
sunyuchao
|
274e4c75e5
|
bug修改
|
5 years ago |
jianjun
|
66162d9c1c
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
3b8df373ec
|
公式计算
|
5 years ago |
|
zxc
|
0b18608e6d
|
组织树修改
|
5 years ago |
|
wangchao
|
1985fc2b8f
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
wangchao
|
8241261ff6
|
查询用户参与度时，只查询本机关的 agencyId 不查parentId，因为每一条数据都有百分比，如果用parentId查询会查出多条，求和后百分比会大于1
|
5 years ago |
|
zxc
|
2db816a362
|
data-report服务升级
|
5 years ago |
|
zxc
|
8e0f69e6a3
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
zhaoqifeng
|
9d50fecc32
|
gov-access升级
|
5 years ago |
|
zhaoqifeng
|
3d01790333
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
65d092f0f1
|
web工作端-菜单管理
|
5 years ago |
|
zxc
|
5b9a9721b4
|
先锋模范修改百分比方式
|
5 years ago |
wxz
|
2ecc5eda99
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
8754dc9352
|
归一化算法，增加基于边界值的部分值列表计算
|
5 years ago |
|
yinzuomei
|
f7045011b1
|
130服务升级
|
5 years ago |
|
yinzuomei
|
8659701f55
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
b13c07c349
|
Merge remote-tracking branch 'origin/dev_plugins' into dev_temp
|
5 years ago |
|
yinzuomei
|
ebdc8226b8
|
bug修改
|
5 years ago |
|
wangchao
|
b330c92211
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
|
5 years ago |
|
wangchao
|
4fb3f981cf
|
大屏接口修改
|
5 years ago |
|
jianjun
|
8e8c02954b
|
升级datareport
|
5 years ago |
|
jianjun
|
bef149011c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
11c3732ea1
|
data report 添加钉钉消息
|
5 years ago |
|
jianjun
|
82533f8048
|
data report 添加钉钉消息
|
5 years ago |
|
sunyuchao
|
987928b8ef
|
放行接口
|
5 years ago |
|
sunyuchao
|
cc57975b98
|
Merge branch 'dev_plugins' into dev_temp
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
5 years ago |
|
sunyuchao
|
3a5cd49e37
|
放行获取pc工作端手机号获取客户列表接口
|
5 years ago |
|
zhangyongzhangyong
|
c59b013f73
|
18、公众参与各类总数 接口开发
|
5 years ago |
|
jianjun
|
6cebb73893
|
升级datareport
|
5 years ago |
|
jianjun
|
bd7d4913da
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
e6d3cd4d44
|
暂时去掉大屏接口鉴权
|
5 years ago |
|
sunyuchao
|
b9b7968abf
|
服务升级
|
5 years ago |
|
sunyuchao
|
08086b2102
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
jianjun
|
d4fbd410a8
|
升级datareport
|
5 years ago |
|
zhangyongzhangyong
|
4334b3dd91
|
查询登陆用户客户列表（工作端） 接口修改
|
5 years ago |
|
jianjun
|
6c92421fd9
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
128dc3af00
|
暂时去掉大屏接口鉴权
|
5 years ago |
|
sunyuchao
|
3cb5fde051
|
服务升级
|
5 years ago |
|
sunyuchao
|
2da640e7fd
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
e8eb9eb58e
|
解决方法冲突
|
5 years ago |
