From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:24 +0800
Subject: [PATCH] merge

---
 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
index b0159f8..a108e43 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
@@ -1,4 +1,5 @@
 package com.sinata.web.controller.applet;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.common.collect.Lists;
 import java.util.Date;
 
@@ -23,6 +24,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,20 +59,20 @@
 
     @ApiOperation(value = "出库统计上")
     @PostMapping("/total")
-    public R<List<CollectTotalUpDto>> total(LocalDate date) {
+    public R<List<CollectTotalUpDto>> total(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         return R.ok(mwCheckoutRecordService.totalUp(date,sysUser.getDepartmentId()));
     }
 
     @ApiOperation(value = "接收统计上",tags = "处置人员")
     @PostMapping("/out/total")
-    public R<List<CollectTotalUpDto>> outtotal(@ApiParam("日期1") LocalDate date1,@ApiParam("日期2")LocalDate date2) {
+    public R<List<CollectTotalUpDto>> outtotal(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         return R.ok(mwCheckoutRecordService.totalUp2(date1,date2,sysUser.getUserId()));
     }
     @ApiOperation(value = "接收统计下",tags = "处置人员")
     @PostMapping("/out/record")
-    public R<List<CheckOutDto>> record1(@ApiParam("日期1") LocalDate date1,@ApiParam("日期2")LocalDate date2) {
+    public R<List<CheckOutDto>> record1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         LocalDate now = LocalDate.now();
         List<MwDisposalRecord> list = disposalRecordService.lambdaQuery().ge(date1!=null,MwDisposalRecord::getReceiveTime, date1).le(date2!=null,MwDisposalRecord::getReceiveTime,date2).eq(MwDisposalRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalRecord::getReceiveTime).list();
@@ -91,14 +93,14 @@
 
     @ApiOperation(value = "处置统计上",tags = "处置人员")
     @PostMapping("/end/total")
-    public R<List<CollectTotalUpDto>> outtotal1(@ApiParam("日期1") LocalDate date1,@ApiParam("日期2")LocalDate date2) {
+    public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date1, @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         return R.ok(mwCheckoutRecordService.totalUp2(date1,date2,sysUser.getUserId()));
     }
 
     @ApiOperation(value = "处置统下",tags = "处置人员")
     @PostMapping("/end/record")
-    public R<List<CheckOutDto>> record2(@ApiParam("日期1") LocalDate date1,@ApiParam("日期2")LocalDate date2) {
+    public R<List<CheckOutDto>> record2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         LocalDate now = LocalDate.now();
         List<MwDisposalHandleRecord> list = handleRecordService.lambdaQuery().ge(date1!=null,MwDisposalHandleRecord::getDisposalTime, date1).le(date2!=null,MwDisposalHandleRecord::getDisposalTime,date2).eq(MwDisposalHandleRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalHandleRecord::getDisposalTime).list();

--
Gitblit v1.7.1