优化代码

java110-db/src/main/resources/mapper/common/CarInoutPaymentV1ServiceDaoImplMapper.xml

@@ -194,10 +194,17 @@
     <select id="queryCarInoutPaymentSummary" parameterType="Map" resultType="Map">
         select DATE_FORMAT(t.create_time,'%Y-%m-%d') createTime,sum(real_charge) realChargeTotal
         from car_inout_payment t
+          <if test="boxId != null and boxId != ''">
         LEFT JOIN parking_area pa on t.pa_id = pa.pa_id and pa.status_cd = '0'
         LEFT join parking_box_area pba on pa.pa_id = pba.pa_id and pba.status_cd = '0'
+          </if>
         where t.status_cd = '0'
-        and pba.box_id = #{boxId}
+        <if test="boxId != null and boxId != ''">
+            and pba.box_id = #{boxId}
+        </if>
+        <if test="paId != null and paId != ''">
+            and t.pa_id = #{paId}
+        </if>
         <if test="startTime !=null and startTime != ''">
             and t.create_time &gt; #{startTime}
         </if>

service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java

@@ -73,14 +73,22 @@ public class ListCarInParkingAreaCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
+        if(reqJson.containsKey("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;

service-common/src/main/java/com/java110/common/cmd/carInoutDetail/ListCarInoutDetailCmd.java

@@ -69,7 +69,11 @@ public class ListCarInoutDetailCmd extends Cmd {
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         CarInoutDetailDto carInoutDetailDto = BeanConvertUtil.covertBean(reqJson, CarInoutDetailDto.class);
-        carInoutDetailDto.setPaIds(getPaIds(reqJson));
+        if(reqJson.containsKey("boxId")) {
+            carInoutDetailDto.setPaIds(getPaIds(reqJson));
+        }else{
+            carInoutDetailDto.setPaId(reqJson.getString("paId"));
+        }
         int count = carInoutDetailV1InnerServiceSMOImpl.queryCarInoutDetailsCount(carInoutDetailDto);
 
         List<CarInoutDetailDto> carInoutDetailDtos = null;

service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java

@@ -68,7 +68,11 @@ public class ListCarInoutPaymentCmd extends Cmd {
     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());

service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentSummaryCmd.java

@@ -62,7 +62,12 @@ public class ListCarInoutPaymentSummaryCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
+        if(reqJson.containsKey("boxId")) {
+            Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
+        }else{
+            Assert.hasKeyAndValue(reqJson, "paId", "未包含停车场");
+
+        }
     }
 
     @Override
@@ -70,6 +75,7 @@ public class ListCarInoutPaymentSummaryCmd extends Cmd {
 
         CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
         carInoutPaymentDto.setBoxId(reqJson.getString("boxId"));
+        carInoutPaymentDto.setPaId(reqJson.getString("paId"));
 
         if(StringUtil.isEmpty(carInoutPaymentDto.getStartTime())){
             Calendar calendar = Calendar.getInstance();