sunyuchao
|
73fd3d3f4d
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
4 years ago |
|
sunyuchao
|
d00db96ac5
|
回复、转项目、转需求、详情接口
|
4 years ago |
zhaoqifeng
|
723b9ba0d9
|
抽取小程序和居民信息里的志愿者数据
|
4 years ago |
jianjun
|
188dee7192
|
志愿者mq
|
4 years ago |
zxc
|
035160e5be
|
新增【随手拍、讲】
|
4 years ago |
wangxianzhang
|
d168f7db6c
|
居民信息导入-虚拟sheet的导入方式由批量改为单条，防止OOM
|
4 years ago |
|
sunyuchao
|
4435f123c1
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
4 years ago |
|
sunyuchao
|
98d111953c
|
新增、列表接口
|
4 years ago |
HAHA
|
0ed495f229
|
【网格党建平面图】列表补充查询字段
|
4 years ago |
|
HAHA
|
9a9b3d4004
|
【网格党建平面图】列表
|
4 years ago |
wanggongfeng
|
f1e435d3a0
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
4 years ago |
|
wanggongfeng
|
f575a80fd3
|
缴费记录
|
4 years ago |
|
wangxianzhang
|
9f35be697d
|
修改：身份证号打码方式改为:3702811991******12
|
4 years ago |
|
HAHA
|
d712b8f349
|
【网格党建平面图】地图
|
4 years ago |
|
wangxianzhang
|
1a759d8f6a
|
修改：身份证号打码方式改为:3702811991******12
|
4 years ago |
Jackwang
|
805a013936
|
党组织相关开发
|
4 years ago |
|
jianjun
|
b085dccdca
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
4 years ago |
|
jianjun
|
0dd9de720e
|
数据丢失
|
4 years ago |
|
jianjun
|
a02dce1cc1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
4 years ago |
|
jianjun
|
3c1b6e0548
|
合并策略测试
|
4 years ago |
|
wangxianzhang
|
5b06442426
|
【事件处理分析】修复部分bug
|
4 years ago |
|
sunyuchao
|
47ffb5c28c
|
详情返参调整
|
4 years ago |
|
sunyuchao
|
09d680ec71
|
项目结案、需求完成修改事件数据
|
4 years ago |
|
HAHA
|
08d7abc754
|
联建单位-按分类统计数量及占比修改逻辑
|
4 years ago |
|
zhaoqifeng
|
0d9891af4e
|
志愿者信息聚合表相关代码生成
|
4 years ago |
|
wangxianzhang
|
145696597a
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili
|
4 years ago |
|
wangxianzhang
|
02bc885118
|
新增：事件研判分析+同类事件列表分页查询
|
4 years ago |
yinzuomei
|
b546f7afbb
|
import
|
4 years ago |
|
yinzuomei
|
07ec1735c6
|
色值
|
4 years ago |
|
sunyuchao
|
70a604390e
|
漏提代码
|
4 years ago |
|
HAHA
|
a7d96d5e17
|
量化积分统计回显
|
4 years ago |
|
yinzuomei
|
04b7c2c4f3
|
多元饼和地图分类颜色一致
|
4 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
|
4 years ago |
|
wangxianzhang
|
f374fe3a7b
|
新增：事件研判分析+同类事件列表分页查询
|
4 years ago |
|
zhaoqifeng
|
5a0f0eabd7
|
党员管理列表
|
4 years ago |
|
yinzuomei
|
457c749c1f
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
4 years ago |
|
yinzuomei
|
ee27343a21
|
分类饼2
|
4 years ago |
|
sunyuchao
|
da70174022
|
垃圾项目
|
4 years ago |
|
HAHA
|
b9a995fcbc
|
量化积分统计回显
|
4 years ago |
|
yinzuomei
|
d1a183b543
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
4 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
|
4 years ago |
|
zxc
|
26a46ad355
|
定时任务
|
4 years ago |
|
yinzuomei
|
5a0f3c1845
|
分类饼2
|
4 years ago |
|
zxc
|
500c24baef
|
定时任务
|
4 years ago |
|
zxc
|
adde2eee21
|
议题转项目添加协办单位
|
4 years ago |
|
zxc
|
2c5a633e26
|
定时任务更新事件评价
|
4 years ago |
|
yinzuomei
|
85f994bb90
|
todo
|
4 years ago |
|
HAHA
|
e7fcda6ff8
|
联建单位-简要信息列表获取gridName
|
4 years ago |
|
sunyuchao
|
f468a66ce9
|
事件管理_详情
|
4 years ago |
|
HAHA
|
e69d596c1c
|
联建单位-按分类统计数量及占比
|
4 years ago |
