From 19ed562068b7cf350f28216fbc491d8a3d9b67aa Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 26 Aug 2021 13:54:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index ccd200f7..9774715e 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -13,8 +13,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow")
-//@FeignClient(value = "shan6")
+//@FeignClient(value = "bat-wkflow")
+@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)

From 6c94bcb070ef34b5fb4c7048f0ffc7cde77f7ba7 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 26 Aug 2021 13:55:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index c5064cbb..43d3696d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -50,7 +50,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         list.like(StringUtils.isNotEmpty(category),"category",category)
                 .like(StringUtils.isNotEmpty(cname),"cname",cname)
                 .ge(start!=null,"start_time",start)
-                .le(end!=null,"end_time",end);
+                .le(end!=null,"end_time",end)
+                .orderByDesc("end_time");
         Page<SarPublicIdea> page = new Page<>(p,size);
         IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
         System.out.println("总条数"+userIPage.getTotal());

From 7b940f7c91e6bbab5e11bd5acd06ef45b57262cf Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 26 Aug 2021 13:56:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index 9774715e..ccd200f7 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -13,8 +13,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-//@FeignClient(value = "bat-wkflow")
-@FeignClient(value = "shan6")
+@FeignClient(value = "bat-wkflow")
+//@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)

From 6aeb9b91ac7dfd7302412080081dc05fbf14f3e9 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 26 Aug 2021 14:25:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index 43d3696d..ccf77fd3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -51,7 +51,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                 .like(StringUtils.isNotEmpty(cname),"cname",cname)
                 .ge(start!=null,"start_time",start)
                 .le(end!=null,"end_time",end)
-                .orderByDesc("end_time");
+                .orderByDesc("start_time");
         Page<SarPublicIdea> page = new Page<>(p,size);
         IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
         System.out.println("总条数"+userIPage.getTotal());