From 7bebbe64adc961fb22a1e24c3b62ca2b908a29b2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 6 Sep 2024 14:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A1=A9=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E8=B4=B9=E6=A8=A1=E6=9D=BF,=20=E5=8C=BA=E5=88=86=E6=A1=A9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/PileService.java | 4 +++- .../com/jsowell/pile/service/PileBillingTemplateService.java | 2 ++ .../main/resources/mapper/pile/PileBillingTemplateMapper.xml | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 6e1c85319..9612de261 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -244,7 +244,7 @@ public class PileService { String pileSn = pileConnectorDetailVO.getPileSn(); AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn); List connectorInfoList = resultVO.getConnectorInfoList(); - if (connectorInfoList.size() > 1) { + if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) { List list = Lists.newArrayList(); // 枪口大于1个，此充电桩非单枪设备，根据参数展示对应枪口的信息 for (ConnectorInfoVO connectorInfoVO : connectorInfoList) { @@ -253,6 +253,8 @@ public class PileService { } } resultVO.setConnectorInfoList(list); + } else { + resultVO.setConnectorInfoList(connectorInfoList); } return resultVO; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java index 0c28c8a59..3ac89d7e4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java @@ -128,6 +128,8 @@ public interface PileBillingTemplateService { */ BillingTemplateVO selectBillingTemplateDetailByPileSn(String pileSn); + BillingTemplateVO selectBillingTemplateDetailByPileSn(String pileSn, String deviceType); + /** * 站点导入计费模板 * diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 98cae8193..face498b8 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -410,8 +410,10 @@ JOIN pile_billing_detail t4 ON t4.template_code = t2.template_code AND t4.time_type = '2' JOIN pile_billing_detail t5 ON t5.template_code = t2.template_code AND t5.time_type = '3' JOIN pile_billing_detail t6 ON t6.template_code = t2.template_code AND t6.time_type = '4' + left join pile_model_info t7 ON t7.id = t1.model_id WHERE - t1.sn = #{pileSn,jdbcType=VARCHAR}; + t1.sn = #{pileSn,jdbcType=VARCHAR} + and t2.type = t7.charger_pile_type