From eed493ecdd0900e1d6e434523597308aef420d73 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 十月 2022 02:05:12 +0800
Subject: [PATCH] 优化 营销文本 代码
---
service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
index b2bd13a..6fcf98e 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
@@ -73,14 +73,22 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
- Assert.hasKeyAndValue(reqJson, "boxId", "鏈寘鍚矖浜俊鎭�");
+ if(reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
+ Assert.hasKeyAndValue(reqJson, "boxId", "鏈寘鍚矖浜俊鎭�");
+ }else{
+ Assert.hasKeyAndValue(reqJson, "paId", "鏈寘鍚仠杞﹀満淇℃伅");
+ }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
carInoutDto.setStates(new String[]{CarInoutDto.STATE_IN, CarInoutDto.STATE_PAY, CarInoutDto.STATE_REPAY});
- carInoutDto.setPaIds(getPaIds(reqJson));
+ if(reqJson.containsKey("boxId")) {
+ carInoutDto.setPaIds(getPaIds(reqJson));
+ }else{
+ carInoutDto.setPaId(reqJson.getString("paId"));
+ }
int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
List<CarInoutDto> carInoutDtos = null;
--
Gitblit v1.8.0