wxz
|
4ae7d29190
|
1.修改：工作人员编辑页面初始化接口editstaffinit,增加idcard，culture,cultureDisplay字段的返回
|
2 years ago |
yinzuomei
|
208d516403
|
工作人员缓存增加pid,orgIdPath
|
2 years ago |
|
wxz
|
4f442eff01
|
1.修改：新增工作人员addstaffv2接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储
2.修改：编辑工作人员editstaff接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储
|
2 years ago |
|
wxz
|
7e37e6e9f9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
wxz
|
f16974a20f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wxz
|
1b7c69afc2
|
修改身份证正则解析工具类，增加出生日期[LocalDate类型]的返回
|
2 years ago |
|
yinzuomei
|
5b69b9843e
|
/resi/partymember/icPartyOrg/editPrincipal接口principalStaffId不必填；
|
2 years ago |
|
wxz
|
41b4180180
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
46b63638e8
|
【小组】大屏查询小组
|
2 years ago |
|
wxz
|
88c67fe4d1
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
1f0cb8d472
|
Merge branch 'master' into lingshan_master
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
2 years ago |
|
wxz
|
a6db5f9810
|
【小组】创建小组-增加orgIdpath,agencyId
|
2 years ago |
|
wxz
|
3776c6fe21
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
yinzuomei
|
2e1dfe9277
|
居民信息列表查询排序调整
|
2 years ago |
|
wxz
|
62c4f7261b
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java
|
2 years ago |
|
wxz
|
67396a3ad1
|
特殊人群：增加查询各类人员分布了
|
2 years ago |
|
yinzuomei
|
e76e075c9c
|
市北反馈社区安全服务列表查询不出来
|
2 years ago |
|
wxz
|
a9c59473ed
|
特殊人群：增加柱状图和各类人员数量。下一步要查询各类人员分布了
|
2 years ago |
|
yinzuomei
|
343745bd0a
|
信息采集导出文件名
|
2 years ago |
|
yinzuomei
|
4dadc8c334
|
信息采集详情列表根据户主、状态查询
|
2 years ago |
|
yinzuomei
|
dc8d20f7de
|
信息采集详情返回与户主关系名称
|
2 years ago |
|
yinzuomei
|
f8b5bad49c
|
办事指南发布，pids值错误；
|
2 years ago |
|
yinzuomei
|
b83cb8ad35
|
办事指南发布，pids值错误
|
2 years ago |
|
yinzuomei
|
a7fdde788d
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_bugfix_ljj
|
2 years ago |
|
yinzuomei
|
da489b7150
|
信息采集审核调整，微测试
|
2 years ago |
|
wxz
|
0bae6a3147
|
特殊人群导入和新增，增加变更记录
|
2 years ago |
|
wxz
|
ab8d39881b
|
Merge branch 'master' into lingshan_master
# Conflicts:
# epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml
|
2 years ago |
|
wxz
|
f18bb7b8ca
|
微调居民信息变更记录中的customerId，staffId的获取方式
|
2 years ago |
|
wxz
|
6be81b4f59
|
增加私有化部署的一点文档
|
2 years ago |
|
wxz
|
7f2f8f781c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
08369aff3d
|
1.文章栏目，增加tree接口
2.增加通过父id查询子栏目列表的接口
|
2 years ago |
|
wxz
|
0ab768080b
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
yinzuomei
|
de5dc99ba7
|
fix
|
2 years ago |
|
yinzuomei
|
633d391585
|
fix
|
2 years ago |
|
yinzuomei
|
6332e357bc
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
b7e03649ad
|
fix
|
2 years ago |
|
wxz
|
f5c05456da
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
927b4e5fd4
|
1.fix:特殊人群导入模板有问题
2.特殊人群新增，增加居民头像字段
3.特殊人群详情增加居民头像返回
4.特殊人群保存和详情的返回日期格式修改
|
2 years ago |
|
yinzuomei
|
de31cf49e5
|
updateArticle
|
2 years ago |
|
yinzuomei
|
97c11ef229
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
200527744c
|
updateArticle
|
2 years ago |
|
wxz
|
b8136cbb6f
|
fix
|
2 years ago |
|
wxz
|
8fadcea4d4
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
a3ed8c0350
|
fix:【灵山-特殊人群】修改接口，修复类别变更，忘记删除旧类别的bug
|
2 years ago |
|
yinzuomei
|
6284baa3d2
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
fe0536f36b
|
updateArticle
|
2 years ago |
|
wxz
|
96b8a4bccc
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
f88ac1630d
|
fix
|
2 years ago |
|
yinzuomei
|
580e64ce9a
|
/gov/voice/draft/detailV2区分内容和附件
|
2 years ago |
|
yinzuomei
|
5c933863b4
|
/gov/voice/article/detailV2区分内容和附件
|
2 years ago |
