jianjun
|
9920de9cb3
|
Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev_add_closedCount_category
|
4 years ago |
zhaoqifeng
|
3d71a6f033
|
个人信息-家庭关系
|
4 years ago |
lzh
|
c1d91e9dc5
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
|
4 years ago |
|
lzh
|
4a446b7d71
|
居民类别配置
|
4 years ago |
sunyuchao
|
84cc673e3f
|
mq事件DTO名字调整
|
4 years ago |
wangxianzhang
|
6e8138ecd0
|
修改：
调整ic居民导入，将导入逻辑移到单独的service中IcResiUserImportService
|
4 years ago |
|
wangxianzhang
|
c1531d3e06
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
4eb0f5c0cb
|
修改：
完成excel表格的基本导入
下一步：健壮性判断，失败记录，excel上传
|
4 years ago |
yinzuomei
|
78f1abeda2
|
agg原接口代码删除
|
4 years ago |
|
sunyuchao
|
41d249672a
|
居民信息新增、变更推送mq
|
4 years ago |
|
jianjun
|
f2fb554219
|
删除无用方法
|
4 years ago |
|
yinzuomei
|
c5d81c2780
|
bug#2306
|
4 years ago |
zxc
|
65afa8291c
|
emm
|
4 years ago |
|
jianjun
|
fd0edf1ca1
|
居民导出
|
4 years ago |
|
yinzuomei
|
03750f51f8
|
分类查询修改
|
4 years ago |
|
zxc
|
72d9f19283
|
项目分类已结案的项目数
|
4 years ago |
|
wangxianzhang
|
bcc80300be
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
7c0a297579
|
修改：
修改excel表头解析方法，使更通用
|
4 years ago |
|
jianjun
|
1cfc400897
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
b3b9bee282
|
处理部分remote
|
4 years ago |
|
yinzuomei
|
e9c4fb99a3
|
分类名赋值
|
4 years ago |
|
yinzuomei
|
7e527320d4
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
769363c9ab
|
分类名赋值给category_code
|
4 years ago |
|
zxc
|
2c4a4a5897
|
网格添加结案数
|
4 years ago |
|
sunyuchao
|
294ae0e008
|
错提代码问题
|
4 years ago |
|
yinzuomei
|
738d0025b0
|
分页列表查询，增加staffId，查询当前工作人员所属组织及下级
|
4 years ago |
|
yinzuomei
|
ba404ef495
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
ca1490649e
|
分页列表查询，增加staffId，查询当前工作人员所属组织及下级
|
4 years ago |
|
zxc
|
777aa9e0c0
|
查询房屋信息
|
4 years ago |
|
zxc
|
daba90da7b
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
zxc
|
71b4875446
|
查询房屋信息
|
4 years ago |
|
sunyuchao
|
73eb1c002d
|
居民信息新增 对必填参数进行校验
|
4 years ago |
|
jianjun
|
b7b3015875
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
2a5259c861
|
去掉经济低保字段
|
4 years ago |
|
wangxianzhang
|
47039c9ab3
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
eb2a4822e2
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
0f6ad0d77c
|
去掉经济低保字段
|
4 years ago |
|
wangxianzhang
|
7b42d87947
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
zxc
|
08e951199f
|
暂存
|
4 years ago |
|
wangxianzhang
|
9c6a66c8d7
|
完成居民基础信息导入
|
4 years ago |
|
lzh
|
a9b7d4760b
|
neighbourHoodId 改neighborHoodId
|
4 years ago |
|
jianjun
|
f8bea6ae44
|
居民信息模版
|
4 years ago |
|
wangxianzhang
|
9818971f0d
|
冲突处理
|
4 years ago |
|
wangxianzhang
|
d818f5e36a
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
54867de8e3
|
修改：
导入居民基本信息完善，已经可以读取中文并且转换成db所需的数据，下一步，转换成sql，并且测试数据的完整性
|
4 years ago |
|
jianjun
|
a90f86a50b
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
jianjun
|
6ab79e6c52
|
导出 居民信息
|
4 years ago |
|
wangxianzhang
|
34eaf42c2b
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
4 years ago |
|
wangxianzhang
|
d2deb8cbf5
|
修改：
导入居民基本信息完善
|
4 years ago |
|
zhaoqifeng
|
4f3bcda0a6
|
房屋下拉框修改
|
4 years ago |
