rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-xiantao5-lhj0905' into test

This commit is contained in:
10001392 2024-09-18 10:12:41 +08:00
parent 206b0ef774 f6816350a3
commit 056419928d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
View File

@ -98,12 +98,13 @@ public class DQBomApi extends BaseApi {
@PostMapping("getPageList") @PostMapping("getPageList")
@ApiOperation("分页查询数据") @ApiOperation("分页查询数据")
public ResultVO<Page<BomNewDQbomVO>> getPageList(@Valid @RequestBody @NotNull BomNewDQbomPageQuery query) { public ResultVO<Page<BomNewDQbomVO>> getPageList(@Valid @RequestBody @NotNull BomNewDQbomPageQuery query) {
if (query.getStatus() == 2) { // 电气BOM正式表查询无须添加时间条件 by 10002327 240918
if (StrUtil.isBlank(query.getStartDate()) && StrUtil.isBlank(query.getEndDate())) { // if (query.getStatus() == 2) {
query.setStartDate(LocalDateTimeUtil.format(LocalDateTime.now().plusDays(-2), "yyyy-MM-dd")); // if (StrUtil.isBlank(query.getStartDate()) && StrUtil.isBlank(query.getEndDate())) {
query.setEndDate(LocalDateTimeUtil.format(LocalDateTime.now().plusDays(1), "yyyy-MM-dd")); // query.setStartDate(LocalDateTimeUtil.format(LocalDateTime.now().plusDays(-2), "yyyy-MM-dd"));
} // query.setEndDate(LocalDateTimeUtil.format(LocalDateTime.now().plusDays(1), "yyyy-MM-dd"));
} // }
// }
return ResultVO.success(dQBomService.getPageList(query)); return ResultVO.success(dQBomService.getPageList(query));
} }