From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
index 52dabd3..00d235c 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
@@ -21,11 +21,12 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
-import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
@@ -35,6 +36,7 @@
import org.springframework.http.ResponseEntity;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@@ -66,7 +68,17 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
- carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+ if(reqJson.containsKey("boxId")) {
+ carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+ }else{
+ carInoutPaymentDto.setPaId(reqJson.getString("paId"));
+ }
+
+ if(!StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
+ Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
+ carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
+ }
+
int count = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentsCount(carInoutPaymentDto);
List<CarInoutPaymentDto> carInoutPaymentDtos = null;
--
Gitblit v1.8.0