wangxianzhang
|
17df75d84d
|
Merge branch 'wxz_demand_service_stats' into dev_ic_mp
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
sunyuchao
|
b8aba44836
|
【事件】（未处理、处理中、已办结）地图、列表
|
4 years ago |
yinzuomei
|
47559f3715
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
58ef2d14da
|
需求大厅
|
4 years ago |
|
wangxianzhang
|
35d9cd2185
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_demand_service_stats
|
4 years ago |
|
wangxianzhang
|
742282a219
|
修改：
1.志愿者需求服务统计。以网格为维度统计。
2.志愿者分页查询。增加上级agencyId为条件，查询该agencyId下n级所有的志愿者
3.志愿者分布查询。增加agencyId为条件，查询该agencyId下n级所有的志愿者.
4.志愿者需求服务统计结果查询。增加agencyId为条件，查询该agencyId下n级所有的服务统计信息。
|
4 years ago |
zhaoqifeng
|
51154424c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
266d75f719
|
抽取项目数据到screen_project_*
|
4 years ago |
|
sunyuchao
|
a25d159fb2
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
89ca18b91f
|
事件详情返参附件处理
|
4 years ago |
|
zhaoqifeng
|
eb4d2eb6e6
|
议事
|
4 years ago |
|
sunyuchao
|
d47db4ad95
|
加返参
|
4 years ago |
|
sunyuchao
|
38c5cf54e3
|
事件上报增加语音附件、语音附件自动审核任务
|
4 years ago |
|
zhaoqifeng
|
4924db329f
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
15122bad11
|
抽取项目数据到screen_project_*
|
4 years ago |
|
yinzuomei
|
f2afb49b12
|
需求大厅
|
4 years ago |
jianjun
|
fe4ef78001
|
恢复原有的字段
|
4 years ago |
|
jianjun
|
34ca3d902a
|
例行工作 flyway 脚本
|
4 years ago |
|
jianjun
|
abfb1eb13a
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_user_work
|
4 years ago |
|
jianjun
|
97d6b70289
|
例行工作添加接口
|
4 years ago |
|
yinzuomei
|
55881cc082
|
志愿者注册自动注册居民，注释url
|
4 years ago |
|
yinzuomei
|
7343ce18c8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
6c8ee748a0
|
志愿者注册自动注册居民
|
4 years ago |
|
sunyuchao
|
c2f209fc85
|
组织列表加返参
|
4 years ago |
|
jianjun
|
9008ae53a1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3f9d3fe330
|
巡查最小上报间隔改为3分钟
|
4 years ago |
|
jianjun
|
2f916a7fee
|
多一个属性 怕啥
|
4 years ago |
|
sunyuchao
|
15369acced
|
【事件】网格员服务电话
|
4 years ago |
zxc
|
39c13a0b8c
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev
|
4 years ago |
|
jianjun
|
a6bf321d35
|
去掉还不行 那就返回吧
|
4 years ago |
|
jianjun
|
b3307783b9
|
添加例行工作暂存
|
4 years ago |
|
jianjun
|
416640b36d
|
系统字典添加 返回pValue
|
4 years ago |
|
sunyuchao
|
0516be08f9
|
【事件】社区服务热线
|
4 years ago |
|
wangxianzhang
|
7d8856dfb7
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
e29db03d3b
|
修改：
1.楼栋管理，楼栋列表排列顺序：按创建时间正序，先添加的在上面，后添加的在下面
|
4 years ago |
|
yinzuomei
|
0faa464b16
|
queryHouseInfo修改
|
4 years ago |
|
yinzuomei
|
609f2b05dc
|
pc指派时志愿者列表修改为，当前组织及下级所有志愿者.
|
4 years ago |
|
jianjun
|
0eb3a67001
|
系统字典添加 获取树形结构的方法
|
4 years ago |
|
wangxianzhang
|
74b1680c0f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
wangxianzhang
|
ccb95c5c5c
|
新增：
1.同步漏掉的历史grid，agency,department维度到维度表，查漏补缺
|
4 years ago |
|
yinzuomei
|
d66ee30553
|
pc指派时志愿者列表修改为，当前组织及下级所有志愿者。放开url
|
4 years ago |
|
yinzuomei
|
9a5d31cda8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
27dec0dc17
|
pc指派时志愿者列表修改为，当前组织及下级所有志愿者。
|
4 years ago |
|
sunyuchao
|
9f1f762bee
|
组织部门网格新增编辑详情列表入参返参调整
|
4 years ago |
|
yinzuomei
|
8709ecfbe2
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
20372fa35d
|
pc提交需求，修改需求记录需求人的houseId，房屋地址，楼的经纬度，记录发放积分
|
4 years ago |
|
sunyuchao
|
7293ef7680
|
删除已读消息、事件回复立项办结推送站内信
|
4 years ago |
|
jianjun
|
96e9a3cc37
|
系统字典添加 获取树形结构的方法
|
4 years ago |
|
zxc
|
671d4c77c7
|
党群服务中心修改
|
4 years ago |
|
yinzuomei
|
44dde98632
|
完成+评价记录日志
|
4 years ago |
