jianjun
|
3b581aebfc
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
b6189adcc6
|
删除缓存
|
3 years ago |
wangxianzhang
|
991f6c7464
|
Merge branch 'dev_jmreport'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
|
wangxianzhang
|
1c794b39de
|
【报表】多线程导出不睡眠了
|
3 years ago |
zhaoqifeng
|
e7b5cd661a
|
党员风采修改
|
3 years ago |
|
wangxianzhang
|
0dfe9fb8b3
|
【报表】又要用多线程导出了
|
3 years ago |
|
wangxianzhang
|
b6da810145
|
【报表】自定义excel批量查询去掉@NoRepeatSubmit注解，解决批量导出报表的问题
|
3 years ago |
|
wangxianzhang
|
8ccafc581a
|
【报表】自定义excel批量查询去掉@NoRepeatSubmit注解，解决批量导出报表的问题
|
3 years ago |
zhangyuan
|
bfa5a35b22
|
身份证改回必填
|
3 years ago |
|
zhaoqifeng
|
ba8a8d25c8
|
事件上报网格信息从customer_grid表获取
|
3 years ago |
|
zhangyuan
|
297abded3c
|
有头像才下发
|
3 years ago |
|
zhangyuan
|
cfbc5396d4
|
防重复
|
3 years ago |
|
zhangyuan
|
8a81c9c9ec
|
变更必填项
|
3 years ago |
|
zhangyuan
|
799721ec86
|
固定访客年龄
|
3 years ago |
|
wangxianzhang
|
4e4d8b4c4f
|
Merge branch 'dev_jmreport'
|
3 years ago |
|
wangxianzhang
|
9d8f2da056
|
【报表】pc工作单报表批量下载-由于积木问题，取消多线程
|
3 years ago |
|
wangxianzhang
|
09e36d9008
|
Merge branch 'dev_jmreport'
|
3 years ago |
|
wangxianzhang
|
6167d22a66
|
【报表】pc工作单报表批量下载-由于积木问题，取消多线程
|
3 years ago |
|
wangxianzhang
|
bfd4dad620
|
Merge branch 'dev_jmreport'
|
3 years ago |
|
wangxianzhang
|
c47157141f
|
【报表】pc工作单报表批量下载-由于积木问题，取消多线程
|
3 years ago |
|
wangxianzhang
|
87a0a67d51
|
Merge branch 'dev_jmreport'
|
3 years ago |
|
wangxianzhang
|
a205fe71f1
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
47568e5f5d
|
【报表】pc工作单报表批量下载-优化导出的文件名称
|
3 years ago |
|
zhangyuan
|
2dd241af51
|
卡片改为半年
|
3 years ago |
yinzuomei
|
38e8e14cd5
|
删除居民信息，更新时间，更新用户
|
3 years ago |
|
jianjun
|
cdc4055b7b
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
1114e356da
|
居民删除更新时间
|
3 years ago |
|
wangxianzhang
|
8f85b56758
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
2408221436
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
23d49e6c65
|
【报表】pc工作单报表列表-修改isList的获取逻辑
|
3 years ago |
|
wangxianzhang
|
97fc8e40c0
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
zhaoqifeng
|
9ddf2ffdf0
|
三个街道项目closed按结案算
|
3 years ago |
|
wangxianzhang
|
496986cf65
|
Merge branches 'dev_jmreport' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
f5f2bf8d81
|
批量删除居民信息
|
3 years ago |
|
wangxianzhang
|
975d1f1c31
|
Merge branch 'dev_jmreport'
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
# 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
|
3 years ago |
|
wangxianzhang
|
93c7a3a094
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
95d234ec61
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
34776d4f15
|
【报表】批量导出-jmreport并发处理能力不太行，会出现空白excel，没数据填充
|
3 years ago |
zxc
|
32225e30ba
|
新增一个isList
|
3 years ago |
|
zhangyuan
|
cea7446924
|
访客下放权限
|
3 years ago |
|
jianjun
|
8a5f74a6cf
|
平阴数据对接调整 办结和化解状态同步
|
3 years ago |
|
wangxianzhang
|
1f1dfb1a77
|
Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
fbb52ecf7c
|
【报表】批量导出-多线程及系列优化
|
3 years ago |
|
zhaoqifeng
|
0bd762d55d
|
党支部不为空
|
3 years ago |
|
zxc
|
c07d4b29da
|
新增一个isList
|
3 years ago |
|
zhaoqifeng
|
3621a34f4e
|
党支部不为空
|
3 years ago |
syc
|
d216530497
|
平阴数据统计列表调整查询组织、网格逻辑
|
3 years ago |
|
wangxianzhang
|
729bf41e1b
|
【报表】customize服务增加挂载：- "/opt/epmet_files/:/opt/epmet_files"
|
3 years ago |
|
wangxianzhang
|
45852c255c
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
079a3ccf73
|
【报表】listIds()方法，适配fix
|
3 years ago |
