feat(能源管理系统): 基础信息配置

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;
3.修改基础信息配置模块业务工具类,增加匹配查询地区名称方法;
4.修改基础信息配置模块业务工具类,增加匹配查询组织名称方法;
5.修改基础信息配置--市电峰谷配置模块详情接口,增加时段类型值返回结果字段;
6.修改基础信息配置--市电峰谷配置模块表结构字段类型,同时更新相应代码,修改部分接口业务处理逻辑,重新完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetailEnt.java

@@ -8,7 +8,6 @@ import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 市电峰谷当月明细配置
@@ -26,7 +25,7 @@ public class BasePriceStrategyDetailEnt extends BaseEnt implements Serializable
 
     @XText("市电峰谷月")
     @TableField
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     @XText("时段类型key(字典获取)")
     @TableField
@@ -34,11 +33,11 @@ public class BasePriceStrategyDetailEnt extends BaseEnt implements Serializable
 
     @XText("开始时间")
     @TableField
-    private Date startTime;
+    private String startTime;
 
     @XText("结束时间")
     @TableField
-    private Date endTime;
+    private String endTime;
 
     @XText("电价")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetailView.java

@@ -48,8 +48,7 @@ public class BasePriceStrategyDetailView implements Serializable {
 
     @XText("市电峰谷月")
     @TableField
-    private Integer strategyMonth;
-    ;
+    private String strategyMonth;
 
     @XText("时段类型key(字典获取)")
     @TableField
@@ -57,11 +56,11 @@ public class BasePriceStrategyDetailView implements Serializable {
 
     @XText("开始时间")
     @TableField
-    private Date startTime;
+    private String startTime;
 
     @XText("结束时间")
     @TableField
-    private Date endTime;
+    private String endTime;
 
     @XText("电价")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyEnt.java

@@ -25,11 +25,11 @@ public class BasePriceStrategyEnt extends BaseEnt implements Serializable {
 
     @XText("适用地区编码")
     @TableField
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
     @TableField
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyMonthEnt.java

@@ -26,7 +26,7 @@ public class BasePriceStrategyMonthEnt extends BaseEnt implements Serializable {
 
     @XText("市电峰谷月(1-12)")
     @TableField
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     /**
      * 策略明细入参

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyMonthView.java

 package pps.core.base.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import xstartup.annotation.XText;
 
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
 public class BasePriceStrategyMonthView implements Serializable {
     @XText("ID")
     @TableField
@@ -45,86 +47,5 @@ public class BasePriceStrategyMonthView implements Serializable {
 
     @XText("市电峰谷月(1-12)")
     @TableField
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
+    private String strategyMonth;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyView.java

@@ -54,11 +54,11 @@ public class BasePriceStrategyView implements Serializable {
 
     @XText("适用地区编码")
     @TableField
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
     @TableField
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java

@@ -100,7 +100,7 @@ public class BasePriceStrategyService {
             List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
             if (CollUtil.isNotEmpty(inputMonths)) {
                 List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
-                List<Integer> collect = monthList.stream()
+                List<String> collect = monthList.stream()
                         .map(BasePriceStrategyMonthEnt::getStrategyMonth)
                         .collect(Collectors.toList());
                 BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
@@ -218,7 +218,7 @@ public class BasePriceStrategyService {
                             DictUtils.getDicNameByStream(dictList, detailOutput.getPeriodTypeKey())
                     );
                 }
-                Map<Integer, List<GetBasePriceStrategyDetailOutput>> collect = detailOutputs.stream()
+                Map<String, List<GetBasePriceStrategyDetailOutput>> collect = detailOutputs.stream()
                         .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyMonth));
                 for (GetBasePriceStrategyMonthOutput monthOutput : months) {
                     monthOutput.setDetails(collect.get(monthOutput.getStrategyMonth()));
@@ -270,15 +270,15 @@ public class BasePriceStrategyService {
     public XListResult<DynamicQueryBasePriceStrategyOutput> queryBasePriceStrategyList(XContext context, DynamicQueryBasePriceStrategyInput input) {
         String id = input.getId();
         String policyName = input.getPolicyName();
-        String areaCode = input.getAreaCode();
-        Integer strategyYear = input.getStrategyYear();
+        Integer areaCode = input.getAreaCode();
+        String strategyYear = input.getStrategyYear();
         Integer isFixedPrice = input.getIsFixedPrice();
         BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
         List<BasePriceStrategyEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePriceStrategyEnt>()
                 .select(BaseEnt::getId, BasePriceStrategyEnt::getPolicyName)
                 .eq(StringUtils.isNotBlank(id), BaseEnt::getId, id)
                 .like(StringUtils.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
-                .eq(StringUtils.isNotBlank(areaCode), BasePriceStrategyEnt::getAreaCode, areaCode)
+                .eq(Objects.nonNull(areaCode), BasePriceStrategyEnt::getAreaCode, areaCode)
                 .eq(Objects.nonNull(strategyYear), BasePriceStrategyEnt::getStrategyYear, strategyYear)
                 .eq(Objects.nonNull(isFixedPrice), BasePriceStrategyEnt::getIsFixedPrice, isFixedPrice)
                 .orderByDesc(BaseEnt::getModifyTime)
@@ -313,7 +313,7 @@ public class BasePriceStrategyService {
      * @param session     会话
      */
     private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
-        Integer strategyMonth;
+        String strategyMonth;
         List<BasePriceStrategyDetailEnt> detailList;
         for (BasePriceStrategyMonthEnt monthEnt : monthList) {
             monthEnt.setStrategyId(strategyId);

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/CreateBasePriceStrategyInput.java

@@ -21,10 +21,10 @@ public class CreateBasePriceStrategyInput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/CreateBasePriceStrategyOutput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class CreateBasePriceStrategyOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DeleteBasePriceStrategyInput.java

@@ -43,10 +43,10 @@ public class DeleteBasePriceStrategyInput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DeleteBasePriceStrategyOutput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DeleteBasePriceStrategyOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DynamicQueryBasePriceStrategyInput.java

@@ -19,10 +19,10 @@ public class DynamicQueryBasePriceStrategyInput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DynamicQueryBasePriceStrategyViewOutput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/GetBasePriceStrategyInput.java

@@ -45,10 +45,10 @@ public class GetBasePriceStrategyInput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/GetBasePriceStrategyOutput.java

@@ -23,10 +23,10 @@ public class GetBasePriceStrategyOutput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/GetBasePriceStrategyViewInput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyViewInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/GetBasePriceStrategyViewOutput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/QueryBasePriceStrategyInput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-import xstartup.base.data.XPageInput;
-
-public class QueryBasePriceStrategyInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/QueryBasePriceStrategyOutput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import xstartup.base.data.XPageInput;
-public class QueryBasePriceStrategyOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/QueryBasePriceStrategyViewInput.java

 package pps.core.base.service.data.base_price_strategy;
 
+import lombok.Data;
 import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 市电峰谷策略
+ *
+ * @author ZWT
+ * @date 2023/08/31
+ */
+@Data
 public class QueryBasePriceStrategyViewInput extends XPageInput {
     @XText("ID")
     private String id;
@@ -44,109 +53,4 @@ public class QueryBasePriceStrategyViewInput extends XPageInput {
 
     @XText("固定电价")
     private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/QueryBasePriceStrategyViewOutput.java

@@ -21,10 +21,10 @@ public class QueryBasePriceStrategyViewOutput extends XPageInput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/UpdateBasePriceStrategyInput.java

@@ -26,10 +26,10 @@ public class UpdateBasePriceStrategyInput {
     private String policyName;
 
     @XText("适用地区编码")
-    private String areaCode;
+    private Integer areaCode;
 
     @XText("年份")
-    private Integer strategyYear;
+    private String strategyYear;
 
     @XText("是否固定电价(0_是;1_否)")
     private Integer isFixedPrice;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/UpdateBasePriceStrategyOutput.java

-package pps.core.base.service.data.base_price_strategy;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class UpdateBasePriceStrategyOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("策略名称")
-    private String policyName;
-
-    @XText("适用地区编码")
-    private String areaCode;
-
-    @XText("年份")
-    private Integer strategyYear;
-
-    @XText("是否固定电价(0_是;1_否)")
-    private Integer isFixedPrice;
-
-    @XText("固定电价")
-    private BigDecimal fixedElectricityPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
-
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/CreateBasePriceStrategyDetailInput.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 策略明细入参
@@ -18,7 +17,7 @@ import java.util.Date;
 public class CreateBasePriceStrategyDetailInput {
 
     @XText("市电峰谷月")
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     @XText("时段类型key(字典获取)")
     @NotBlank(message = "时段类型不能为空")
@@ -26,11 +25,11 @@ public class CreateBasePriceStrategyDetailInput {
 
     @XText("开始时间")
     @NotNull(message = "开始时间不能为空")
-    private Date startTime;
+    private String startTime;
 
     @XText("结束时间")
     @NotNull(message = "结束时间不能为空")
-    private Date endTime;
+    private String endTime;
 
     @XText("电价")
     private BigDecimal electrovalence;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/CreateBasePriceStrategyDetailOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class CreateBasePriceStrategyDetailOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/DeleteBasePriceStrategyDetailInput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DeleteBasePriceStrategyDetailInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/DeleteBasePriceStrategyDetailOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DeleteBasePriceStrategyDetailOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/DynamicQueryBasePriceStrategyDetailInput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyDetailInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/DynamicQueryBasePriceStrategyDetailOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyDetailOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/DynamicQueryBasePriceStrategyDetailViewOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyDetailViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailInput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyDetailInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailOutput.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 明细
@@ -16,16 +15,16 @@ import java.util.Date;
 public class GetBasePriceStrategyDetailOutput {
 
     @XText("市电峰谷月")
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     @XText("时段类型key(字典获取)")
     private String periodTypeKey;
 
     @XText("开始时间")
-    private Date startTime;
+    private String startTime;
 
     @XText("结束时间")
-    private Date endTime;
+    private String endTime;
 
     @XText("电价")
     private BigDecimal electrovalence;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailViewInput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyDetailViewInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailViewOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyDetailViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/QueryBasePriceStrategyDetailInput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-import xstartup.base.data.XPageInput;
-
-public class QueryBasePriceStrategyDetailInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/QueryBasePriceStrategyDetailOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import xstartup.base.data.XPageInput;
-public class QueryBasePriceStrategyDetailOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/QueryBasePriceStrategyDetailViewInput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-import xstartup.base.data.XPageInput;
-
-public class QueryBasePriceStrategyDetailViewInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/QueryBasePriceStrategyDetailViewOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import xstartup.base.data.XPageInput;
-public class QueryBasePriceStrategyDetailViewOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/UpdateBasePriceStrategyDetailInput.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 策略明细入参
@@ -19,10 +18,10 @@ public class UpdateBasePriceStrategyDetailInput {
     private String periodTypeKey;
 
     @XText("开始时间")
-    private Date startTime;
+    private String startTime;
 
     @XText("结束时间")
-    private Date endTime;
+    private String endTime;
 
     @XText("电价")
     private BigDecimal electrovalence;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_detail/UpdateBasePriceStrategyDetailOutput.java

-package pps.core.base.service.data.base_price_strategy_detail;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class UpdateBasePriceStrategyDetailOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月")
-    private Integer strategyMonth;
-
-    @XText("时段类型key(字典获取)")
-    private String periodTypeKey;
-
-    @XText("开始时间")
-    private Date startTime;
-
-    @XText("结束时间")
-    private Date endTime;
-
-    @XText("电价")
-    private BigDecimal electrovalence;
-
-    @XText("内部结算价")
-    private BigDecimal internalSettlementPrice;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-    public String getPeriodTypeKey() {
-        return this.periodTypeKey;
-    }
-
-    public void setPeriodTypeKey(String value) {
-        this.periodTypeKey = value;
-    }
-
-    public Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setStartTime(Date value) {
-        this.startTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public BigDecimal getElectrovalence() {
-        return this.electrovalence;
-    }
-
-    public void setElectrovalence(BigDecimal value) {
-        this.electrovalence = value;
-    }
-
-    public BigDecimal getInternalSettlementPrice() {
-        return this.internalSettlementPrice;
-    }
-
-    public void setInternalSettlementPrice(BigDecimal value) {
-        this.internalSettlementPrice = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/CreateBasePriceStrategyMonthInput.java

@@ -19,7 +19,7 @@ public class CreateBasePriceStrategyMonthInput {
 
     @XText("市电峰谷月(1-12)")
     @NotNull(message = "月份不能为空")
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     /**
      * 策略明细入参

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/CreateBasePriceStrategyMonthOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class CreateBasePriceStrategyMonthOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/DeleteBasePriceStrategyMonthInput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DeleteBasePriceStrategyMonthInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/DeleteBasePriceStrategyMonthOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DeleteBasePriceStrategyMonthOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/DynamicQueryBasePriceStrategyMonthInput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyMonthInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/DynamicQueryBasePriceStrategyMonthOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyMonthOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/DynamicQueryBasePriceStrategyMonthViewOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class DynamicQueryBasePriceStrategyMonthViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/GetBasePriceStrategyMonthInput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyMonthInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/GetBasePriceStrategyMonthOutput.java

@@ -19,7 +19,7 @@ public class GetBasePriceStrategyMonthOutput {
     private String id;
 
     @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     /**
      * 明细

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/GetBasePriceStrategyMonthViewInput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyMonthViewInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/GetBasePriceStrategyMonthViewOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class GetBasePriceStrategyMonthViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/QueryBasePriceStrategyMonthInput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-import xstartup.base.data.XPageInput;
-
-public class QueryBasePriceStrategyMonthInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/QueryBasePriceStrategyMonthOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import xstartup.base.data.XPageInput;
-public class QueryBasePriceStrategyMonthOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/QueryBasePriceStrategyMonthViewInput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-import xstartup.base.data.XPageInput;
-
-public class QueryBasePriceStrategyMonthViewInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/QueryBasePriceStrategyMonthViewOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import xstartup.base.data.XPageInput;
-public class QueryBasePriceStrategyMonthViewOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/UpdateBasePriceStrategyMonthInput.java

@@ -19,7 +19,7 @@ public class UpdateBasePriceStrategyMonthInput {
 
     @XText("市电峰谷月(1-12)")
     @NotNull(message = "月份不能为空")
-    private Integer strategyMonth;
+    private String strategyMonth;
 
     /**
      * 策略明细入参

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy_month/UpdateBasePriceStrategyMonthOutput.java

-package pps.core.base.service.data.base_price_strategy_month;
-
-import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
-
-public class UpdateBasePriceStrategyMonthOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("市电峰谷配置ID")
-    private String strategyId;
-
-    @XText("市电峰谷月(1-12)")
-    private Integer strategyMonth;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getStrategyId() {
-        return this.strategyId;
-    }
-
-    public void setStrategyId(String value) {
-        this.strategyId = value;
-    }
-
-    public Integer getStrategyMonth() {
-        return this.strategyMonth;
-    }
-
-    public void setStrategyMonth(Integer value) {
-        this.strategyMonth = value;
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/utils/DictUtils.java

@@ -95,9 +95,9 @@ public class DictUtils {
      * @param areaCode 区号
      * @return {@link String}
      */
-    public static String getAreaNameByStream(List<GetSysAreaOutput> areaList, String areaCode) {
+    public static String getAreaNameByStream(List<GetSysAreaOutput> areaList, Integer areaCode) {
         return areaList.stream()
-                .filter(area -> StringUtils.equals(String.valueOf(area.getId()), areaCode))
+                .filter(area -> area.getId().equals(areaCode))
                 .map(GetSysAreaOutput::getName)
                 .findAny()
                 .orElse("其他地区");

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyDetailViewMapper.xml

@@ -11,10 +11,10 @@
         <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
         <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
         <result column="strategy_id" property="strategyId" jdbcType="VARCHAR"/>
-        <result column="strategy_month_id" property="strategyMonthId" jdbcType="VARCHAR"/>
+        <result column="strategy_month" property="strategyMonth" jdbcType="VARCHAR"/>
         <result column="period_type_key" property="periodTypeKey" jdbcType="VARCHAR"/>
-        <result column="start_time" property="startTime" jdbcType="DATE"/>
-        <result column="end_time" property="endTime" jdbcType="DATE"/>
+        <result column="start_time" property="startTime" jdbcType="VARCHAR"/>
+        <result column="end_time" property="endTime" jdbcType="VARCHAR"/>
         <result column="electrovalence" property="electrovalence" jdbcType="DECIMAL"/>
         <result column="internal_settlement_price" property="internalSettlementPrice" jdbcType="DECIMAL"/>
     </resultMap>
@@ -29,7 +29,7 @@
     modify_by_name,
     modify_time,
     strategy_id,
-    strategy_month_id,
+    strategy_month,
     period_type_key,
     start_time,
     end_time,

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyMonthViewMapper.xml

@@ -11,7 +11,7 @@
         <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
         <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
         <result column="strategy_id" property="strategyId" jdbcType="VARCHAR"/>
-        <result column="strategy_month" property="strategyMonth" jdbcType="INTEGER"/>
+        <result column="strategy_month" property="strategyMonth" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         id

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyViewMapper.xml

@@ -11,8 +11,8 @@
         <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
         <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
         <result column="policy_name" property="policyName" jdbcType="VARCHAR"/>
-        <result column="area_code" property="areaCode" jdbcType="VARCHAR"/>
-        <result column="strategy_year" property="strategyYear" jdbcType="INTEGER"/>
+        <result column="area_code" property="areaCode" jdbcType="INTEGER"/>
+        <result column="strategy_year" property="strategyYear" jdbcType="VARCHAR"/>
         <result column="is_fixed_price" property="isFixedPrice" jdbcType="INTEGER"/>
         <result column="fixed_electricity_price" property="fixedElectricityPrice" jdbcType="DECIMAL"/>
     </resultMap>