FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yanyizhou
2021-08-30 10:34:17 +08:00
parent 88cb99ad9b 4c6cffa061
commit b7ccbbfc45
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class DocConverterPdf {
/** /**
* openOffice目录，window 可能在C://Program Files (x86)//OpenOffice 4 * 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端口 * openOffice端口
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
.like(StringUtils.isNotEmpty(cname),"cname",cname) .like(StringUtils.isNotEmpty(cname),"cname",cname)
.ge(start!=null,"start_time",start) .ge(start!=null,"start_time",start)
.le(end!=null,"end_time",end) .le(end!=null,"end_time",end)
.orderByDesc("start_time"); .orderByAsc("end_time");
Page<SarPublicIdea> page = new Page<>(p,size); Page<SarPublicIdea> page = new Page<>(p,size);
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list); IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
System.out.println("总条数"+userIPage.getTotal()); System.out.println("总条数"+userIPage.getTotal());