yinzuomei
|
39f415ed10
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
732fa1bf1c
|
resi_event.项目id.
|
4 years ago |
zhaoqifeng
|
aae3f8ca68
|
项目统计相关修改
|
4 years ago |
|
yinzuomei
|
d5d182e243
|
立项bug
|
4 years ago |
jianjun
|
c4eda026df
|
获取总数
|
4 years ago |
|
yinzuomei
|
8d4f5e4c2e
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
a0169f6eef
|
事件立项V1
|
4 years ago |
zxc
|
bbfde2813b
|
添加报事ID
|
4 years ago |
|
zxc
|
57b3bd0255
|
添加筛选条件
|
4 years ago |
|
jianjun
|
54ef157c7e
|
如果是areaCode parentAreaCode不会为空
|
4 years ago |
|
jianjun
|
470c34a65a
|
调整日志基本
|
4 years ago |
|
jianjun
|
1d9b07a87f
|
打个日志联调下
|
4 years ago |
|
yinzuomei
|
70c6f091ec
|
工作人员待处理列表，点击详情，更新已读。报事成功后，人大默认显示红点
|
4 years ago |
|
jianjun
|
6660fd4838
|
孔村移除掉党总支 并给孔村镇 降级为街道
|
4 years ago |
|
yinzuomei
|
232ed3c0e6
|
人大列表，返回是否可回复，只要办结或者立项了，不可回复。
|
4 years ago |
|
yinzuomei
|
a0ba787b3d
|
如果报事人是人大代表，并且自己艾特了自己，在个人中心未读列表点击需要更改为已读。
|
4 years ago |
|
jianjun
|
e5658bf9b1
|
返回结果包位置移动
|
4 years ago |
|
zxc
|
b759be0156
|
应前端要求，将被提到的人分成两个集合
|
4 years ago |
|
jianjun
|
867b088718
|
根据工作人员Id 获取组织树 areaCode版
|
4 years ago |
|
yinzuomei
|
a6de8b67d9
|
我的报事列表返回，是否显示回复按钮：已办结的不显示，未被人读的不显示，已被读的显示。
|
4 years ago |
|
yinzuomei
|
abdaf5aa90
|
冲突解决
|
4 years ago |
|
yinzuomei
|
23d69798d4
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
|
4 years ago |
|
yinzuomei
|
4c7e2cdd5c
|
报事办结+3个回复需要更新事件的最后一次操作时间
|
4 years ago |
|
zhaoqifeng
|
da4dc9a717
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
ba86998a67
|
组织的治理指数按天统计--GRID_SELF_GOVERN_PROJECT_TOTAL未赋值
|
4 years ago |
|
zxc
|
28043e3b05
|
最新直报
|
4 years ago |
|
yinzuomei
|
4c1e79cd22
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
886e520b49
|
回复列表，时间到分钟
|
4 years ago |
|
zxc
|
ddcc808863
|
先提一半
|
4 years ago |
|
yinzuomei
|
09cf227a59
|
工作端，群众直报入口，权限key，记得发一下gov-access
|
4 years ago |
|
yinzuomei
|
731fca8630
|
工作端，群众直报入口，权限key，记得发一下gov-access
|
4 years ago |
|
zxc
|
23c30ae2a8
|
修哎是否 显示已解决 未解决
|
4 years ago |
|
zxc
|
56d8f9b8f1
|
报事详情
|
4 years ago |
|
zxc
|
762c2eff50
|
先提project
|
4 years ago |
|
yinzuomei
|
31be58ccf4
|
Merge remote-tracking branch 'origin/dev_statistical_optimize' into dev
|
4 years ago |
|
yinzuomei
|
5f6dbccc38
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
b0fb7234ad
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
9b9daf9b01
|
updateviewtime校验
|
4 years ago |
|
zhaoqifeng
|
ddc632c4eb
|
项目统计相关修改
|
4 years ago |
|
yinzuomei
|
b6bc64ff30
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
e32581e639
|
报事人回复：@的人和组织显示红点;@人回复：被@的其他人+报事人+报给的组织显示红点；组织回复：报事人+@的人+其他组织显示红点。
|
4 years ago |
|
zxc
|
e49fcf5722
|
先提一部分
|
4 years ago |
|
yinzuomei
|
f36e2d7846
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
de8f78f0d2
|
报事-首次查看事件-两端通用
|
4 years ago |
|
zxc
|
4337d11bb7
|
org
|
4 years ago |
|
yinzuomei
|
074fdaca21
|
@的人回复
|
4 years ago |
|
yinzuomei
|
fadc539ed8
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
83b4c55555
|
报事当事人回复
|
4 years ago |
wxz
|
ee4377c75e
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
wxz
|
56f9e23c7a
|
修改：查询人大代表接口-将查询条件中的gridId改为customerId，并且返回值中增加userShowName字段
|
4 years ago |
