zxc
|
c73fd60ae1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3186b286cc
|
删除多余代码
|
4 years ago |
|
zxc
|
63ed47884d
|
统计事件
|
4 years ago |
|
zxc
|
66eee3a2f5
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
|
4 years ago |
|
zxc
|
f7b756d15e
|
添加日志
|
4 years ago |
|
zxc
|
8b0dfac4f2
|
缓存获取议题表决信息方法修改
|
4 years ago |
yinzuomei
|
85d9f6639c
|
calCpcIndexService.calCpcPartyAbility，党员相关党建能力指标抽取，放开代码
|
4 years ago |
jianjun
|
b1a81526e8
|
党建声音支持视频上传 不限格式只限制是视频
|
4 years ago |
|
jianjun
|
f24296e141
|
org删除无用 redis类
|
4 years ago |
|
jianjun
|
fca309c70b
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e196dfcad8
|
难点堵点bug
|
4 years ago |
|
jianjun
|
d5d5379500
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
fd417f7101
|
统一抽取接口 添加参数 方便部分抽取以及难点堵点bug
|
4 years ago |
|
jianjun
|
a98ffa1469
|
Revert "话题 议题 项目 重新跑 需撤回"
This reverts commit 3a7134a1
|
4 years ago |
|
jianjun
|
3a7134a147
|
话题 议题 项目 重新跑 需撤回
|
4 years ago |
|
jianjun
|
2daa3c79bb
|
Revert "暂时注释掉其他方法，跑一下话题的 需撤回"
This reverts commit 3be462d9
|
4 years ago |
|
jianjun
|
3be462d994
|
暂时注释掉其他方法，跑一下话题的 需撤回
|
4 years ago |
|
jianjun
|
8862f455ba
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c116f453c1
|
加个日志
|
4 years ago |
|
jianjun
|
f047f2318d
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
4b81f167df
|
修改话题总数抽取逻辑bug，时间维度默认前一天；原来是默认空截止到了任务执行的时间了 导致数据比想要的要多 ->ression:转议题时间 从log里取
|
4 years ago |
|
jianjun
|
837eb8b617
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
1bc26450be
|
修改话题总数抽取逻辑bug，时间维度默认前一天；原来是默认空截止到了任务执行的时间了 导致数据比想要的要多
|
4 years ago |
|
jianjun
|
dbe0d7aef6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7ac69991af
|
之前改集成平台的东西 改了表名 fact_topic_issue_grid_daily 到时候看一下吧
|
4 years ago |
|
jianjun
|
66dba4ce37
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c6f0449593
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来 刚才改了个寂寞
|
4 years ago |
|
jianjun
|
1f37dd2d66
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c6e7cc6477
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来
|
4 years ago |
|
jianjun
|
68d5144508
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
ec24d28f61
|
议题重复
|
4 years ago |
|
jianjun
|
6b31412c31
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
58199f4d14
|
项目网格Id 从事件中填充
|
4 years ago |
|
jianjun
|
f39278f443
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
867b6aebb4
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
077f5381cc
|
一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）； 优化代码可读性；
|
4 years ago |
|
jianjun
|
f00999e246
|
一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）
|
4 years ago |
zhaoqifeng
|
2b4a7671c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
0e0b230993
|
治理能力统计修改
|
4 years ago |
|
zhaoqifeng
|
43c88f1473
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
33d5eaf758
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
|
4 years ago |
|
zhaoqifeng
|
5aa5e48473
|
治理能力统计修改
|
4 years ago |
|
jianjun
|
e972128152
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
1c2a843874
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
a641e679e1
|
这一批都执行完再继续其他的
|
4 years ago |
|
zhaoqifeng
|
d0c28354f5
|
党员抽取修改
|
4 years ago |
|
jianjun
|
70f5e1e385
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
1fcbf67031
|
话题 网格为空时 继续下次
|
4 years ago |
|
zhaoqifeng
|
ab2440d23f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
cff289eca5
|
话题 网格为空时 继续下次
|
4 years ago |
