|
@@ -70,11 +70,16 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
|
|
|
wrapper.eq("network_status",Integer.parseInt(networkStatus));
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(registerEndTime)){
|
|
|
- registerEndTime = registerStartTime+" 23:59:59";
|
|
|
+ registerEndTime = registerEndTime+" 23:59:59";
|
|
|
wrapper.le("register.register_time",registerEndTime);
|
|
|
}
|
|
|
|
|
|
- wrapper.ge(StringUtils.isNotBlank(registerEndTime),"register.register_time",registerStartTime);
|
|
|
+ if(StringUtils.isNotBlank(registerStartTime)){
|
|
|
+ registerStartTime = registerStartTime+" 00:00:00";
|
|
|
+ wrapper.ge("register.register_time",registerStartTime);
|
|
|
+ }
|
|
|
+
|
|
|
+// wrapper.ge(StringUtils.isNotBlank(registerEndTime),"register.register_time",registerStartTime);
|
|
|
|
|
|
wrapper.apply("register.del_status = 1");
|
|
|
|