挂失解挂修改

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssDeviceLossPageReqDTO.java

@@ -21,8 +21,8 @@ public class AssDeviceLossPageReqDTO extends AbstractStaffBizPageRequestDTO {
     @ApiModelProperty(value = "车牌颜色")
     private String vehiclePlateColor;//车牌颜色;
 
-    @ApiModelProperty(value = "挂失类型 1-挂失 2-解挂")
-    @StringConstant(values ="1, 2", message = "挂失类型只能是1或2")
+    @ApiModelProperty(value = "挂失类型 1-挂失 2-解挂 null-全部")
+    @StringConstant(values ="1,2", message = "挂失类型只能是1或2")
     private String lossType;//挂失类型;
 
     @Override

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssDeviceLossManagerImpl.java

@@ -103,8 +103,9 @@ public class AssDeviceLossManagerImpl extends AbstractManagewManager implements
         if (hasText(reqDto.getVehiclePlate()) && hasText(reqDto.getVehiclePlateColor())) {
             request.setVehicleId(reqDto.getVehiclePlate() + "_" + reqDto.getVehiclePlate());
         }
+
+        List<AssOrderType> orderTypes = new ArrayList<>();
         if (hasText(reqDto.getLossType())) {
-            List<AssOrderType> orderTypes = new ArrayList<>();
             //1-挂失，2-解挂
             if ("1".equals(reqDto.getLossType())) {
                 orderTypes.add(AssOrderType.LOSS);
@@ -115,8 +116,15 @@ public class AssDeviceLossManagerImpl extends AbstractManagewManager implements
                 orderTypes.add(AssOrderType.CARD_RELEASE_LOSS);
                 orderTypes.add(AssOrderType.OBU_RELEASE_LOSS);
             }
-            request.setOrderTypes(orderTypes);
+        }else {
+            orderTypes.add(AssOrderType.LOSS);
+            orderTypes.add(AssOrderType.CARD_LOSS);
+            orderTypes.add(AssOrderType.OBU_LOSS);
+            orderTypes.add(AssOrderType.RELEASE_LOSS);
+            orderTypes.add(AssOrderType.CARD_RELEASE_LOSS);
+            orderTypes.add(AssOrderType.OBU_RELEASE_LOSS);
         }
+        request.setOrderTypes(orderTypes);
         return orderInfoRepo.page(request).convertResult(this::toModel);
     }