Merge remote-tracking branch 'origin/develop_master' into develop_3

adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java

@@ -111,7 +111,7 @@ public class SendBussMQService {
         if (StringUtils.isNotBlank(infoEO.getPutTime())) {
             try {
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                put_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
+                put_time_data = format.parse(dateFormatToStr(infoEO.getPutTime())+" 00:00:00");
             } catch (ParseException ignored) {
             }
         }

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("start_time");
+                .orderByAsc("end_time");
         Page<SarPublicIdea> page = new Page<>(p,size);
         IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
         System.out.println("总条数"+userIPage.getTotal());