查询桩的计费模板, 区分桩类型

This commit is contained in:
Guoqs
2024-09-06 14:51:39 +08:00
parent 0fffba949d
commit 7bebbe64ad
3 changed files with 8 additions and 2 deletions

View File

@@ -244,7 +244,7 @@ public class PileService {
String pileSn = pileConnectorDetailVO.getPileSn();
AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn);
List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList();
if (connectorInfoList.size() > 1) {
if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) {
List<ConnectorInfoVO> list = Lists.newArrayList();
// 枪口大于1个此充电桩非单枪设备根据参数展示对应枪口的信息
for (ConnectorInfoVO connectorInfoVO : connectorInfoList) {
@@ -253,6 +253,8 @@ public class PileService {
}
}
resultVO.setConnectorInfoList(list);
} else {
resultVO.setConnectorInfoList(connectorInfoList);
}
return resultVO;
}

View File

@@ -128,6 +128,8 @@ public interface PileBillingTemplateService {
*/
BillingTemplateVO selectBillingTemplateDetailByPileSn(String pileSn);
BillingTemplateVO selectBillingTemplateDetailByPileSn(String pileSn, String deviceType);
/**
* 站点导入计费模板
*

View File

@@ -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
</select>
<select id="selectBillingTemplateByTemplateId" resultType="com.jsowell.pile.vo.web.BillingTemplateVO">