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 |
|
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 |
|
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 |
|
sunyuchao
|
f468a66ce9
|
事件管理_详情
|
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 |
|
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 |
|
zxc
|
e083ad76c4
|
列表
|
3 years ago |
|
zxc
|
148e77e618
|
报事-立项 新增网格ID
|
3 years ago |
|
zxc
|
334e69b361
|
协办单位
|
3 years ago |
|
zxc
|
943ffcff81
|
项目列表微调
|
3 years ago |
jianjun
|
a95f4aca9e
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
jianjun
|
5e47e6b315
|
bug
|
3 years ago |
|
sunyuchao
|
3e8b89a942
|
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 |
|
sunyuchao
|
f632735c77
|
事件管理_回复
|
3 years ago |
|
zxc
|
8eb0ed5dd9
|
引包修改
|
3 years ago |
|
wangxianzhang
|
a635d3d7fb
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud 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/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 |
|
wangxianzhang
|
18fda9352b
|
新增：事件处理分析-月增量查询
|
3 years ago |
|
yinzuomei
|
8988a219c5
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
11914ecb2c
|
duoyuan
|
3 years ago |
|
sunyuchao
|
cab37cae7e
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
sunyuchao
|
96e7242dcb
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
2e6fd2b31f
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
sunyuchao
|
d6b1f0e7e7
|
事件管理_新增
|
3 years ago |
|
yinzuomei
|
06d0d73ad1
|
duoyuan
|
3 years ago |
|
yinzuomei
|
abea2ee464
|
duoyuan
|
3 years ago |
|
zxc
|
3115775f62
|
协办单位列表
|
3 years ago |
|
zxc
|
03590577ec
|
是否处理
|
3 years ago |
|
yinzuomei
|
65504d06a0
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
a73101fe1b
|
暂存
|
3 years ago |
|
sunyuchao
|
b6e8ec88b5
|
事件管理_新增
|
3 years ago |
