autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-30 16:10:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-02-23 13:55:45 +08:00
parent ffd02338f1 222b1bec9e
commit e5afcea626
5 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java
View File

@@ -103,7 +103,8 @@ public interface PileBillingTemplateMapper {
* @return
*/
List<BillingTemplateVO> queryStationBillingTemplateListWithAuth(@Param("stationId") String stationId,
@Param("stationDeptIds") List<String> stationDeptIds);
@Param("stationDeptIds") List<String> stationDeptIds,
@Param("memberFlag") String memberFlag);
/**
* 根据站点id查询站点计费模板列表

2
jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java
View File

@@ -91,6 +91,8 @@ public interface PileBillingTemplateService {
*/
List<BillingTemplateVO> queryStationBillingTemplateList(String stationId);
List<BillingTemplateVO> queryStationPreferentialBillingTemplateList(String stationId);
/**
* 查询站点计费模板
*

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -547,7 +547,20 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
// 为空表示没有权限，返回空数组
return Lists.newArrayList();
}
return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds());
return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds(), null);
}
@Override
public List<BillingTemplateVO> queryStationPreferentialBillingTemplateList(String stationId) {
if (StringUtils.isBlank(stationId)) {
return Lists.newArrayList();
}
AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限，返回空数组
return Lists.newArrayList();
}
return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds(), Constants.ONE);
}
/**

3
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -370,6 +370,9 @@
where
t2.del_flag = '0'
and t2.station_id = #{stationId,jdbcType=VARCHAR}
<if test="memberFlag != null and memberFlag != ''">
and t2.member_flag = #{memberFlag,jdbcType=VARCHAR}
</if>
<!--数据范围过滤-->
<if test="stationDeptIds != null and stationDeptIds.size() != 0">
and t1.dept_id in