diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java index 26041895..d5747391 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java @@ -4,9 +4,12 @@ import java.util.List; import java.util.Arrays; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; + +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import com.klp.common.annotation.RepeatSubmit; @@ -129,8 +132,8 @@ public class WmsCoilWarehouseOperationLogController extends BaseController { @RequestParam Long secondWarehouseId, @RequestParam(required = false) Integer operationType, @RequestParam(required = false) Integer inOutType, - @RequestParam(required = false) Date startTime, - @RequestParam(required = false) Date endTime) { + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) { return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime)); } @@ -148,8 +151,8 @@ public class WmsCoilWarehouseOperationLogController extends BaseController { @RequestParam @NotNull(message = "钢卷ID不能为空") Long coilId, @RequestParam(required = false) Integer operationType, @RequestParam(required = false) Integer inOutType, - @RequestParam(required = false) Date startTime, - @RequestParam(required = false) Date endTime) { + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) { return R.ok(iWmsCoilWarehouseOperationLogService.queryByCoilId(coilId, operationType, inOutType, startTime, endTime)); } @@ -168,8 +171,8 @@ public class WmsCoilWarehouseOperationLogController extends BaseController { @RequestParam Long secondWarehouseId, @RequestParam(required = false) Integer operationType, @RequestParam(required = false) Integer inOutType, - @RequestParam(required = false) Date startTime, - @RequestParam(required = false) Date endTime, + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime, HttpServletResponse response) { List list = iWmsCoilWarehouseOperationLogService.exportBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime); ExcelUtil.exportExcel(list, "钢卷库区操作记录导出", WmsCoilWarehouseOperationLogExportVo.class, response);