liutao 3 dias atrás
pai
commit
03b8ecf60a

+ 4 - 4
YHYZT/server/src/main/java/com/zjugis/yzt/controller/StNzydkController.java

@@ -50,8 +50,8 @@ public class StNzydkController extends BaseRestController {
             @RequestParam(required = false) String pch,
             @RequestParam(required = false) String lx,
             @RequestParam(required = false) String pwh,
-            @RequestParam(required = false) String pzrqStart,
-            @RequestParam(required = false) String pzrqEnd,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date pzrqStart,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date pzrqEnd,
             @RequestParam(required = false) BigDecimal pzmj,
             @RequestParam(required = false) String nmjf,
             @RequestParam(required = false) String pcbh,
@@ -68,10 +68,10 @@ public class StNzydkController extends BaseRestController {
         if (pwh != null && !pwh.isEmpty()) {
             queryWrapper.like("pwh", URLDecoder.decode(pwh));
         }
-        if (pzrqStart != null && !pzrqStart.isEmpty()) {
+        if (pzrqStart != null) {
             queryWrapper.ge("pzrq", pzrqStart);
         }
-        if (pzrqEnd != null && !pzrqEnd.isEmpty()) {
+        if (pzrqEnd != null) {
             queryWrapper.le("pzrq", pzrqEnd);
         }
         if (pzmj != null) {