From f3e7ecf643ec517ad93b80a50e63eaab90b6461b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 07 二月 2023 15:51:22 +0800
Subject: [PATCH] 三说会堂事件搜索修改

---
 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 59c943d..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){
+        if(comActNeighborCircleDO.getSolveStatus()!=null && comActNeighborCircleDO.getSolveStatus() == 3){
             comActNeighborCircleDO.setSolveTime(new Date());
         }
         if(comActNeighborCircleDO.getOrderStatus()!=null){

--
Gitblit v1.7.1