| 
														
															@@ -54,16 +54,19 @@ public class JieShouHuiZhenService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         Set<String> deptList = publicServer.getChildDeptByUserCode(); 
														 | 
														
														 | 
														
															         Set<String> deptList = publicServer.getChildDeptByUserCode(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         QueryWrapper<?> qw = new QueryWrapper<>(); 
														 | 
														
														 | 
														
															         QueryWrapper<?> qw = new QueryWrapper<>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        String dateName = "req_date"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (history) { 
														 | 
														
														 | 
														
															         if (history) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             qw.eq("status_flag", "2"); 
														 | 
														
														 | 
														
															             qw.eq("status_flag", "2"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            dateName = "hz_date"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } else { 
														 | 
														
														 | 
														
															         } else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             qw.eq("status_flag", "1"); 
														 | 
														
														 | 
														
															             qw.eq("status_flag", "1"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (StringUtil.notBlank(startTime)) { 
														 | 
														
														 | 
														
															         if (StringUtil.notBlank(startTime)) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            qw.gt("req_date", startTime) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    .le("req_date", endTime); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            qw.gt(dateName, startTime) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    .le(dateName, endTime); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (publicServer.noNeedRule()) { 
														 | 
														
														 | 
														
															         if (publicServer.noNeedRule()) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             qw.in("req_dept1", deptList); 
														 | 
														
														 | 
														
															             qw.in("req_dept1", deptList); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 |