Browse Source

查询异常修复

contract
Yen 2 years ago
parent
commit
43363c1fcb
  1. 2
      src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
  2. 4
      src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java
  3. 7
      src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java
  4. 8
      src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java
  5. 8
      src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java

2
src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java

@ -50,7 +50,7 @@ public class BazVisitInstanceController {
lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate()); lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate());
} }
if(param.getQueryEndDate()!=null){ if(param.getQueryEndDate()!=null){
lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59));
} }
PageUtil.startPage(); PageUtil.startPage();
lqw.orderByDesc(BazVisitInstance::getCreateTime); lqw.orderByDesc(BazVisitInstance::getCreateTime);

4
src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java

@ -56,7 +56,7 @@ public class BazMyVisitInstanceController {
lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate()); lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate());
} }
if(param.getQueryEndDate()!=null){ if(param.getQueryEndDate()!=null){
lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59));
} }
PageUtil.startPage(); PageUtil.startPage();
lqw.eq(BazVisitInstance::getVisitorId, AuthContextUtils.getSysUserId()); lqw.eq(BazVisitInstance::getVisitorId, AuthContextUtils.getSysUserId());
@ -78,7 +78,7 @@ public class BazMyVisitInstanceController {
lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate()); lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate());
} }
if(param.getQueryEndDate()!=null){ if(param.getQueryEndDate()!=null){
lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59));
} }
List<String> userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId()); List<String> userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
if(userIds.size()<1){ if(userIds.size()<1){

7
src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java

@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType;
import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.model.enums.SystemModule;
import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.AuthContextUtils;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.PageUtil;
import com.qs.serve.modules.baz.entity.BazVisitInstance;
import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysPostUserService;
import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserSalesService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -65,6 +66,12 @@ public class BizVisitController {
PageUtil.startPage(); PageUtil.startPage();
LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param); LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
visitWrapper.orderByDesc(BizVisit::getId); visitWrapper.orderByDesc(BizVisit::getId);
if(param.getQueryStartTime()!=null){
visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
}
if(param.getQueryEndTime()!=null){
visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
}
List<BizVisit> list = bizVisitService.list(visitWrapper); List<BizVisit> list = bizVisitService.list(visitWrapper);
return R.byPageHelperList(list); return R.byPageHelperList(list);
} }

8
src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java

@ -61,7 +61,7 @@ public class BizVisitApi {
visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
} }
if(param.getQueryEndTime()!=null){ if(param.getQueryEndTime()!=null){
visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime()); visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
} }
visitWrapper.orderByDesc(BizVisit::getCreateTime); visitWrapper.orderByDesc(BizVisit::getCreateTime);
List<BizVisit> list = bizVisitService.list(visitWrapper); List<BizVisit> list = bizVisitService.list(visitWrapper);
@ -86,6 +86,12 @@ public class BizVisitApi {
} }
PageUtil.startPage(); PageUtil.startPage();
LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param); LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
if(param.getQueryStartTime()!=null){
visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
}
if(param.getQueryEndTime()!=null){
visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
}
visitWrapper.in(BizVisit::getVisitorId,userIds); visitWrapper.in(BizVisit::getVisitorId,userIds);
visitWrapper.orderByDesc(BizVisit::getCreateTime); visitWrapper.orderByDesc(BizVisit::getCreateTime);
List<BizVisit> list = bizVisitService.list(visitWrapper); List<BizVisit> list = bizVisitService.list(visitWrapper);

8
src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java

@ -51,7 +51,7 @@ public class BizVisitMyController {
visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
} }
if(param.getQueryEndTime()!=null){ if(param.getQueryEndTime()!=null){
visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime()); visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
} }
visitWrapper.orderByDesc(BizVisit::getCreateTime); visitWrapper.orderByDesc(BizVisit::getCreateTime);
List<BizVisit> list = bizVisitService.list(visitWrapper); List<BizVisit> list = bizVisitService.list(visitWrapper);
@ -74,6 +74,12 @@ public class BizVisitMyController {
LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param); LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
visitWrapper.in(BizVisit::getVisitorId,userIds); visitWrapper.in(BizVisit::getVisitorId,userIds);
visitWrapper.orderByDesc(BizVisit::getCreateTime); visitWrapper.orderByDesc(BizVisit::getCreateTime);
if(param.getQueryStartTime()!=null){
visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
}
if(param.getQueryEndTime()!=null){
visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
}
List<BizVisit> list = bizVisitService.list(visitWrapper); List<BizVisit> list = bizVisitService.list(visitWrapper);
return R.byPageHelperList(list); return R.byPageHelperList(list);
} }

Loading…
Cancel
Save