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

adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java

@@ -69,7 +69,7 @@ public class DocConverterPdf {
     /**
      * openOffice目录，window 可能在C://Program Files (x86)//OpenOffice 4
      */
-    private static final String openOfficeHome = "E://Software//rtpro//Foton//File//openOffice//4";
+    private static final String openOfficeHome = "/opt/openoffice4";
 
     /**
      * openOffice端口

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());