yinzuomei
|
d3efc4cd2c
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
yinzuomei
|
8824a33bb3
|
办事大厅大屏柱状图
|
3 years ago |
luyan
|
fa1bda4845
|
灵山项目：大屏安全生产企业--存在隐患交互接口
|
3 years ago |
wxz
|
ec5ab68022
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
wxz
|
de5a30f5a2
|
fix：特殊人群
|
3 years ago |
|
luyan
|
f4fa3c0ced
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
e39505cd00
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
add3a20c04
|
灵山项目：安全生产企业、巡查次数、隐患数量统计
|
3 years ago |
|
wxz
|
f12f00844b
|
fix：特殊人群，警长患者->危险性等级枚举错误
|
3 years ago |
|
wxz
|
2ebbe7fa03
|
修改：【社会服务资源】大屏：新增两个接口
|
3 years ago |
|
wxz
|
b3ec180bc4
|
修改：【公共服务图层】新增，导入，列表，修改：增加片区民警+网格员信息参数
|
3 years ago |
|
wxz
|
7c868bead8
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
|
luyan
|
b24d087f26
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
10f29d7a6e
|
灵山项目：大屏生产企业类型统计和安全隐患类型统计；
|
3 years ago |
|
wxz
|
d796646ec3
|
修改：【重点帮扶】导入：增加报错信息导出的模板
|
3 years ago |
|
wxz
|
99b19c18c2
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
wxz
|
3d6f7238ec
|
新增：【社会服务资源】按照类别统计数量
|
3 years ago |
|
luyan
|
4304cecd98
|
灵山项目：使用九小场所代替企业档案，并修改巡查功能，增加安全隐患类型；
|
3 years ago |
|
wxz
|
5de4aa5fa7
|
新增：【重点帮扶】大屏:查询子组织列表及每个子组织的帮扶人群数量
|
3 years ago |
|
wxz
|
85462831e2
|
新增：【重点帮扶】大屏:查询子组织列表及每个子组织的帮扶人群数量
|
3 years ago |
|
wxz
|
d3a2160f95
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
wxz
|
2de152cc93
|
【灵山-重点帮扶人群】新增：根据resiId查询详情
|
3 years ago |
|
wxz
|
b9757c219f
|
【灵山-重点帮扶人去】新增：删除+列表
|
3 years ago |
|
wxz
|
b645c7821c
|
/maporg增加 description返回
|
3 years ago |
|
wxz
|
6a95064bec
|
大屏左边，活动类型数量条，只返回：联建共建、为民活动、主题党日
|
3 years ago |
|
wxz
|
7297b13b4d
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
|
luyan
|
bab4098e79
|
增加事件同步响应级别
|
3 years ago |
|
wxz
|
78755cded0
|
【灵山-重点帮扶人去】新增：删除+列表
|
3 years ago |
|
wxz
|
77c3a9cf5a
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
wxz
|
f85acae543
|
【灵山-重点帮扶人去】新增：保存
|
3 years ago |
|
wxz
|
17bd6c4c73
|
fix
|
3 years ago |
|
wxz
|
d290a51bf7
|
fix
|
3 years ago |
|
wxz
|
2e1fa229ce
|
fix
|
3 years ago |
|
wxz
|
ac9f0dbe91
|
fix
|
3 years ago |
|
wxz
|
653b7f2c18
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
|
wxz
|
170bb78e6e
|
【灵山】项目，fix
|
3 years ago |
|
wxz
|
3019e9e84d
|
修改
|
3 years ago |
|
wxz
|
c619a02119
|
补充import
|
3 years ago |
|
wxz
|
3e185afacf
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
# epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
|
3 years ago |
|
wxz
|
42fe27d2c0
|
新增【灵山-重点帮扶人群】管理：导入
|
3 years ago |
|
luyan
|
4c293e5280
|
增加try catch
|
3 years ago |
|
luyan
|
61f31c3454
|
增加日志打印 orgPath
|
3 years ago |
|
luyan
|
d113f1e1ef
|
修改事件分析参数类型
|
3 years ago |
|
luyan
|
b30caa430f
|
修改事件分析参数类型
|
3 years ago |
|
luyan
|
24d9949836
|
修改事件分析参数类型
|
3 years ago |
|
luyan
|
5b575f834a
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
92a2746df6
|
修改事件分析统计方式；
|
3 years ago |
|
yinzuomei
|
8e131a01b1
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
yinzuomei
|
9d401dc694
|
灵山：/gov/org/building/building-distribution返回：partyCenterHouseFlag boolean true:代表此楼栋里有党员中心户； false:无
|
3 years ago |
|
wxz
|
48a359d159
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
