yinzuomei
|
5c3f6d28bc
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
5 years ago |
|
yinzuomei
|
ddc38610ba
|
网格内按分类统计项目数量 start
|
5 years ago |
|
yinzuomei
|
27dcd06da9
|
项目分类信息抽取到指标库level赋值修改
|
5 years ago |
liushaowen
|
ef551f3eeb
|
项目分类信息抽取到指标库
|
5 years ago |
|
yinzuomei
|
6e388b3559
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
yinzuomei
|
8bbbbc2610
|
项目分类统计sql
|
5 years ago |
zhangyongzhangyong
|
5788866066
|
项目分类字典上报
|
5 years ago |
|
zhangyongzhangyong
|
c548c5b4de
|
《002、项目分类字典查询》接口开发
|
5 years ago |
|
yinzuomei
|
d9aa877787
|
增加level
|
5 years ago |
|
yinzuomei
|
f449c11466
|
新增fact_origin_project_category_daily
|
5 years ago |
|
yinzuomei
|
6702899ec7
|
网格内、组织内项目分类统计项目数量采集API调整， 大屏事件类型分析查询接口调整
|
5 years ago |
|
yinzuomei
|
bcc48ba11d
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
yinzuomei
|
0d55115691
|
项目分类字典抽取到指标库
|
5 years ago |
sunyuchao
|
a4b49c3ba9
|
方法体新增
|
5 years ago |
|
sunyuchao
|
5be7fdea0e
|
议题项目分类db调整引起的代码逻辑调整
|
5 years ago |
|
sunyuchao
|
59ae4e2384
|
议题、项目分类、标签db调整引起的变化
|
5 years ago |
wangchao
|
1bf9832258
|
1、大屏项目采集分类显示上级分类用-连接，多个分类用,分割
2、议题转项目V2接口发送积分事件
|
5 years ago |
|
sunyuchao
|
1d16f90d3e
|
议题项目分类旧程序逻辑调整
|
5 years ago |
|
sunyuchao
|
4bea3bf5d9
|
Merge branches 'dev' and 'dev_issue_category' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_category
Conflicts:
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
5 years ago |
|
yinzuomei
|
820e8dc642
|
按天抽取暂时注释：screenProjectSettleService.extractScreenData
|
5 years ago |
|
wangchao
|
a983cbaa8f
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
5182ba8f63
|
难点赌点生成项目话题Map时遇到同样的key覆盖上一个
|
5 years ago |
|
yinzuomei
|
a4973694e6
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
|
5 years ago |
|
yinzuomei
|
4a564833ae
|
NumConstant
|
5 years ago |
|
yinzuomei
|
9d0a709127
|
Merge branches 'dev' and 'dev_pyscreenv2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreenv2
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
|
5 years ago |
|
yinzuomei
|
10041622ea
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
wangchao
|
9d678266b3
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
45df6641eb
|
screenProjectData
|
5 years ago |
zxc
|
187a0fa452
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
wangchao
|
10c5545420
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_badge_log_20210315
|
5 years ago |
|
wangchao
|
e6a74e72ac
|
用户注册党员连带认证居民时先插入register_relation再更新缓存
|
5 years ago |
|
zxc
|
c677cabeba
|
徽章bug测试
|
5 years ago |
|
wangchao
|
a9417d05ae
|
Merge branch 'dev_bugfix_user_cache' into dev_temp
|
5 years ago |
|
wangchao
|
342715a9f9
|
用户缓存信息查找注册记录传入customerId
|
5 years ago |
|
yinzuomei
|
9d2fdf2f54
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
yinzuomei
|
d6159da682
|
merge
|
5 years ago |
|
yinzuomei
|
37087387cd
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
|
5 years ago |
|
yinzuomei
|
093e33c22a
|
数据采集添加通用参数校验
|
5 years ago |
|
yinzuomei
|
8595a1d688
|
安宁数据采集接口添加验证
|
5 years ago |
|
zxc
|
9c9ca2e643
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
zxc
|
62e68b5d23
|
徽章bug测试
|
5 years ago |
|
zxc
|
684e4d458d
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
zxc
|
68817f0770
|
徽章bug测试
|
5 years ago |
|
sunyuchao
|
8fa4320419
|
Merge branch 'dev_add_customer_id' into dev_temp
|
5 years ago |
|
sunyuchao
|
f1ffb73dd9
|
居民端首页设置 customer_home_detail表客户Id未赋值情况
|
5 years ago |
wxz
|
e0e4e74e04
|
Merge branch 'dev_add_customer_id' into dev_temp
|
5 years ago |
|
wxz
|
bec8d7e9c3
|
saveconfig和saveroleopes接口，增加customerId
|
5 years ago |
|
zxc
|
5bf7be71c5
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
zxc
|
5b9a756015
|
徽章信息插入加log日志
|
5 years ago |
|
zxc
|
8c5ffb9209
|
徽章信息插入加log日志
|
5 years ago |
