This commit is contained in:
shuo.wang
2025-06-09 14:30:02 +08:00
parent 7d88be8a1d
commit aa789e1e93
3 changed files with 4 additions and 3 deletions

View File

@@ -514,6 +514,7 @@
</foreach>
</if>
and b.actual_complete_time >= #{request.buildStartTime} and b.actual_complete_time &lt;= #{request.buildEndTime}
order by b.actual_complete_time desc
</select>
<select id="selectShopListByUser" resultType="com.cool.store.entity.ShopInfoDO">
select

View File

@@ -272,7 +272,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
log.info("数据为空");
return null;
}
franchiseReportDTOPageInfo.setList(list.stream().sorted(Comparator.comparing(ShopReportResponse::getBuildTime).reversed()).collect(Collectors.toList()));
franchiseReportDTOPageInfo.setList(list);
return franchiseReportDTOPageInfo;
}

View File

@@ -58,13 +58,13 @@ public class ExportController {
}
@PostMapping("/zxjpOpenShopReport")
@ApiOperation("正新鸡排开店")
@ApiOperation("正新鸡排开店导出")
public ResponseResult zxjpOpenShopReport(@RequestBody FranchiseReportRequest request) {
return ResponseResult.success(exportService.exportZxjpOpenShopReport(request, CurrentUserHolder.getUser()));
}
@PostMapping("/zxjpOpenShopReportPage")
@ApiOperation("正新鸡排开店")
@ApiOperation("正新鸡排开店明细报表导出")
public ResponseResult zxjpOpenShopReportPage(@RequestBody FranchiseReportRequest request) {
return ResponseResult.success(exportService.exportZxjpOpenShopReportPage(request, CurrentUserHolder.getUser()));
}