yinzuomei
|
1fc5e97cef
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
d5d182e243
|
立项bug
|
4 years ago |
wxz
|
f95d605249
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
wxz
|
5b0f0d08fc
|
增加ribbon测试代码
|
4 years ago |
jianjun
|
e01a862765
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
3972584408
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
c4eda026df
|
获取总数
|
4 years ago |
|
yinzuomei
|
c133e41f4c
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
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
|
9d139ae24f
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
bbfde2813b
|
添加报事ID
|
4 years ago |
|
zxc
|
7f9989eb23
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
57b3bd0255
|
添加筛选条件
|
4 years ago |
|
jianjun
|
a5b73b8cc2
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
54ef157c7e
|
如果是areaCode parentAreaCode不会为空
|
4 years ago |
|
jianjun
|
f17f3e1801
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
470c34a65a
|
调整日志基本
|
4 years ago |
|
jianjun
|
af89ba146e
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
2309d497b5
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
1d9b07a87f
|
打个日志联调下
|
4 years ago |
|
yinzuomei
|
8798b7abb5
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
70c6f091ec
|
工作人员待处理列表，点击详情，更新已读。报事成功后，人大默认显示红点
|
4 years ago |
|
jianjun
|
e9678c649c
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
c4b5f3cde1
|
Merge remote-tracking branch 'remotes/origin/dev_py_platform' into develop
|
4 years ago |
|
jianjun
|
6660fd4838
|
孔村移除掉党总支 并给孔村镇 降级为街道
|
4 years ago |
|
yinzuomei
|
9b0dd5a9c0
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
232ed3c0e6
|
人大列表，返回是否可回复，只要办结或者立项了，不可回复。
|
4 years ago |
|
yinzuomei
|
545b65c942
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
a0ba787b3d
|
如果报事人是人大代表，并且自己艾特了自己，在个人中心未读列表点击需要更改为已读。
|
4 years ago |
|
jianjun
|
a1eb41468d
|
Merge remote-tracking branch 'remotes/origin/dev_py_platform' into develop
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
|
4 years ago |
|
zxc
|
5ac64cf4a9
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
jianjun
|
e5658bf9b1
|
返回结果包位置移动
|
4 years ago |
|
zxc
|
b759be0156
|
应前端要求，将被提到的人分成两个集合
|
4 years ago |
|
jianjun
|
867b088718
|
根据工作人员Id 获取组织树 areaCode版
|
4 years ago |
|
yinzuomei
|
b9b4d7cb51
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
a6de8b67d9
|
我的报事列表返回，是否显示回复按钮：已办结的不显示，未被人读的不显示，已被读的显示。
|
4 years ago |
|
wxz
|
d30a52ca5e
|
健康检查：改良
|
4 years ago |
|
wxz
|
1b28edaeee
|
健康检查：改良
|
4 years ago |
|
wxz
|
8a9b6c5195
|
Merge branch 'dev_healthcheck' into develop
|
4 years ago |
|
wxz
|
6d43d7430e
|
健康检查：改良
|
4 years ago |
|
wxz
|
7507459d0f
|
Merge branch 'dev_healthcheck' into develop
|
4 years ago |
|
yinzuomei
|
4107c759a9
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
abdaf5aa90
|
冲突解决
|
4 years ago |
|
wxz
|
b7c337afe9
|
健康检查：改进
|
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
|
b69c989b8c
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
