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

Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613

Browse Source
This commit is contained in:
gaojiabao
2023-06-19 16:24:35 +08:00
parent 9eb859c6c4 c204a21b12
commit 853e86279a
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java
+4 -4
View File
@@ -41,20 +41,20 @@ public class PDMCSarLawsStandInfoController extends BaseController<PDMCSarLawsSt
public ResponseMessage<PageInfo<PDMCSarLawsStandInfo>> getSarStandardsInfoPage(
@RequestParam(value = "current", defaultValue = "1") Long current,
@RequestParam(value = "limit",required = false) Long limit) throws Exception {
Long count = pdmcSarLawsStandInfoService.getSarStandardsCount();
if (ObjectUtil.isEmpty(limit)){
int count = pdmcSarLawsStandInfoService.getSarStandardsCount();
if (count == 0) {
return Result.error("文件信息为空");
}
limit = (long) count;
limit = count;
}
Page<PDMCSarLawsStandInfo> page = new Page<>(current, limit);
Page<PDMCSarLawsStandInfo> page = new Page<>(current, limit,false);
Page<PDMCSarLawsStandInfo> sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page);
PageInfo<PDMCSarLawsStandInfo> pdmcSarLawsStandInfoPageInfo = new PageInfo<>();
pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords());
pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent());
pdmcSarLawsStandInfoPageInfo.setCount(sarStandardsInfoPage.getTotal());
pdmcSarLawsStandInfoPageInfo.setCount(count);
pdmcSarLawsStandInfoPageInfo.setPageSize((int) sarStandardsInfoPage.getSize());
if (pdmcSarLawsStandInfoPageInfo.getList().isEmpty()) {
return Result.error("404","文件信息为空",pdmcSarLawsStandInfoPageInfo);
adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java
+1 -1
View File
@@ -12,5 +12,5 @@ import java.util.List;
public interface PDMCSarLawsStandInfoDao extends BaseMapper<PDMCSarLawsStandInfo> {
Page<PDMCSarLawsStandInfo> getSarStandardsInfo(@Param("page")Page<PDMCSarLawsStandInfo> page);
int getSarStandardsCount();
Long getSarStandardsCount();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java
+1 -1
View File
@@ -15,5 +15,5 @@ import java.util.List;
public interface PDMCSarLawsStandInfoService extends IService<PDMCSarLawsStandInfo> {
Page<PDMCSarLawsStandInfo> getSarStandardsInfo(Page<PDMCSarLawsStandInfo> page);
int getSarStandardsCount();
Long getSarStandardsCount();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl<PDMCSarLawsStan
}
@Override
public int getSarStandardsCount() {
public Long getSarStandardsCount() {
return baseMapper.getSarStandardsCount();
}
}