From 4ccc419c2ab6a8793ea48e94ca140f67cc866a1b Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 21 Aug 2023 15:17:19 +0800 Subject: [PATCH] update --- .../jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java | 4 ++++ .../pile/service/impl/PileBillingTemplateServiceImpl.java | 5 +++++ .../main/resources/mapper/pile/PileBillingTemplateMapper.xml | 2 ++ 3 files changed, 11 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java index 919e4342a..9da8b38cf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java @@ -87,4 +87,8 @@ public class CreateOrUpdateBillingTemplateDTO { @ApiModelProperty("时段清单") private List timeArray; + private String freeTime; + + private String occupyFee; + } 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 04456a427..3891d2145 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 @@ -170,6 +170,9 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi billingTemplate.setTemplateCode(templateCode); billingTemplate.setCreateBy(SecurityUtils.getUsername()); billingTemplate.setDelFlag(DelFlagEnum.NORMAL.getValue()); + billingTemplate.setFreeTime(dto.getFreeTime()); + billingTemplate.setOccupyFee(dto.getOccupyFee()); + if (StringUtils.isBlank(dto.getStationId())) { // 公共模板标识（0-私有；1-公共） billingTemplate.setPublicFlag(Constants.ONE); @@ -225,6 +228,8 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi billingTemplate.setType(String.valueOf(dto.getType())); billingTemplate.setRemark(dto.getRemark()); billingTemplate.setUpdateBy(SecurityUtils.getUsername()); + billingTemplate.setFreeTime(dto.getFreeTime()); + billingTemplate.setOccupyFee(dto.getOccupyFee()); // key为时间类型，value为时间描述 Map> map = dto.getTimeArray().stream() diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index fa445a80c..8947108d4 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -85,6 +85,8 @@ select a.id as id, a.template_code, a.name, + a.free_time, + a.occupy_fee, a.remark, a.type, a.station_id,