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 | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c004fde390
								
							
								
							
						 | 
						
							
							
								
								动态查询居民,居民ID列返回原值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6f87d910fb
								
							
								
							
						 | 
						
							
							
								
								动态查询居民,固定查询居民ID列:IC_RESI_ID
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5b5161de13
								
							
								
							
						 | 
						
							
							
								
								id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								2444b6f87a
								
							
								
							
						 | 
						
							
							
								
								平阴数据统计列表调整查询组织、网格逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								03e904b4d4
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d8bca58fee
								
							
								
							
						 | 
						
							
							
								
								网格员项目统计修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4cbe3134a2
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								523f0c017f
								
							
								
							
						 | 
						
							
							
								
								报表所属功能表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								fef1420105
								
							
								
							
						 | 
						
							
							
								
								【报表】批量导出,优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f172839441
								
							
								
							
						 | 
						
							
							
								
								【报表】批量导出,修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f5f0b1692e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								86ea463cf7
								
							
								
							
						 | 
						
							
							
								
								【报表】批量导出,完成,待联调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6c99ebc64e
								
							
								
							
						 | 
						
							
							
								
								ic_customer_report
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2b67d821df
								
							
								
							
						 | 
						
							
							
								
								获取工作人员缓存信息
							
							
							
							
								
							
							
						 | 
						3 years ago |