|
|
@@ -51,7 +51,7 @@ public class DriverDailyCargoDamageController extends BaseController {
|
|
|
@PostMapping("/page")
|
|
|
@ResponseBody
|
|
|
public PageResult<DriverGoodsLossRecordResponse> page(@Validated @RequestBody DriverDailyCargoDamagePageRequest request, AdminUserInfo adminUserInfo) {
|
|
|
- if (null == request.getStatDate() || (null == request.getBeginStatDate() || null == request.getEndStatDate() || null == request.getAreaStaffId())) {
|
|
|
+ if (null == request.getStatDate() && (null == request.getBeginStatDate() || null == request.getEndStatDate() || null == request.getAreaStaffId())) {
|
|
|
throw new MessageException("参数错误, 统计日期 或 开始统计日期及结束统计日期与区间员工id不能为空");
|
|
|
}
|
|
|
DriverDailyCargoDamagePageBo bo = DriverDailyCargoDamageMapStruct.MAPSTRUCT.pageRequestToBo(request);
|
|
|
@@ -80,7 +80,7 @@ public class DriverDailyCargoDamageController extends BaseController {
|
|
|
@PostMapping("/export")
|
|
|
@ResponseBody
|
|
|
public Result<String> export(@Validated @RequestBody DriverDailyCargoDamageExportRequest request, AdminUserInfo adminUserInfo) {
|
|
|
- if (null == request.getStatDate() || (null == request.getBeginStatDate() || null == request.getEndStatDate() || null == request.getAreaStaffId())) {
|
|
|
+ if (null == request.getStatDate() && (null == request.getBeginStatDate() || null == request.getEndStatDate() || null == request.getAreaStaffId())) {
|
|
|
throw new MessageException("参数错误, 统计日期 或 开始统计日期及结束统计日期与区间员工id不能为空");
|
|
|
}
|
|
|
DriverDailyCargoDamageExportBo bo = DriverDailyCargoDamageMapStruct.MAPSTRUCT.exportRequestToBo(request);
|