From 658d83e47e0838727230771e4cca2efffff588dc Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 12 Aug 2022 14:16:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?=
 =?UTF-8?q?6968=20=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=861589=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=B2=A1=E6=94=B9=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarBussionessStand/SarBussionessStandMapper.xml       | 1 +
 .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index f0a7d48e..0bb01089 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -386,6 +386,7 @@
         <if test="pager.orderCondition != null and pager.orderCondition != ''" >
             ${pager.orderCondition}
         </if>
+        order by SAR_BUSSIONESS_STAND.stand_year desc
     </select>
 
     <select id="queryByBussStateSync" resultMap="BaseResultMap"
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index f088607f..15687b2d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -1565,6 +1565,7 @@
         <if test="sychronId != null">
             and id != #{sychronId}
         </if>
+        order by SAR_STANDARDS_INFO.stand_year desc
     </select>
 
     <select id="queryStandInfoByList" resultMap="BaseResultMap">

From f14a6f2c62a546c5861daa33aa331854aa2b16bf Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 16 Aug 2022 17:01:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/SarPublicIdeaServiceImpl.java        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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 319c4ef4..e5351209 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
@@ -48,22 +48,26 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         QueryWrapper<SarPublicIdea> list = new QueryWrapper<>();
         if ("1".equals(type)) {
             if (start!=null && end !=null){
+                String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
+                String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .ge(start != null, "start_time", start)
-                        .le(end != null, "end_time", end)
+                        .ge(start != null, "start_time", date1)
+                        .le(end != null, "end_time", date2)
                         .orderByDesc("start_time");
             }else if (start!=null){
+                String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .le(start != null, "start_time", start)
-                        .ge(start != null, "end_time", start)
+                        .le(start != null, "start_time", date1)
+                        .ge(start != null, "end_time", date1)
                         .orderByDesc("start_time");
             }else if (end!=null){
+                String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .le(end != null, "start_time", end)
-                        .ge(end != null, "end_time", end)
+                        .le(end != null, "start_time", date2)
+                        .ge(end != null, "end_time", date2)
                         .orderByDesc("start_time");
             }else {
                 list.like(StringUtils.isNotEmpty(category), "category", category)
@@ -71,9 +75,10 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                         .orderByDesc("start_time");
             }
         } else {
+            String date = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
             list.like(StringUtils.isNotEmpty(category), "category", category)
                     .like(StringUtils.isNotEmpty(cname), "cname", cname)
-                    .ge("end_time", new Date())
+                    .ge("end_time", date)
                     .orderByAsc("end_time");
         }
         Page<SarPublicIdea> page = new Page<>(p, size);