jianjun
|
b085dccdca
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
0dd9de720e
|
数据丢失
|
3 years ago |
|
jianjun
|
a02dce1cc1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
3c1b6e0548
|
合并策略测试
|
3 years ago |
wangxianzhang
|
5b06442426
|
【事件处理分析】修复部分bug
|
3 years ago |
sunyuchao
|
47ffb5c28c
|
详情返参调整
|
3 years ago |
|
sunyuchao
|
09d680ec71
|
项目结案、需求完成修改事件数据
|
3 years ago |
HAHA
|
08d7abc754
|
联建单位-按分类统计数量及占比修改逻辑
|
3 years ago |
zhaoqifeng
|
0d9891af4e
|
志愿者信息聚合表相关代码生成
|
3 years ago |
|
wangxianzhang
|
145696597a
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili
|
3 years ago |
|
wangxianzhang
|
02bc885118
|
新增：事件研判分析+同类事件列表分页查询
|
3 years ago |
yinzuomei
|
b546f7afbb
|
import
|
3 years ago |
|
yinzuomei
|
07ec1735c6
|
色值
|
3 years ago |
|
sunyuchao
|
70a604390e
|
漏提代码
|
3 years ago |
|
HAHA
|
a7d96d5e17
|
量化积分统计回显
|
3 years ago |
|
yinzuomei
|
04b7c2c4f3
|
多元饼和地图分类颜色一致
|
3 years ago |
|
wangxianzhang
|
b487e24929
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili
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-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
|
3 years ago |
|
wangxianzhang
|
f374fe3a7b
|
新增：事件研判分析+同类事件列表分页查询
|
3 years ago |
|
zhaoqifeng
|
5a0f0eabd7
|
党员管理列表
|
3 years ago |
|
yinzuomei
|
457c749c1f
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
ee27343a21
|
分类饼2
|
3 years ago |
|
sunyuchao
|
da70174022
|
垃圾项目
|
3 years ago |
|
HAHA
|
b9a995fcbc
|
量化积分统计回显
|
3 years ago |
|
yinzuomei
|
d1a183b543
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
f9f117414f
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
# epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
|
3 years ago |
zxc
|
26a46ad355
|
定时任务
|
3 years ago |
|
yinzuomei
|
5a0f3c1845
|
分类饼2
|
3 years ago |
|
zxc
|
500c24baef
|
定时任务
|
3 years ago |
|
zxc
|
adde2eee21
|
议题转项目添加协办单位
|
3 years ago |
|
zxc
|
2c5a633e26
|
定时任务更新事件评价
|
3 years ago |
|
yinzuomei
|
85f994bb90
|
todo
|
3 years ago |
|
HAHA
|
e7fcda6ff8
|
联建单位-简要信息列表获取gridName
|
3 years ago |
|
sunyuchao
|
f468a66ce9
|
事件管理_详情
|
3 years ago |
|
HAHA
|
e69d596c1c
|
联建单位-按分类统计数量及占比
|
3 years ago |
|
yinzuomei
|
f633379c9d
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
zxc
|
14b492e2b1
|
议题转项目 + gridId
|
3 years ago |
|
yinzuomei
|
f54b3ec42d
|
color
|
3 years ago |
|
yinzuomei
|
d8158f08bf
|
color
|
3 years ago |
|
zhaoqifeng
|
cfed984894
|
党员管理查看详情
|
3 years ago |
|
yinzuomei
|
27e0a7d30a
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
a8c6142dcb
|
分类饼1
|
3 years ago |
|
sunyuchao
|
2395fb7af2
|
事件管理_评价
|
3 years ago |
|
yinzuomei
|
df6803b14f
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
|
3 years ago |
|
yinzuomei
|
5a182abf8a
|
分类饼1
|
3 years ago |
|
zxc
|
429c677f65
|
xiangmu列表
|
3 years ago |
|
sunyuchao
|
820f558278
|
事件管理_立项、转需求
|
3 years ago |
|
zhaoqifeng
|
9e4174e69e
|
居民的党员信息同步到党员管理
|
3 years ago |
|
zxc
|
e083ad76c4
|
列表
|
3 years ago |
|
zxc
|
148e77e618
|
报事-立项 新增网格ID
|
3 years ago |
|
zxc
|
334e69b361
|
协办单位
|
3 years ago |
