jianjun
|
9ca5a6880c
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
zxc
|
254aa70959
|
网格分类统计修改
|
4 years ago |
|
zxc
|
956d31e5f8
|
直接立项的查询修改
|
4 years ago |
yinzuomei
|
c299162892
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e3fb8b5ae7
|
ScreenProjectSettleService.extractScreenData新增origin,categoryCode.顺便改了下orgName。来源于议题的存储网格名，来源于事件和立项的都存储的是project.agencyId对应的组织名称
|
4 years ago |
|
yinzuomei
|
01d1bdf007
|
/project/uploadprojectinfo,3个街道上传入参新增categoryCode，值为项目在其客户中的编码。
|
4 years ago |
|
yinzuomei
|
b65aa5d871
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
d28dc9fdd4
|
测试
|
4 years ago |
|
yinzuomei
|
fa9ee7e21e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
4f47c6607d
|
难点堵点分类编码和名称bugfix，extractProjectCategory修改
|
4 years ago |
|
yinzuomei
|
f6aff9a2ac
|
screen_project_data分类名称、项目分类id接口调整。
|
4 years ago |
|
yinzuomei
|
a9b81d7f66
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
zxc
|
31489e3425
|
customerId限制
|
4 years ago |
|
yinzuomei
|
7446dfb399
|
screen_project_xx表手动调用方法试试
|
4 years ago |
|
yinzuomei
|
30e8711868
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
32420502c5
|
fact_origin_project_category_daily抽取逻辑修改下
|
4 years ago |
wxz
|
4bf11bee15
|
Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
yinzuomei
|
078448b60b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
d70f783f35
|
议题转项目发送消息bug修改
|
4 years ago |
|
wxz
|
bf0b9dfc63
|
修改：
1.CpAuthGatewayFilter的逻辑抽取为单独的类，增加针对此filter的异常拦截
|
4 years ago |
|
zxc
|
afbc6d372a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
aa53150f6a
|
放重复提交
|
4 years ago |
zhaoqifeng
|
33754bf219
|
治理能力排行日统计单独接口
|
4 years ago |
|
jianjun
|
4a87c755a9
|
添加参数
|
4 years ago |
|
jianjun
|
823d61a84a
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
da2cc68966
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
1925028256
|
无所谓的判断
|
4 years ago |
|
zxc
|
5c8dd2d460
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
64114c4163
|
分母为零bug修复
|
4 years ago |
|
jianjun
|
d2938f390a
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
756512a24e
|
错啦
|
4 years ago |
|
jianjun
|
bedb4326d3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
3a8c954f37
|
这个不能动
|
4 years ago |
|
jianjun
|
b7294651aa
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
991e1dd873
|
用户统计报错 添加线程
|
4 years ago |
|
jianjun
|
e66a8eeaeb
|
用户统计报错 添加线程
|
4 years ago |
|
yinzuomei
|
01c54ce593
|
146,工作日志数据采集，url开方
|
4 years ago |
|
jianjun
|
dc88c7011a
|
用户统计报错 日志打印错误
|
4 years ago |
|
jianjun
|
03989aa9b1
|
超时配置10分钟 上线
|
4 years ago |
|
jianjun
|
e25d30cf2c
|
Revert "超时配置10分钟"
This reverts commit d1820854
|
4 years ago |
|
jianjun
|
d182085408
|
超时配置10分钟
|
4 years ago |
|
wxz
|
0ddf9f91e2
|
Merge branch 'wxz_senseless_deploy' into dev
|
4 years ago |
|
jianjun
|
b580d6adac
|
Revert "暂时住掉代码 跑下任务后再回复回来"
This reverts commit c7255c6e
|
4 years ago |
|
jianjun
|
c61aad2f94
|
Revert "暂时住掉代码 跑下任务后再回复回来2"
This reverts commit ae986f44
|
4 years ago |
|
jianjun
|
ae986f44c7
|
暂时住掉代码 跑下任务后再回复回来2
|
4 years ago |
|
jianjun
|
c7255c6e55
|
暂时住掉代码 跑下任务后再回复回来
|
4 years ago |
|
jianjun
|
258145ce55
|
治理排行保留历史数据bug 修改
|
4 years ago |
|
jianjun
|
76b5437da3
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
ea7a2e0492
|
job延长等待时长 10分钟
|
4 years ago |
|
jianjun
|
b6f70d94f2
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
