zhaoqifeng
|
4dffdf1ded
|
人员关怀
|
3 years ago |
sunyuchao
|
f97f4e15e0
|
难点堵点详情已读修改
|
3 years ago |
|
sunyuchao
|
d51f66be47
|
难点堵点列表
|
3 years ago |
|
zhaoqifeng
|
dbe98fab02
|
工作日志
|
3 years ago |
wangxianzhang
|
3baa8b9e5c
|
修改
|
3 years ago |
|
wangxianzhang
|
52d19a051c
|
Merge remote-tracking branch 'origin/dev_memo' into dev_memo
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
|
3 years ago |
|
wangxianzhang
|
f52ab1b8d5
|
新增：
1.备忘录-人员关怀、难点堵点、工作日志的word导出接口
|
3 years ago |
|
sunyuchao
|
7a3c88a495
|
..
|
3 years ago |
|
sunyuchao
|
1f9dd227e5
|
..
|
3 years ago |
|
sunyuchao
|
c40df4938e
|
难点堵点
|
3 years ago |
|
zhaoqifeng
|
8dba635743
|
工作日志
|
3 years ago |
|
sunyuchao
|
7bef86dded
|
.
|
3 years ago |
|
sunyuchao
|
8a1bfb496c
|
错提代码
|
3 years ago |
|
sunyuchao
|
0663b09b34
|
书记日志-消息提醒弹框列表接口初版
|
3 years ago |
zxc
|
bed41c106b
|
党群服务中心删除
|
3 years ago |
|
sunyuchao
|
79cec12400
|
数据日志代码生成
|
3 years ago |
jianjun
|
605c532b79
|
路径驼峰
|
3 years ago |
|
jianjun
|
2aa45e4dc5
|
mapingurl修改
|
3 years ago |
|
jianjun
|
8f0ea3e73c
|
修改巡查锁机制
|
3 years ago |
|
sunyuchao
|
1968bff922
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
3 years ago |
|
sunyuchao
|
3e8bc953ea
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目 程序调整
|
3 years ago |
|
sunyuchao
|
5b455d287f
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
3 years ago |
|
sunyuchao
|
ed2e228306
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目
|
3 years ago |
|
jianjun
|
89ae2fa567
|
备份生成模板
|
3 years ago |
|
sunyuchao
|
4efd53bb10
|
网格活跃度统计查询，源数据改查screen_project_data表，这个表平阴的是三个街道和小程序数据都有
|
4 years ago |
|
wangxianzhang
|
0ec8d05cf8
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
b748556401
|
-
|
4 years ago |
|
wangxianzhang
|
07927d5093
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
53f98c8c42
|
版本升级
|
4 years ago |
|
sunyuchao
|
4c056dfc39
|
Merge branch 'dev_grid_project_syc' into dev
|
4 years ago |
|
sunyuchao
|
fa02b87851
|
项目网格日统计 查询网格项目修改，网格的项目不再只是来源议题，也可以来源事件或者网格员上报事件，所以改查项目main表网格数据
|
4 years ago |
|
wangxianzhang
|
f33097be1c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
26a9de532e
|
修复：居民调动，detail表的type和typeName错误
|
4 years ago |
|
wangxianzhang
|
e332c10133
|
居民信息导入模板更新
|
4 years ago |
|
sunyuchao
|
a3ed034c05
|
网格活跃度业务调整上报事件数改为网格内产生的项目数
|
4 years ago |
|
sunyuchao
|
94640edc98
|
开启巡查 网格、经纬度必填
|
4 years ago |
|
jianjun
|
32cf7d73a1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
b79991a743
|
类别变动添加 新增/减少后缀
|
4 years ago |
|
jianjun
|
216ae8ad2d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
790b74df7a
|
居民信息导出因打印日志错误导致
|
4 years ago |
|
jianjun
|
d4fcf7fd6a
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
f3c96e227c
|
添加user依赖
|
4 years ago |
yinzuomei
|
500094fc42
|
Merge remote-tracking branch 'origin/dev_delete' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
|
4 years ago |
|
sunyuchao
|
4cfb8ddbaf
|
平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，查询数据时分别兼容组织网格数据
|
4 years ago |
|
yinzuomei
|
fda2b6b82f
|
Merge remote-tracking branch 'origin/dev_grid_active_syc' into dev
|
4 years ago |
|
yinzuomei
|
f9fb6ae645
|
网格活跃度统计改为新方法。 xlsx格式
|
4 years ago |
|
yinzuomei
|
4e1a9f02da
|
Merge remote-tracking branch 'origin/dev_grid_active_syc' into dev
|
4 years ago |
|
yinzuomei
|
0f52380596
|
网格活跃度统计改为新方法。 xlsx格式
|
4 years ago |
|
jianjun
|
65d9931686
|
关闭监控页面
|
4 years ago |
|
jianjun
|
2351f777cf
|
多余的依赖
|
4 years ago |
