From bc8750e55ae35a58e3e282198fe47d13e8727023 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 07 四月 2023 16:37:05 +0800
Subject: [PATCH] optimize community publicity

---
 service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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..d312ddf 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
@@ -26,6 +26,7 @@
 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