From 2a212f983f35e1c569dfec3a172fb5f0c9f85fac Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index 3bd95fb..a940986 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -364,6 +364,12 @@
});
return R.ok(doPager);
}
+ @Override
+ public R pageNeighborByBigScreen(ComActNeighborCircleAdminDTO neighborCircleAdminDTO) {
+ Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
+ IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByBigScreen(page, neighborCircleAdminDTO);
+ return R.ok(doPager);
+ }
@Override
public R addNeighborByAdmin(AddNeighborCircleAdminVO addVO) {
@@ -1043,7 +1049,7 @@
public R orderAndSolve(EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
ComActNeighborCircleDO comActNeighborCircleDO=new ComActNeighborCircleDO();
BeanUtils.copyProperties(editNeighborCircleAdminVO,comActNeighborCircleDO);
- if(comActNeighborCircleDO.getSolveStatus()!=null&&comActNeighborCircleDO.getSolveStatus()==3){
+ if(comActNeighborCircleDO.getSolveStatus()!=null && comActNeighborCircleDO.getSolveStatus() == 3){
comActNeighborCircleDO.setSolveTime(new Date());
}
if(comActNeighborCircleDO.getOrderStatus()!=null){
--
Gitblit v1.7.1