diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java index 9577f21d1..9eb26a176 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java @@ -167,6 +167,17 @@ public class PileBillingTemplateController extends BaseController { return getDataTable(list); } + /** + * 查询站点优惠计费模板 + */ + @GetMapping("/queryStationPreferentialBillingTemplateList/{stationId}") + public TableDataInfo queryStationPreferentialBillingTemplateList(@PathVariable("stationId") String stationId) { + logger.info("查询站点优惠计费模板 param:{}", stationId); + List list = pileBillingTemplateService.queryStationPreferentialBillingTemplateList(stationId); + logger.info("查询站点优惠计费模板 result:{}", JSONObject.toJSONString(list)); + return getDataTable(list); + } + /** * 发布计费模板 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java index c96570eff..69140c585 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java @@ -103,7 +103,8 @@ public interface PileBillingTemplateMapper { * @return */ List queryStationBillingTemplateListWithAuth(@Param("stationId") String stationId, - @Param("stationDeptIds") List stationDeptIds); + @Param("stationDeptIds") List stationDeptIds, + @Param("memberFlag") String memberFlag); /** * 根据站点id查询站点计费模板列表 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 49a391940..ff32dd43f 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 @@ -91,6 +91,8 @@ public interface PileBillingTemplateService { */ List queryStationBillingTemplateList(String stationId); + List queryStationPreferentialBillingTemplateList(String stationId); + /** * 查询站点计费模板 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 6b974d339..de0397991 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -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 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); } /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index e474297b1..24e0bde73 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -370,6 +370,9 @@ where t2.del_flag = '0' and t2.station_id = #{stationId,jdbcType=VARCHAR} + + and t2.member_flag = #{memberFlag,jdbcType=VARCHAR} + and t1.dept_id in