jianjun
|
642660bafb
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
|
4 years ago |
|
jianjun
|
b1a81526e8
|
党建声音支持视频上传 不限格式只限制是视频
|
4 years ago |
|
jianjun
|
f24296e141
|
org删除无用 redis类
|
4 years ago |
|
jianjun
|
e196dfcad8
|
难点堵点bug
|
4 years ago |
|
jianjun
|
fd417f7101
|
统一抽取接口 添加参数 方便部分抽取以及难点堵点bug
|
4 years ago |
|
jianjun
|
c116f453c1
|
加个日志
|
4 years ago |
|
jianjun
|
4b81f167df
|
修改话题总数抽取逻辑bug，时间维度默认前一天；原来是默认空截止到了任务执行的时间了 导致数据比想要的要多 ->ression:转议题时间 从log里取
|
4 years ago |
|
jianjun
|
1bc26450be
|
修改话题总数抽取逻辑bug，时间维度默认前一天；原来是默认空截止到了任务执行的时间了 导致数据比想要的要多
|
4 years ago |
|
jianjun
|
7ac69991af
|
之前改集成平台的东西 改了表名 fact_topic_issue_grid_daily 到时候看一下吧
|
4 years ago |
|
jianjun
|
c6f0449593
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来 刚才改了个寂寞
|
4 years ago |
|
jianjun
|
c6e7cc6477
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来
|
4 years ago |
|
jianjun
|
ec24d28f61
|
议题重复
|
4 years ago |
|
jianjun
|
340ade9464
|
Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into develop
|
4 years ago |
|
jianjun
|
02012fd901
|
初始化预警和分类配置图标
|
4 years ago |
sunyuchao
|
98662c6917
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
sunyuchao
|
8a75815338
|
代码调整
|
4 years ago |
zxc
|
a04c7a2993
|
微调代码
|
4 years ago |
|
zxc
|
e6225bc0eb
|
sql
|
4 years ago |
|
zxc
|
46ce977e73
|
emm
|
4 years ago |
yinzuomei
|
81eb531d19
|
Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
yinzuomei
|
6ebbda301c
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
af27db247a
|
selectItemList
|
4 years ago |
|
yinzuomei
|
320429b034
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
|
4 years ago |
|
yinzuomei
|
8a0f40a238
|
时间格式化
|
4 years ago |
|
sunyuchao
|
e4e296e3ea
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
yinzuomei
|
bff36af470
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
sunyuchao
|
d8d12db798
|
【项目分类分析】研判分析
|
4 years ago |
|
yinzuomei
|
fbc377c922
|
服务措施，列表-导出需求列表
|
4 years ago |
|
zxc
|
59a04901d1
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
zxc
|
48e86555ef
|
code修改
|
4 years ago |
|
yinzuomei
|
7e8dff8670
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
6e80a98c3c
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_data
|
4 years ago |
|
zxc
|
e1400fad65
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
zxc
|
6d29c56dbf
|
emm
|
4 years ago |
|
yinzuomei
|
1a71e7b205
|
服务措施，列表分页查询
|
4 years ago |
|
zxc
|
1891fa1626
|
emm
|
4 years ago |
|
zxc
|
ce41d73fa2
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
zxc
|
5ed5d9ccfb
|
事件新增 修改判断重复名
|
4 years ago |
|
yinzuomei
|
6388611ecf
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
bad191abd8
|
topic
|
4 years ago |
|
yinzuomei
|
99ea8a72d8
|
and
|
4 years ago |
|
yinzuomei
|
e180733a3f
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
95ca57ed3e
|
topicId
|
4 years ago |
|
yinzuomei
|
18c4820c37
|
issueId
|
4 years ago |
|
yinzuomei
|
dc3b3e7300
|
hautiyanpan
|
4 years ago |
|
yinzuomei
|
abc17c8113
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
01952affcb
|
降序
|
4 years ago |
|
yinzuomei
|
c0d91bb45b
|
数据分析-个人档案-事件详情页面的研判分析项目列表?
|
4 years ago |
|
yinzuomei
|
17378bfea0
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
d4f2543545
|
数据分析-个人档案-事件详情页面的研判分析项目列表
|
4 years ago |
