From 741ec314ec3e870b2917aab28e36f8facda6a070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Thu, 5 Mar 2026 18:05:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../price/dto/AddLngPricePurPngAppDto.java | 84 +++++++++ .../dto/AddLngPricePurPngAppSuDtlDto.java | 85 +++++++++ .../price/dto/AddLngPricePurPngAppSuDto.java | 100 ++++++++++ .../dto/AddLngPriceSalesPngAppCuDtlDto.java | 85 +++++++++ .../dto/AddLngPriceSalesPngAppCuDto.java | 85 +++++++++ .../price/dto/AddLngPriceSalesPngAppDto.java | 84 +++++++++ .../price/dto/LngPricePurPngAppPageDto.java | 55 ++++++ .../price/dto/LngPriceSalesPngAppPageDto.java | 55 ++++++ .../price/dto/UpdateLngPricePurPngAppDto.java | 108 +++++++++++ .../dto/UpdateLngPricePurPngAppSuDtlDto.java | 96 ++++++++++ .../dto/UpdateLngPricePurPngAppSuDto.java | 126 +++++++++++++ .../UpdateLngPriceSalesPngAppCuDtlDto.java | 98 ++++++++++ .../dto/UpdateLngPriceSalesPngAppCuDto.java | 105 +++++++++++ .../dto/UpdateLngPriceSalesPngAppDto.java | 108 +++++++++++ .../price/vo/LngPricePurPngAppPageVo.java | 49 +++++ .../price/vo/LngPricePurPngAppSuDtlVo.java | 150 +++++++++++++++ .../price/vo/LngPricePurPngAppSuVo.java | 177 ++++++++++++++++++ .../module/price/vo/LngPricePurPngAppVo.java | 157 ++++++++++++++++ .../price/vo/LngPriceSalesPngAppCuDtlVo.java | 150 +++++++++++++++ .../price/vo/LngPriceSalesPngAppCuVo.java | 152 +++++++++++++++ .../price/vo/LngPriceSalesPngAppPageVo.java | 53 ++++++ .../price/vo/LngPriceSalesPngAppVo.java | 156 +++++++++++++++ .../controller/PricePurPngAppController.java | 147 +++++++++++++++ .../PriceSalesPngAppController.java | 147 +++++++++++++++ .../price/entity/LngPricePurPngApp.java | 149 +++++++++++++++ .../price/entity/LngPricePurPngAppSu.java | 156 +++++++++++++++ .../price/entity/LngPricePurPngAppSuDtl.java | 144 ++++++++++++++ .../price/entity/LngPriceSalesPngApp.java | 149 +++++++++++++++ .../price/entity/LngPriceSalesPngAppCu.java | 138 ++++++++++++++ .../entity/LngPriceSalesPngAppCuDtl.java | 144 ++++++++++++++ .../price/mapper/LngPricePurPngAppMapper.java | 17 ++ .../mapper/LngPricePurPngAppSuDtlMapper.java | 17 ++ .../mapper/LngPricePurPngAppSuMapper.java | 33 ++++ .../LngPriceSalesPngAppCuDtlMapper.java | 17 ++ .../mapper/LngPriceSalesPngAppCuMapper.java | 32 ++++ .../mapper/LngPriceSalesPngAppMapper.java | 17 ++ .../price/service/IPricePurPngAppService.java | 19 ++ .../service/IPriceSalesPngAppService.java | 19 ++ .../impl/PricePurPngAppServiceImpl.java | 60 ++++++ .../impl/PriceSalesPngAppServiceImpl.java | 60 ++++++ 40 files changed, 3783 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPricePurPngAppPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPriceSalesPngAppPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngApp.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSu.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSuDtl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngApp.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCu.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCuDtl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuDtlMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuDtlMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPricePurPngAppService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPriceSalesPngAppService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PricePurPngAppServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PriceSalesPngAppServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppDto.java new file mode 100644 index 0000000..7e7be85 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppDto.java @@ -0,0 +1,84 @@ +package com.xjrsoft.module.price.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPricePurPngAppDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + /** + * 提交审批时间 + */ + @ApiModelProperty("提交审批时间") + private LocalDateTime dateSubmit; + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 审批时间/价格生效时间 + */ + @ApiModelProperty("审批时间/价格生效时间") + private LocalDateTime timeAppro; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPricePurPngAppSu + */ + @ApiModelProperty("lngPricePurPngAppSu子表") + private List lngPricePurPngAppSuList; + /** + * lngPricePurPngAppSuDtl + */ + @ApiModelProperty("lngPricePurPngAppSuDtl子表") + private List lngPricePurPngAppSuDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDtlDto.java new file mode 100644 index 0000000..56598d6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDtlDto.java @@ -0,0 +1,85 @@ +package com.xjrsoft.module.price.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPricePurPngAppSuDtlDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 价格-采购-管道气-申请-供应商主键 + */ + @ApiModelProperty("价格-采购-管道气-申请-供应商主键") + private Long pppasId; + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String priceCode; + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Byte sort; + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyGj; + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyM3; + /** + * 采购价格(元/吉焦)(必须录入) + */ + @ApiModelProperty("采购价格(元/吉焦)(必须录入)") + private BigDecimal priceGj; + /** + * 采购价格(元/方)(必须录入) + */ + @ApiModelProperty("采购价格(元/方)(必须录入)") + private BigDecimal priceM3; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDto.java new file mode 100644 index 0000000..4d0f0d3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPricePurPngAppSuDto.java @@ -0,0 +1,100 @@ +package com.xjrsoft.module.price.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPricePurPngAppSuDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 价格-采购-管道气-申请主键 + */ + @ApiModelProperty("价格-采购-管道气-申请主键") + private Long pppaId; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String suCode; + /** + * 合同-主信息主键(采购合同) + */ + @ApiModelProperty("合同-主信息主键(采购合同)") + private Long kId; + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值) + */ + @ApiModelProperty("合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值)") + private Long kpppsId; + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + /** + * 自主托运(Y-是，N-否；隐藏) + */ + @ApiModelProperty("自主托运(Y-是，N-否；隐藏)") + private String transSign; + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + private LocalDateTime dateFrom; + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDtlDto.java new file mode 100644 index 0000000..e25f923 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDtlDto.java @@ -0,0 +1,85 @@ +package com.xjrsoft.module.price.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceSalesPngAppCuDtlDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 价格-销售-管道气-申请-客户主键 + */ + @ApiModelProperty("价格-销售-管道气-申请-客户主键") + private Long pspacId; + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String priceCode; + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Byte sort; + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyGj; + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyM3; + /** + * 销售价格(元/吉焦)(必须录入) + */ + @ApiModelProperty("销售价格(元/吉焦)(必须录入)") + private BigDecimal priceGj; + /** + * 销售价格(元/方)(必须录入) + */ + @ApiModelProperty("销售价格(元/方)(必须录入)") + private BigDecimal priceM3; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDto.java new file mode 100644 index 0000000..0e3648c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppCuDto.java @@ -0,0 +1,85 @@ +package com.xjrsoft.module.price.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceSalesPngAppCuDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 价格-销售-管道气-申请主键 + */ + @ApiModelProperty("价格-销售-管道气-申请主键") + private Long pspaId; + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 合同-主信息主键(销售合同) + */ + @ApiModelProperty("合同-主信息主键(销售合同)") + private Long kId; + /** + * 合同-国内销售-管道气-交割点主键 + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键") + private Long ksppId; + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + private LocalDateTime dateFrom; + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppDto.java new file mode 100644 index 0000000..ec597fb --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/AddLngPriceSalesPngAppDto.java @@ -0,0 +1,84 @@ +package com.xjrsoft.module.price.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceSalesPngAppDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + /** + * 提交审批时间 + */ + @ApiModelProperty("提交审批时间") + private LocalDateTime dateSubmit; + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 审批时间/价格生效时间 + */ + @ApiModelProperty("审批时间/价格生效时间") + private LocalDateTime timeAppro; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPriceSalesPngAppCu + */ + @ApiModelProperty("lngPriceSalesPngAppCu子表") + private List lngPriceSalesPngAppCuList; + /** + * lngPriceSalesPngAppCuDtl + */ + @ApiModelProperty("lngPriceSalesPngAppCuDtl子表") + private List lngPriceSalesPngAppCuDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPricePurPngAppPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPricePurPngAppPageDto.java new file mode 100644 index 0000000..b360055 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPricePurPngAppPageDto.java @@ -0,0 +1,55 @@ +package com.xjrsoft.module.price.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPricePurPngAppPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPriceSalesPngAppPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPriceSalesPngAppPageDto.java new file mode 100644 index 0000000..d14bbbc --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/LngPriceSalesPngAppPageDto.java @@ -0,0 +1,55 @@ +package com.xjrsoft.module.price.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPriceSalesPngAppPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppDto.java new file mode 100644 index 0000000..74a3681 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppDto.java @@ -0,0 +1,108 @@ +package com.xjrsoft.module.price.dto; + +import com.pictc.annotations.datalog.*; +import com.xjrsoft.common.model.base.BaseModel; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_pur_png_app",name="管道气采购价格申请单") +public class UpdateLngPricePurPngAppDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 交易主体(天然气公司/惠贸) + */ + @LogField(name="交易主体",index=1) + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + /** + * 申请说明 + */ + @LogField(name="申请说明",index=2) + @ApiModelProperty("申请说明") + private String appName; + + /** + * 定价类型(临时定价/最终定价) + */ + @LogField(name="定价类型",index=3) + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + + /** + * 说明 + */ + @LogField(name="说明",index=4) + @ApiModelProperty("说明") + private String priceDesc; + + /** + * 提交审批时间 + */ + @LogField(name="提交审批时间",index=5) + @ApiModelProperty("提交审批时间") + private LocalDateTime dateSubmit; + + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @LogField(name="审批状态",index=6) + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 审批时间/价格生效时间 + */ + @LogField(name="审批时间/价格生效时间",index=7) + @ApiModelProperty("审批时间/价格生效时间") + private LocalDateTime timeAppro; + + /** + * 备注 + */ + @LogField(name="备注",index=8) + @ApiModelProperty("备注") + private String note; + + + /** + * lngPricePurPngAppSu + */ + @ApiModelProperty("lngPricePurPngAppSu子表") + @LogJoin(name = "lngPricePurPngAppSu子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "pppaId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPricePurPngAppSuDto.class, type = JoinType.MANY) + private List lngPricePurPngAppSuList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDtlDto.java new file mode 100644 index 0000000..278af24 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDtlDto.java @@ -0,0 +1,96 @@ +package com.xjrsoft.module.price.dto; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.common.model.base.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + + + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_pur_png_app_su_dtl",name="管道气采购价格申请单") +public class UpdateLngPricePurPngAppSuDtlDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 价格-采购-管道气-申请-供应商主键 + */ + @LogField(name="价格-采购-管道气-申请-供应商主键",index=1) + @ApiModelProperty("价格-采购-管道气-申请-供应商主键") + private Long pppasId; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @LogField(name="基础量/增量",index=2) + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String priceCode; + + /** + * 优先级(必须录入) + */ + @LogField(name="优先级(必须录入)",index=3) + @ApiModelProperty("优先级(必须录入)") + private Byte sort; + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @LogField(name="比值(方/吉焦)",index=4) + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @LogField(name="数量（吉焦）",index=5) + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyGj; + + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @LogField(name="数量（方）",index=6) + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyM3; + + /** + * 采购价格(元/吉焦)(必须录入) + */ + @LogField(name="采购价格(元/吉焦)",index=7) + @ApiModelProperty("采购价格(元/吉焦)(必须录入)") + private BigDecimal priceGj; + + /** + * 采购价格(元/方)(必须录入) + */ + @LogField(name="采购价格(元/方)",index=8) + @ApiModelProperty("采购价格(元/方)(必须录入)") + private BigDecimal priceM3; + + /** + * 备注 + */ + @LogField(name="备注",index=9) + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java new file mode 100644 index 0000000..d87024b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java @@ -0,0 +1,126 @@ +package com.xjrsoft.module.price.dto; + +import com.pictc.annotations.datalog.*; +import com.xjrsoft.common.model.base.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_pur_png_app_su",name="管道气采购价格申请单") +public class UpdateLngPricePurPngAppSuDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 价格-采购-管道气-申请主键 + */ + @LogField(name="价格-采购-管道气-申请主键",index=1) + @ApiModelProperty("价格-采购-管道气-申请主键") + private Long pppaId; + + /** + * 供应商编码 + */ + @LogField(name="供应商编码",index=2) + @ApiModelProperty("供应商编码") + private String suCode; + + /** + * 合同-主信息主键(采购合同) + */ + @LogField(name="合同-主信息主键",index=3) + @ApiModelProperty("合同-主信息主键(采购合同)") + private Long kId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @LogField(name="合同-国内采购-管道气-上载点主键",index=4) + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点 + */ + @LogField(name="上载点",index=5) + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值) + */ + @LogField(name="合同-国内采购-管道气-上载点-交割点主键",index=6) + @ApiModelProperty("合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值)") + private Long kpppsId; + + /** + * 交割点 + */ + @LogField(name="交割点",index=7) + @ApiModelProperty("交割点") + private String pointDelyCode; + + /** + * 自主托运(Y-是，N-否；隐藏) + */ + @LogField(name="自主托运",index=8) + @ApiModelProperty("自主托运(Y-是，N-否；隐藏)") + private String transSign; + + /** + * 计量单位(隐藏) + */ + @LogField(name="计量单位",index=9) + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @LogField(name="价格生效年月",index=10) + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + private LocalDateTime dateFrom; + + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @LogField(name="价格组成",index=11) + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + + /** + * 备注 + */ + @LogField(name="备注",index=12) + @ApiModelProperty("备注") + private String note; + + /** + * lngPricePurPngAppSuDtl + */ + @ApiModelProperty("lngPricePurPngAppSuDtl子表") + @LogJoin(name = "lngPricePurPngAppSuDtl子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "pppasId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPricePurPngAppSuDtlDto.class, type = JoinType.MANY) + private List lngPricePurPngAppSuDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDtlDto.java new file mode 100644 index 0000000..549c447 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDtlDto.java @@ -0,0 +1,98 @@ +package com.xjrsoft.module.price.dto; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.common.model.base.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + + + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_sales_png_app_cu_dtl",name="管道气销售价格申请") +public class UpdateLngPriceSalesPngAppCuDtlDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 价格-销售-管道气-申请-客户主键 + */ + @LogField(name="价格-销售-管道气-申请-客户主键",index=1) + @ApiModelProperty("价格-销售-管道气-申请-客户主键") + private Long pspacId; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @LogField(name="基础量/增量",index=2) + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String priceCode; + + /** + * 优先级(必须录入) + */ + @LogField(name="优先级",index=3) + @ApiModelProperty("优先级(必须录入)") + private Byte sort; + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @LogField(name="比值(方/吉焦)",index=4) + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @LogField(name="数量（吉焦）",index=5) + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyGj; + + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @LogField(name="数量（方）",index=6) + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyM3; + + /** + * 销售价格(元/吉焦)(必须录入) + */ + @LogField(name="销售价格(元/吉焦)",index=7) + @ApiModelProperty("销售价格(元/吉焦)(必须录入)") + private BigDecimal priceGj; + + /** + * 销售价格(元/方)(必须录入) + */ + @LogField(name="销售价格(元/方)",index=8) + @ApiModelProperty("销售价格(元/方)(必须录入)") + private BigDecimal priceM3; + + /** + * 备注 + */ + @LogField(name="备注",index=9) + @ApiModelProperty("备注") + private String note; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDto.java new file mode 100644 index 0000000..0836146 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppCuDto.java @@ -0,0 +1,105 @@ +package com.xjrsoft.module.price.dto; + +import com.pictc.annotations.datalog.*; +import com.xjrsoft.common.model.base.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_sales_png_app_cu",name="管道气销售价格申请") +public class UpdateLngPriceSalesPngAppCuDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 价格-销售-管道气-申请主键 + */ + @LogField(name="价格-销售-管道气-申请主键",index=1) + @ApiModelProperty("价格-销售-管道气-申请主键") + private Long pspaId; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=2) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 合同-主信息主键(销售合同) + */ + @LogField(name="合同-主信息主键",index=3) + @ApiModelProperty("合同-主信息主键(销售合同)") + private Long kId; + + /** + * 合同-国内销售-管道气-交割点主键 + */ + @LogField(name="合同-国内销售-管道气-交割点主键",index=4) + @ApiModelProperty("合同-国内销售-管道气-交割点主键") + private Long ksppId; + + /** + * 交割点 + */ + @LogField(name="交割点",index=5) + @ApiModelProperty("交割点") + private String pointDelyCode; + + /** + * 计量单位(隐藏) + */ + @LogField(name="计量单位",index=6) + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @LogField(name="价格生效年月",index=7) + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + private LocalDateTime dateFrom; + + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @LogField(name="价格组成",index=8) + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + + /** + * 备注 + */ + @LogField(name="备注",index=9) + @ApiModelProperty("备注") + private String note; + + /** + * lngPriceSalesPngAppCuDtl + */ + @ApiModelProperty("lngPriceSalesPngAppCuDtl子表") + @LogJoin(name = "lngPriceSalesPngAppCuDtl子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "pspacId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceSalesPngAppCuDtlDto.class, type = JoinType.MANY) + private List lngPriceSalesPngAppCuDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppDto.java new file mode 100644 index 0000000..d47e971 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPriceSalesPngAppDto.java @@ -0,0 +1,108 @@ +package com.xjrsoft.module.price.dto; + +import com.pictc.annotations.datalog.*; +import com.xjrsoft.common.model.base.BaseModel; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_sales_png_app",name="管道气销售价格申请") +public class UpdateLngPriceSalesPngAppDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 交易主体(天然气公司/惠贸) + */ + @LogField(name="交易主体",index=1) + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + /** + * 申请说明 + */ + @LogField(name="申请说明",index=2) + @ApiModelProperty("申请说明") + private String appName; + + /** + * 定价类型(临时定价/最终定价) + */ + @LogField(name="定价类型",index=3) + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + + /** + * 说明 + */ + @LogField(name="说明",index=4) + @ApiModelProperty("说明") + private String priceDesc; + + /** + * 提交审批时间 + */ + @LogField(name="提交审批时间",index=5) + @ApiModelProperty("提交审批时间") + private LocalDateTime dateSubmit; + + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @LogField(name="审批状态(未提交/审批中/已审批/已驳回)",index=6) + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 审批时间/价格生效时间 + */ + @LogField(name="审批时间/价格生效时间",index=7) + @ApiModelProperty("审批时间/价格生效时间") + private LocalDateTime timeAppro; + + /** + * 备注 + */ + @LogField(name="备注",index=8) + @ApiModelProperty("备注") + private String note; + + + /** + * lngPriceSalesPngAppCu + */ + @ApiModelProperty("lngPriceSalesPngAppCu子表") + @LogJoin(name = "lngPriceSalesPngAppCu子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "pspaId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceSalesPngAppCuDto.class, type = JoinType.MANY) + private List lngPriceSalesPngAppCuList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppPageVo.java new file mode 100644 index 0000000..d40c8e5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppPageVo.java @@ -0,0 +1,49 @@ +package com.xjrsoft.module.price.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +public class LngPricePurPngAppPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java new file mode 100644 index 0000000..19083ea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java @@ -0,0 +1,150 @@ +package com.xjrsoft.module.price.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPricePurPngAppSuDtlVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 价格-采购-管道气-申请-供应商主键 + */ + @ApiModelProperty("价格-采购-管道气-申请-供应商主键") + private Long pppasId; + + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceTypeName") + private String priceCode; + private String priceName; + + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Byte sort; + + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + + + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyGj; + + + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyM3; + + + /** + * 采购价格(元/吉焦)(必须录入) + */ + @ApiModelProperty("采购价格(元/吉焦)(必须录入)") + private BigDecimal priceGj; + + + /** + * 采购价格(元/方)(必须录入) + */ + @ApiModelProperty("采购价格(元/方)(必须录入)") + private BigDecimal priceM3; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuVo.java new file mode 100644 index 0000000..5fe7851 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuVo.java @@ -0,0 +1,177 @@ +package com.xjrsoft.module.price.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPricePurPngAppSuVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 价格-采购-管道气-申请主键 + */ + @ApiModelProperty("价格-采购-管道气-申请主键") + private Long pppaId; + + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String suCode; + private String suName; + + + /** + * 合同-主信息主键(采购合同) + */ + @ApiModelProperty("合同-主信息主键(采购合同)") + private Long kId; + private String kName; + + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + private String pointUpName; + + + /** + * 合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值) + */ + @ApiModelProperty("合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值)") + private Long kpppsId; + + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + private String pointDelyName; + + + /** + * 自主托运(Y-是，N-否；隐藏) + */ + @ApiModelProperty("自主托运(Y-是，N-否；隐藏)") + private String transSign; + + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + private String uomName; + + + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + private LocalDateTime dateFrom; + + + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + /** + * lngPricePurPngAppSuDtl + */ + @ApiModelProperty("lngPricePurPngAppSuDtl子表") + private List lngPricePurPngAppSuDtlList; + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppVo.java new file mode 100644 index 0000000..cb266ea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppVo.java @@ -0,0 +1,157 @@ +package com.xjrsoft.module.price.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPricePurPngAppVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") + private Long comId; + private String comName; + + + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + + + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + @Trans(type = TransType.DIC, id = "2019617745593757698", transToFieldName = "priceTypeName") + private String priceTypeCode; + private String priceTypeName; + + + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + + + /** + * 提交审批时间 + */ + @ApiModelProperty("提交审批时间") + private LocalDateTime dateSubmit; + + + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + private String approCode; + private String approName; + + + /** + * 审批时间/价格生效时间 + */ + @ApiModelProperty("审批时间/价格生效时间") + private LocalDateTime timeAppro; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + /** + * lngPricePurPngAppSu + */ + @ApiModelProperty("lngPricePurPngAppSu子表") + private List lngPricePurPngAppSuList; + + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java new file mode 100644 index 0000000..393c422 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java @@ -0,0 +1,150 @@ +package com.xjrsoft.module.price.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceSalesPngAppCuDtlVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 价格-销售-管道气-申请-客户主键 + */ + @ApiModelProperty("价格-销售-管道气-申请-客户主键") + private Long pspacId; + + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceTypeName") + private String priceCode; + private String priceName; + + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Byte sort; + + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + + + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyGj; + + + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + private BigDecimal rateQtyM3; + + + /** + * 销售价格(元/吉焦)(必须录入) + */ + @ApiModelProperty("销售价格(元/吉焦)(必须录入)") + private BigDecimal priceGj; + + + /** + * 销售价格(元/方)(必须录入) + */ + @ApiModelProperty("销售价格(元/方)(必须录入)") + private BigDecimal priceM3; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuVo.java new file mode 100644 index 0000000..0988250 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuVo.java @@ -0,0 +1,152 @@ +package com.xjrsoft.module.price.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceSalesPngAppCuVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 价格-销售-管道气-申请主键 + */ + @ApiModelProperty("价格-销售-管道气-申请主键") + private Long pspaId; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + private String cuName; + + + /** + * 合同-主信息主键(销售合同) + */ + @ApiModelProperty("合同-主信息主键(销售合同)") + private Long kId; + private String kName; + + + /** + * 合同-国内销售-管道气-交割点主键 + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键") + private Long ksppId; + + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + private String pointDelyName; + + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + private String uomName; + + + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + private LocalDateTime dateFrom; + + + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + /** + * lngPriceSalesPngAppCuDtl + */ + @ApiModelProperty("lngPriceSalesPngAppCuDtl子表") + private List lngPriceSalesPngAppCuDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppPageVo.java new file mode 100644 index 0000000..524108a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppPageVo.java @@ -0,0 +1,53 @@ +package com.xjrsoft.module.price.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +public class LngPriceSalesPngAppPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppVo.java new file mode 100644 index 0000000..a57b97e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppVo.java @@ -0,0 +1,156 @@ +package com.xjrsoft.module.price.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceSalesPngAppVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") + private Long comId; + private String comName; + + + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + + + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + @Trans(type = TransType.DIC, id = "2019617745593757698", transToFieldName = "priceTypeName") + private String priceTypeCode; + private String priceTypeName; + + + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + + + /** + * 提交审批时间 + */ + @ApiModelProperty("提交审批时间") + private LocalDateTime dateSubmit; + + + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + private String approCode; + private String approName; + + + /** + * 审批时间/价格生效时间 + */ + @ApiModelProperty("审批时间/价格生效时间") + private LocalDateTime timeAppro; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + /** + * lngPriceSalesPngAppCu + */ + @ApiModelProperty("lngPriceSalesPngAppCu子表") + private List lngPriceSalesPngAppCuList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java new file mode 100644 index 0000000..5ce261c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java @@ -0,0 +1,147 @@ +package com.xjrsoft.module.price.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.price.dto.LngPricePurPngAppPageDto; +import com.xjrsoft.module.price.dto.UpdateLngPricePurPngAppDto; +import com.xjrsoft.module.price.entity.LngPricePurPngApp; +import com.xjrsoft.module.price.service.IPricePurPngAppService; +import com.xjrsoft.module.price.vo.LngPricePurPngAppPageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/price" + "/pricePurPngApp") +@Api(value = "/price" + "/pricePurPngApp",tags = "管道气采购价格申请单代码") +@AllArgsConstructor +public class PricePurPngAppController { + + + private final IPricePurPngAppService pricePurPngAppService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPricePurPngApp列表(分页)") + @SaCheckPermission("pricePurPngApp:list") + public R page(@Valid LngPricePurPngAppPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPricePurPngApp::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getAppName()),LngPricePurPngApp::getAppName,dto.getAppName()) + .like(StrUtil.isNotBlank(dto.getPriceTypeCode()),LngPricePurPngApp::getPriceTypeCode,dto.getPriceTypeCode()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngPricePurPngApp::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getPriceDesc()),LngPricePurPngApp::getPriceDesc,dto.getPriceDesc()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPricePurPngApp::getApproCode,dto.getApproCode()) + .orderByDesc(LngPricePurPngApp::getId) + .select(LngPricePurPngApp.class,x -> VoToColumnUtil.fieldsToColumns(LngPricePurPngAppPageVo.class).contains(x.getProperty())); + IPage page = pricePurPngAppService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPricePurPngAppPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPricePurPngApp信息") + @SaCheckPermission("pricePurPngApp:detail") + public R info(@RequestParam Long id){ + return R.ok(pricePurPngAppService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPricePurPngApp数据详细日志") + @SaCheckPermission("pricePurPngApp:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPricePurPngAppDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPricePurPngApp") + @SaCheckPermission("pricePurPngApp:add") + public R add(@Valid @RequestBody UpdateLngPricePurPngAppDto dto){ + UpdateLngPricePurPngAppDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngPricePurPngAppDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPricePurPngAppDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + @PutMapping + @ApiOperation(value = "修改LngPricePurPngApp") + @SaCheckPermission("pricePurPngApp:edit") + public R update(@Valid @RequestBody UpdateLngPricePurPngAppDto dto){ + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngPricePurPngAppDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPricePurPngAppDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pricePurPngApp:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPricePurPngAppDto.class, ids)); + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java new file mode 100644 index 0000000..7681c9a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java @@ -0,0 +1,147 @@ +package com.xjrsoft.module.price.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.price.dto.LngPriceSalesPngAppPageDto; +import com.xjrsoft.module.price.dto.UpdateLngPriceSalesPngAppDto; +import com.xjrsoft.module.price.entity.LngPriceSalesPngApp; +import com.xjrsoft.module.price.service.IPriceSalesPngAppService; +import com.xjrsoft.module.price.vo.LngPriceSalesPngAppPageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/price" + "/priceSalesPngApp") +@Api(value = "/price" + "/priceSalesPngApp",tags = "管道气销售价格申请代码") +@AllArgsConstructor +public class PriceSalesPngAppController { + + + private final IPriceSalesPngAppService priceSalesPngAppService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPriceSalesPngApp列表(分页)") + @SaCheckPermission("priceSalesPngApp:list") + public R page(@Valid LngPriceSalesPngAppPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPriceSalesPngApp::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getAppName()),LngPriceSalesPngApp::getAppName,dto.getAppName()) + .like(StrUtil.isNotBlank(dto.getPriceTypeCode()),LngPriceSalesPngApp::getPriceTypeCode,dto.getPriceTypeCode()) + .like(StrUtil.isNotBlank(dto.getPriceDesc()),LngPriceSalesPngApp::getPriceDesc,dto.getPriceDesc()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngPriceSalesPngApp::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPriceSalesPngApp::getApproCode,dto.getApproCode()) + .orderByDesc(LngPriceSalesPngApp::getId) + .select(LngPriceSalesPngApp.class,x -> VoToColumnUtil.fieldsToColumns(LngPriceSalesPngAppPageVo.class).contains(x.getProperty())); + IPage page = priceSalesPngAppService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPriceSalesPngAppPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPriceSalesPngApp信息") + @SaCheckPermission("priceSalesPngApp:detail") + public R info(@RequestParam Long id){ + return R.ok(priceSalesPngAppService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPriceSalesPngApp数据详细日志") + @SaCheckPermission("priceSalesPngApp:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPriceSalesPngAppDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPriceSalesPngApp") + @SaCheckPermission("priceSalesPngApp:add") + public R add(@Valid @RequestBody UpdateLngPriceSalesPngAppDto dto){ + UpdateLngPriceSalesPngAppDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngPriceSalesPngAppDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPriceSalesPngAppDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res.getId()); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + @PutMapping + @ApiOperation(value = "修改LngPriceSalesPngApp") + @SaCheckPermission("priceSalesPngApp:edit") + public R update(@Valid @RequestBody UpdateLngPriceSalesPngAppDto dto){ + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngPriceSalesPngAppDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPriceSalesPngAppDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("priceSalesPngApp:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPriceSalesPngAppDto.class, ids)); + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngApp.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngApp.java new file mode 100644 index 0000000..ba67d9d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngApp.java @@ -0,0 +1,149 @@ +package com.xjrsoft.module.price.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_pur_png_app") +@ApiModel(value = "管道气采购价格申请单对象", description = "管道气采购价格申请单") +public class LngPricePurPngApp implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + + /** + * 提交审批时间 + */ + @ApiModelProperty("提交审批时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateSubmit; + + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 审批时间/价格生效时间 + */ + @ApiModelProperty("审批时间/价格生效时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime timeAppro; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + /** + * lngPricePurPngAppSu + */ + @ApiModelProperty("lngPricePurPngAppSu子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "pppaId") + private List lngPricePurPngAppSuList; + /** + * lngPricePurPngAppSuDtl + */ + @ApiModelProperty("lngPricePurPngAppSuDtl子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "pppasId") + private List lngPricePurPngAppSuDtlList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSu.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSu.java new file mode 100644 index 0000000..1c48c2f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSu.java @@ -0,0 +1,156 @@ +package com.xjrsoft.module.price.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_pur_png_app_su") +@ApiModel(value = "管道气采购价格申请单对象", description = "管道气采购价格申请单") +public class LngPricePurPngAppSu implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 价格-采购-管道气-申请主键 + */ + @ApiModelProperty("价格-采购-管道气-申请主键") + private Long pppaId; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String suCode; + + /** + * 合同-主信息主键(采购合同) + */ + @ApiModelProperty("合同-主信息主键(采购合同)") + private Long kId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值) + */ + @ApiModelProperty("合同-国内采购-管道气-上载点-交割点主键(合同中交割点价格不同时有值)") + private Long kpppsId; + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + + /** + * 自主托运(Y-是，N-否；隐藏) + */ + @ApiModelProperty("自主托运(Y-是，N-否；隐藏)") + private String transSign; + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSuDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSuDtl.java new file mode 100644 index 0000000..2bba61d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPricePurPngAppSuDtl.java @@ -0,0 +1,144 @@ +package com.xjrsoft.module.price.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** +* @title: 管道气采购价格申请单 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_pur_png_app_su_dtl") +@ApiModel(value = "管道气采购价格申请单对象", description = "管道气采购价格申请单") +public class LngPricePurPngAppSuDtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 价格-采购-管道气-申请-供应商主键 + */ + @ApiModelProperty("价格-采购-管道气-申请-供应商主键") + private Long pppasId; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String priceCode; + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte sort; + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyGj; + + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyM3; + + /** + * 采购价格(元/吉焦)(必须录入) + */ + @ApiModelProperty("采购价格(元/吉焦)(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 采购价格(元/方)(必须录入) + */ + @ApiModelProperty("采购价格(元/方)(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngApp.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngApp.java new file mode 100644 index 0000000..512205c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngApp.java @@ -0,0 +1,149 @@ +package com.xjrsoft.module.price.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_sales_png_app") +@ApiModel(value = "管道气销售价格申请对象", description = "管道气销售价格申请") +public class LngPriceSalesPngApp implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + /** + * 申请说明 + */ + @ApiModelProperty("申请说明") + private String appName; + + /** + * 定价类型(临时定价/最终定价) + */ + @ApiModelProperty("定价类型(临时定价/最终定价)") + private String priceTypeCode; + + /** + * 说明 + */ + @ApiModelProperty("说明") + private String priceDesc; + + /** + * 提交审批时间 + */ + @ApiModelProperty("提交审批时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateSubmit; + + /** + * 审批状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 审批时间/价格生效时间 + */ + @ApiModelProperty("审批时间/价格生效时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime timeAppro; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + /** + * lngPriceSalesPngAppCu + */ + @ApiModelProperty("lngPriceSalesPngAppCu子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "pspaId") + private List lngPriceSalesPngAppCuList; + /** + * lngPriceSalesPngAppCuDtl + */ + @ApiModelProperty("lngPriceSalesPngAppCuDtl子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "pspacId") + private List lngPriceSalesPngAppCuDtlList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCu.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCu.java new file mode 100644 index 0000000..18146c7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCu.java @@ -0,0 +1,138 @@ +package com.xjrsoft.module.price.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_sales_png_app_cu") +@ApiModel(value = "管道气销售价格申请对象", description = "管道气销售价格申请") +public class LngPriceSalesPngAppCu implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 价格-销售-管道气-申请主键 + */ + @ApiModelProperty("价格-销售-管道气-申请主键") + private Long pspaId; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 合同-主信息主键(销售合同) + */ + @ApiModelProperty("合同-主信息主键(销售合同)") + private Long kId; + + /** + * 合同-国内销售-管道气-交割点主键 + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键") + private Long ksppId; + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 价格生效年月(YYYY-MM格式；日期缺省01) + */ + @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 价格组成(明细表记录组合，用于页面显示) + */ + @ApiModelProperty("价格组成(明细表记录组合，用于页面显示)") + private String priceDesc; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCuDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCuDtl.java new file mode 100644 index 0000000..a8954c3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/entity/LngPriceSalesPngAppCuDtl.java @@ -0,0 +1,144 @@ +package com.xjrsoft.module.price.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** +* @title: 管道气销售价格申请 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_sales_png_app_cu_dtl") +@ApiModel(value = "管道气销售价格申请对象", description = "管道气销售价格申请") +public class LngPriceSalesPngAppCuDtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 价格-销售-管道气-申请-客户主键 + */ + @ApiModelProperty("价格-销售-管道气-申请-客户主键") + private Long pspacId; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String priceCode; + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte sort; + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 数量（吉焦）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（吉焦）(父主键相同的记录，只有一条记录的量可空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyGj; + + /** + * 数量（方）(父主键相同的记录，只有一条记录的量可空) + */ + @ApiModelProperty("数量（方）(父主键相同的记录，只有一条记录的量可空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyM3; + + /** + * 销售价格(元/吉焦)(必须录入) + */ + @ApiModelProperty("销售价格(元/吉焦)(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 销售价格(元/方)(必须录入) + */ + @ApiModelProperty("销售价格(元/方)(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppMapper.java new file mode 100644 index 0000000..e1f4cdc --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.price.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.price.entity.LngPricePurPngApp; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPricePurPngAppMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuDtlMapper.java new file mode 100644 index 0000000..3c531e4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuDtlMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.price.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.price.entity.LngPricePurPngAppSuDtl; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPricePurPngAppSuDtlMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java new file mode 100644 index 0000000..9d4483f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java @@ -0,0 +1,33 @@ +package com.xjrsoft.module.price.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.price.entity.LngPricePurPngAppSu; +import com.xjrsoft.module.price.vo.LngPricePurPngAppSuVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPricePurPngAppSuMapper extends MPJBaseMapper, BaseMapper { + + @Select("SELECT t1.*, t2.k_name AS kName, t3.su_sname AS suName, t7.name as uomName," + + " t4.full_name AS pointUpName, t5.full_name AS pointDelyName" + + " FROM lng_price_pur_png_app_su t1" + + " LEFT JOIN lng_contract t2 ON t1.id = t1.k_id" + + " LEFT JOIN lng_supplier t3 ON t3.su_code = t1.su_code" + + " LEFT JOIN lng_b_station_png t4 ON t4.code = t1.point_up_code" + + " LEFT JOIN lng_b_station_png t5 ON t5.code = t1.point_dely_code" + + " LEFT JOIN xjr_dictionary_item t6 ON t6.code = 'LNG_UOM'" + + " LEFT JOIN xjr_dictionary_detail t7 ON t7.item_id = t6.id AND t7.code = t1.uom_code" + + " WHERE t1.pppa_id = #{pid}") + List selectListByPid(@Param("pid") Long pid); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuDtlMapper.java new file mode 100644 index 0000000..1377b83 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuDtlMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.price.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.price.entity.LngPriceSalesPngAppCuDtl; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceSalesPngAppCuDtlMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuMapper.java new file mode 100644 index 0000000..69564bb --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppCuMapper.java @@ -0,0 +1,32 @@ +package com.xjrsoft.module.price.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.price.entity.LngPriceSalesPngAppCu; +import com.xjrsoft.module.price.vo.LngPriceSalesPngAppCuVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceSalesPngAppCuMapper extends MPJBaseMapper, BaseMapper { + + @Select("SELECT t1.*, t2.k_name AS kName, t3.cu_sname AS cuName, t7.name as uomName," + + " t5.full_name AS pointDelyName" + + " FROM lng_price_sales_png_app_cu t1" + + " LEFT JOIN lng_contract t2 ON t1.id = t1.k_id" + + " LEFT JOIN lng_customer t3 ON t3.cu_code = t1.cu_code" + + " LEFT JOIN lng_b_station_png t5 ON t5.code = t1.point_dely_code" + + " LEFT JOIN xjr_dictionary_item t6 ON t6.code = 'LNG_UOM'" + + " LEFT JOIN xjr_dictionary_detail t7 ON t7.item_id = t6.id AND t7.code = t1.uom_code" + + " WHERE t1.pspa_id = #{pid}") + List selectListByPid(@Param("pid") Long pid); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppMapper.java new file mode 100644 index 0000000..492b8a3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPriceSalesPngAppMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.price.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.price.entity.LngPriceSalesPngApp; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceSalesPngAppMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPricePurPngAppService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPricePurPngAppService.java new file mode 100644 index 0000000..b4f6267 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPricePurPngAppService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.price.service; + +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.price.entity.LngPricePurPngApp; +import com.xjrsoft.module.price.vo.LngPricePurPngAppVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ + +public interface IPricePurPngAppService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngPricePurPngAppVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPriceSalesPngAppService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPriceSalesPngAppService.java new file mode 100644 index 0000000..cd0c574 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/IPriceSalesPngAppService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.price.service; + +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.price.entity.LngPriceSalesPngApp; +import com.xjrsoft.module.price.vo.LngPriceSalesPngAppVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ + +public interface IPriceSalesPngAppService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngPriceSalesPngAppVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PricePurPngAppServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PricePurPngAppServiceImpl.java new file mode 100644 index 0000000..73efd0a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PricePurPngAppServiceImpl.java @@ -0,0 +1,60 @@ +package com.xjrsoft.module.price.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.price.entity.LngPricePurPngApp; +import com.xjrsoft.module.price.entity.LngPricePurPngAppSuDtl; +import com.xjrsoft.module.price.mapper.LngPricePurPngAppMapper; +import com.xjrsoft.module.price.mapper.LngPricePurPngAppSuDtlMapper; +import com.xjrsoft.module.price.mapper.LngPricePurPngAppSuMapper; +import com.xjrsoft.module.price.service.IPricePurPngAppService; +import com.xjrsoft.module.price.vo.LngPricePurPngAppSuDtlVo; +import com.xjrsoft.module.price.vo.LngPricePurPngAppSuVo; +import com.xjrsoft.module.price.vo.LngPricePurPngAppVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PricePurPngAppServiceImpl extends MPJBaseServiceImpl implements IPricePurPngAppService { + + private final LngPricePurPngAppSuMapper lngPricePurPngAppSuMapper; + private final LngPricePurPngAppSuDtlMapper lngPricePurPngAppSuDtlMapper; + private final IFileClient fileClient; + + @Override + public LngPricePurPngAppVo getInfoById(Long id) { + LngPricePurPngApp lngPricePurPngApp = this.getById(id); + if(lngPricePurPngApp == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据")); + } + LngPricePurPngAppVo vo = BeanUtil.toBean(lngPricePurPngApp, LngPricePurPngAppVo.class); + List lngPricePurPngAppSuVoList = lngPricePurPngAppSuMapper + .selectListByPid(lngPricePurPngApp.getId()); + vo.setLngPricePurPngAppSuList(lngPricePurPngAppSuVoList); + for (LngPricePurPngAppSuVo lngPricePurPngAppSuVo : lngPricePurPngAppSuVoList) { + List lngPricePurPngAppSuDtlList = lngPricePurPngAppSuDtlMapper + .selectList(new LambdaQueryWrapper() + .eq(LngPricePurPngAppSuDtl::getPppasId, lngPricePurPngAppSuVo.getId())); + lngPricePurPngAppSuVo.setLngPricePurPngAppSuDtlList(BeanUtil.copyToList(lngPricePurPngAppSuDtlList, + LngPricePurPngAppSuDtlVo.class)); + } + List fileList = fileClient.getTableFiles("lng_price_pur_png_app", + "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PriceSalesPngAppServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PriceSalesPngAppServiceImpl.java new file mode 100644 index 0000000..52b43f5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/service/impl/PriceSalesPngAppServiceImpl.java @@ -0,0 +1,60 @@ +package com.xjrsoft.module.price.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.price.entity.LngPriceSalesPngApp; +import com.xjrsoft.module.price.entity.LngPriceSalesPngAppCuDtl; +import com.xjrsoft.module.price.mapper.LngPriceSalesPngAppCuDtlMapper; +import com.xjrsoft.module.price.mapper.LngPriceSalesPngAppCuMapper; +import com.xjrsoft.module.price.mapper.LngPriceSalesPngAppMapper; +import com.xjrsoft.module.price.service.IPriceSalesPngAppService; +import com.xjrsoft.module.price.vo.LngPriceSalesPngAppCuDtlVo; +import com.xjrsoft.module.price.vo.LngPriceSalesPngAppCuVo; +import com.xjrsoft.module.price.vo.LngPriceSalesPngAppVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PriceSalesPngAppServiceImpl extends MPJBaseServiceImpl implements IPriceSalesPngAppService { + + private final LngPriceSalesPngAppCuMapper lngPriceSalesPngAppCuMapper; + private final LngPriceSalesPngAppCuDtlMapper lngPriceSalesPngAppCuDtlMapper; + private final IFileClient fileClient; + + @Override + public LngPriceSalesPngAppVo getInfoById(Long id) { + LngPriceSalesPngApp lngPriceSalesPngApp = this.getById(id); + if(lngPriceSalesPngApp == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据")); + } + LngPriceSalesPngAppVo vo = BeanUtil.toBean(lngPriceSalesPngApp, LngPriceSalesPngAppVo.class); + List lngPriceSalesPngAppCuVoList = lngPriceSalesPngAppCuMapper + .selectListByPid(lngPriceSalesPngApp.getId()); + vo.setLngPriceSalesPngAppCuList(lngPriceSalesPngAppCuVoList); + for (LngPriceSalesPngAppCuVo lngPriceSalesPngAppCuVo : lngPriceSalesPngAppCuVoList) { + List lngPriceSalesPngAppCuDtlList = lngPriceSalesPngAppCuDtlMapper + .selectList(new LambdaQueryWrapper() + .eq(LngPriceSalesPngAppCuDtl::getPspacId, lngPriceSalesPngAppCuVo.getId())); + lngPriceSalesPngAppCuVo.setLngPriceSalesPngAppCuDtlList(BeanUtil.copyToList(lngPriceSalesPngAppCuDtlList, + LngPriceSalesPngAppCuDtlVo.class)); + } + List fileList = fileClient.getTableFiles("lng_price_sales_png_app", + "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +}