diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDtlDto.java new file mode 100644 index 0000000..326ca1e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDtlDto.java @@ -0,0 +1,74 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + + + + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-24 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceProcDtlDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + /** + * 价格-加工服务主键(lng_price_proc.id) + */ + @ApiModelProperty("价格-加工服务主键(lng_price_proc.id)") + private Long ppId; + /** + * 阶梯 + */ + @ApiModelProperty("阶梯") + private Short sort; + /** + * 约定 + */ + @ApiModelProperty("约定") + private String sortDesc; + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + /** + * 阶梯气量(吉焦) + */ + @ApiModelProperty("阶梯气量(吉焦)") + private BigDecimal qtyGj; + /** + * 管道气加工费率(元/吉焦) + */ + @ApiModelProperty("管道气加工费率(元/吉焦)") + private BigDecimal pricePngGj; + /** + * LNG加工费率(元/吉焦) + */ + @ApiModelProperty("LNG加工费率(元/吉焦)") + private BigDecimal priceLngGj; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDtlDto.java new file mode 100644 index 0000000..efed257 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDtlDto.java @@ -0,0 +1,79 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + + + + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-24 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceTransPngDtlDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + /** + * 价格-管输主键(lng_price_trans_png.id) + */ + @ApiModelProperty("价格-管输主键(lng_price_trans_png.id)") + private Long ppId; + /** + * 阶梯 + */ + @ApiModelProperty("阶梯") + private Short sort; + /** + * 约定 + */ + @ApiModelProperty("约定") + private String sortDesc; + /** + * 阶梯气量(方) + */ + @ApiModelProperty("阶梯气量(方)") + private BigDecimal qtyM3; + /** + * 阶梯气量(吉焦)(隐藏) + */ + @ApiModelProperty("阶梯气量(吉焦)(隐藏)") + private BigDecimal qtyGj; + /** + * 管输单价(元/方) + */ + @ApiModelProperty("管输单价(元/方)") + private BigDecimal priceTransM3; + /** + * 管输单价(元/吉焦)(隐藏) + */ + @ApiModelProperty("管输单价(元/吉焦)(隐藏)") + private BigDecimal priceTransGj; + /** + * 比值(方/吉焦)(隐藏) + */ + @ApiModelProperty("比值(方/吉焦)(隐藏)") + private BigDecimal rateM3Gj; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractApproRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractApproRelDto.java index c8ec134..4141a9b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractApproRelDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractApproRelDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -18,7 +19,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_appro_rel",name="合同-要素-签报-关联") -public class UpdateLngContractApproRelDto implements Serializable { +public class UpdateLngContractApproRelDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -56,13 +57,4 @@ public class UpdateLngContractApproRelDto implements Serializable { @LogField(name="显示顺序",index=4) @ApiModelProperty("显示顺序") private Short sort; - - /** - * 租户id - */ - @LogField(name="租户id",index=5) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java index ed14e42..aa571f1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.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; @@ -19,7 +20,7 @@ import java.util.List; */ @Data @LogTable(source="lng_contract",name="国内管道气销售") -public class UpdateLngContractDto implements Serializable { +public class UpdateLngContractDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -169,14 +170,6 @@ public class UpdateLngContractDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractSalesPng diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactCpDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactCpDto.java index cd84bdf..bbff820 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactCpDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactCpDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -18,7 +19,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_fact_cp",name="合同-要素管理-相对方") -public class UpdateLngContractFactCpDto implements Serializable { +public class UpdateLngContractFactCpDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -126,13 +127,4 @@ public class UpdateLngContractFactCpDto implements Serializable { @LogField(name="备注",index=14) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=15) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java index 4fc8d49..1d06f02 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.dto; import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -21,7 +22,7 @@ import java.util.List; */ @Data @LogTable(source="lng_contract_fact",name="合同要素") -public class UpdateLngContractFactDto implements Serializable { +public class UpdateLngContractFactDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -230,14 +231,6 @@ public class UpdateLngContractFactDto implements Serializable { @LogField(name="备注",index=28) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=29) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractFactCp diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java index a693a0c..1fb0549 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -18,7 +19,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_fact_rel",name="国内管道气采购/销售") -public class UpdateLngContractFactRelDto implements Serializable { +public class UpdateLngContractFactRelDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -49,13 +50,4 @@ public class UpdateLngContractFactRelDto implements Serializable { @LogField(name="显示顺序",index=3) @ApiModelProperty("显示顺序") private Short sort; - - /** - * 租户id - */ - @LogField(name="租户id",index=4) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java index 274c91f..dec3fdc 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.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; @@ -19,7 +20,7 @@ import java.util.List; */ @Data @LogTable(source="lng_contract",name="加工合同") -public class UpdateLngContractPDto implements Serializable { +public class UpdateLngContractPDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -169,14 +170,6 @@ public class UpdateLngContractPDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractProc diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java index b327a70..0756184 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -18,7 +19,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_proc",name="加工合同") -public class UpdateLngContractProcDto implements Serializable { +public class UpdateLngContractProcDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -63,13 +64,4 @@ public class UpdateLngContractProcDto implements Serializable { @LogField(name="备注",index=5) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=6) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java index 4c6e8be..d075255 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java @@ -12,6 +12,7 @@ import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.common.model.base.BaseModel; import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; @@ -27,7 +28,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract",name="国内管道气采购") -public class UpdateLngContractPurDto implements Serializable { +public class UpdateLngContractPurDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -177,14 +178,6 @@ public class UpdateLngContractPurDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractPurPng diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurIntDto.java index e1a9e44..d35941f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurIntDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -19,7 +20,7 @@ import java.math.BigDecimal; */ @Data @LogTable(source="lng_contract_pur_int",name="国际采购合同") -public class UpdateLngContractPurIntDto implements Serializable { +public class UpdateLngContractPurIntDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -253,13 +254,4 @@ public class UpdateLngContractPurIntDto implements Serializable { @LogField(name="备注",index=32) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=33) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java index 549085e..3502a57 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.contract.dto; +import com.xjrsoft.common.model.base.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; */ @Data @LogTable(source="lng_contract_pur_png",name="国内管道气采购") -public class UpdateLngContractPurPngDto implements Serializable { +public class UpdateLngContractPurPngDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -74,13 +75,4 @@ public class UpdateLngContractPurPngDto implements Serializable { @LogField(name="",index=5) @ApiModelProperty("") private String note; - - /** - * - */ - @LogField(name="",index=6) - @ApiModelProperty("") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java index 0d398a2..800fa85 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.contract.dto; +import com.xjrsoft.common.model.base.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; */ @Data @LogTable(source="lng_contract_pur_png_point",name="国内管道气采购") -public class UpdateLngContractPurPngPointDto implements Serializable { +public class UpdateLngContractPurPngPointDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -68,13 +69,6 @@ public class UpdateLngContractPurPngPointDto implements Serializable { @ApiModelProperty("备注") private String note; - /** - * 租户id - */ - @LogField(name="租户id",index=5) - @ApiModelProperty("租户id") - private Long tenantId; - private Boolean hasDel = false; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java index fb88b44..36b3f7c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.contract.dto; +import com.xjrsoft.common.model.base.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; */ @Data @LogTable(source="lng_contract_pur_png_point_sales",name="国内管道气采购上载点-交割点") -public class UpdateLngContractPurPngPointSalesDto implements Serializable { +public class UpdateLngContractPurPngPointSalesDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -82,13 +83,4 @@ public class UpdateLngContractPurPngPointSalesDto implements Serializable { @LogField(name="备注",index=6) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=7) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java index 39fb1a1..db84cb7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.contract.dto; +import com.xjrsoft.common.model.base.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; */ @Data @LogTable(source="lng_contract_pur_png_qty",name="国内管道气采购") -public class UpdateLngContractPurPngQtyDto implements Serializable { +public class UpdateLngContractPurPngQtyDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -130,13 +131,4 @@ public class UpdateLngContractPurPngQtyDto implements Serializable { @LogField(name="备注",index=13) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=14) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java index 4ed818b..6700ee0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java @@ -13,6 +13,7 @@ import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.common.model.base.BaseModel; import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; @@ -28,7 +29,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract",name="国内管道气采购") -public class UpdateLngContractSalesDto implements Serializable { +public class UpdateLngContractSalesDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -183,14 +184,6 @@ public class UpdateLngContractSalesDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractSalesLng diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesIntDto.java index 91c41f1..ed872a3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesIntDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -19,7 +20,7 @@ import java.math.BigDecimal; */ @Data @LogTable(source="lng_contract_sales_int",name="国际销售合同") -public class UpdateLngContractSalesIntDto implements Serializable { +public class UpdateLngContractSalesIntDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -253,13 +254,4 @@ public class UpdateLngContractSalesIntDto implements Serializable { @LogField(name="备注",index=32) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=33) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java index 4061160..49f219c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -21,7 +22,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract_sales_lng_disc",name="国内LNG销售合同") -public class UpdateLngContractSalesLngDiscDto implements Serializable { +public class UpdateLngContractSalesLngDiscDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -75,13 +76,4 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable { @LogField(name="备注",index=6) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=7) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java index e114b5a..ee8956d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java @@ -1,13 +1,13 @@ package com.xjrsoft.module.contract.dto; -import java.io.Serializable; - 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; + @@ -19,7 +19,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract_sales_lng",name="国内LNG销售合同") -public class UpdateLngContractSalesLngDto implements Serializable { +public class UpdateLngContractSalesLngDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -71,13 +71,4 @@ public class UpdateLngContractSalesLngDto implements Serializable { @LogField(name="备注",index=6) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=7) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java index 39c95bd..1bb655e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java @@ -1,16 +1,16 @@ package com.xjrsoft.module.contract.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - import com.fasterxml.jackson.annotation.JsonFormat; 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; +import java.time.LocalDateTime; + @@ -22,7 +22,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract_sales_lng_qty",name="国内LNG销售合同") -public class UpdateLngContractSalesLngQtyDto implements Serializable { +public class UpdateLngContractSalesLngQtyDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -125,13 +125,4 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable { @LogField(name="备注",index=13) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=14) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngStaDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngStaDto.java index 92aba0f..0380e89 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngStaDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngStaDto.java @@ -1,13 +1,13 @@ package com.xjrsoft.module.contract.dto; -import java.io.Serializable; - 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; + @@ -19,7 +19,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract_sales_lng_sta",name="国内LNG销售合同") -public class UpdateLngContractSalesLngStaDto implements Serializable { +public class UpdateLngContractSalesLngStaDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -50,13 +50,4 @@ public class UpdateLngContractSalesLngStaDto implements Serializable { @LogField(name="备注",index=3) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=4) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java index fc0d6b9..1324cea 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -18,7 +19,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_sales_png",name="国内管道气销售") -public class UpdateLngContractSalesPngDto implements Serializable { +public class UpdateLngContractSalesPngDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -63,13 +64,4 @@ public class UpdateLngContractSalesPngDto implements Serializable { @LogField(name="备注",index=5) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=6) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java index a929a7e..9343abd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -18,7 +19,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_sales_png_point",name="国内管道气销售") -public class UpdateLngContractSalesPngPointDto implements Serializable { +public class UpdateLngContractSalesPngPointDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -64,12 +65,5 @@ public class UpdateLngContractSalesPngPointDto implements Serializable { @ApiModelProperty("备注") private String note; - /** - * 租户id - */ - @LogField(name="租户id",index=6) - @ApiModelProperty("租户id") - private Long tenantId; - private Boolean hasDel = false; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngQtyDto.java index 9b3bc48..ebeba5c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngQtyDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngQtyDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.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; @@ -20,7 +21,7 @@ import java.time.LocalDateTime; */ @Data @LogTable(source="lng_contract_sales_png_qty",name="国内管道气销售") -public class UpdateLngContractSalesPngQtyDto implements Serializable { +public class UpdateLngContractSalesPngQtyDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -121,13 +122,4 @@ public class UpdateLngContractSalesPngQtyDto implements Serializable { @LogField(name="备注",index=13) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=14) - @ApiModelProperty("租户id") - private Long tenantId; - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java index 25b8e56..373b82f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.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; @@ -19,7 +20,7 @@ import java.util.List; */ @Data @LogTable(source="lng_contract",name="管输合同") -public class UpdateLngContractTPDto implements Serializable { +public class UpdateLngContractTPDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -169,14 +170,6 @@ public class UpdateLngContractTPDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractTransPng @@ -189,16 +182,6 @@ public class UpdateLngContractTPDto implements Serializable { caseType = JoinCaseType.FULL, target = UpdateLngContractTransPngDto.class, type = JoinType.MANY) private List lngContractTransPngList; /** - * lngPriceTransPng - */ - @ApiModelProperty("lngPriceTransPng子表") - @LogJoin(name = "lngPriceTransPng子表", - columns = { - @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) - }, - caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDto.class, type = JoinType.MANY) - private List lngPriceTransPngList; - /** * lngContractFactRel */ @ApiModelProperty("lngContractFactRel子表") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java index e40cfd9..62ca8ca 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java @@ -1,13 +1,12 @@ package com.xjrsoft.module.contract.dto; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogTable; +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.util.List; /** @@ -18,7 +17,7 @@ import java.io.Serializable; */ @Data @LogTable(source="lng_contract_trans_png",name="管输合同") -public class UpdateLngContractTransPngDto implements Serializable { +public class UpdateLngContractTransPngDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -70,13 +69,18 @@ public class UpdateLngContractTransPngDto implements Serializable { @LogField(name="备注",index=6) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=7) - @ApiModelProperty("租户id") - private Long tenantId; private Boolean hasDel = false; + + /** + * lngPriceTransPng + */ + @ApiModelProperty("lngPriceTransPng子表") + @LogJoin(name = "lngPriceTransPng子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "ktpId", valueDirection = ValueDirectionType.RIGHT), + @LogJoinColumn(field = "kId",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDto.class, type = JoinType.MANY) + private List lngPriceTransPngList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDtlDto.java new file mode 100644 index 0000000..8b3bdc8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDtlDto.java @@ -0,0 +1,96 @@ +package com.xjrsoft.module.contract.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-02-24 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_proc_dtl",name="加工合同") +public class UpdateLngPriceProcDtlDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @LogField(name="合同-主信息主键",index=1) + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 价格-加工服务主键(lng_price_proc.id) + */ + @LogField(name="价格-加工服务主键",index=2) + @ApiModelProperty("价格-加工服务主键(lng_price_proc.id)") + private Long ppId; + + /** + * 阶梯 + */ + @LogField(name="阶梯",index=3) + @ApiModelProperty("阶梯") + private Short sort; + + /** + * 约定 + */ + @LogField(name="约定",index=4) + @ApiModelProperty("约定") + private String sortDesc; + + /** + * 比值(吨/吉焦) + */ + @LogField(name="比值",index=5) + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + + /** + * 阶梯气量(吉焦) + */ + @LogField(name="阶梯气量",index=6) + @ApiModelProperty("阶梯气量(吉焦)") + private BigDecimal qtyGj; + + /** + * 管道气加工费率(元/吉焦) + */ + @LogField(name="管道气加工费率",index=7) + @ApiModelProperty("管道气加工费率(元/吉焦)") + private BigDecimal pricePngGj; + + /** + * LNG加工费率(元/吉焦) + */ + @LogField(name="LNG加工费率",index=8) + @ApiModelProperty("LNG加工费率(元/吉焦)") + private BigDecimal priceLngGj; + + /** + * 备注 + */ + @LogField(name="备注",index=9) + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java index 9b29597..e8b8c1c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java @@ -1,14 +1,13 @@ package com.xjrsoft.module.contract.dto; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogTable; +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; /** @@ -19,7 +18,7 @@ import java.time.LocalDateTime; */ @Data @LogTable(source="lng_price_proc",name="加工合同") -public class UpdateLngPriceProcDto implements Serializable { +public class UpdateLngPriceProcDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -42,7 +41,7 @@ public class UpdateLngPriceProcDto implements Serializable { */ @LogField(name="公司编码",index=2) @ApiModelProperty("公司编码(天然气公司/惠贸)") - private String comCode; + private Long comId; /** * 服务商编码(惠州接收站/阳江接收站) @@ -92,13 +91,17 @@ public class UpdateLngPriceProcDto implements Serializable { @LogField(name="备注",index=9) @ApiModelProperty("备注") private String note; - + /** - * 租户id - */ - @LogField(name="租户id",index=10) - @ApiModelProperty("租户id") - private Long tenantId; - + * lngPriceProcDtl + */ + @ApiModelProperty("lngPriceProcDtl子表") + @LogJoin(name = "lngPriceProcDtl子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "ppId", valueDirection = ValueDirectionType.RIGHT), + @LogJoinColumn(field = "kId",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceProcDtlDto.class, type = JoinType.MANY) + private List lngPriceProcDtlList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDtlDto.java new file mode 100644 index 0000000..af61511 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDtlDto.java @@ -0,0 +1,103 @@ +package com.xjrsoft.module.contract.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-02-24 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_trans_png_dtl",name="管输合同") +public class UpdateLngPriceTransPngDtlDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @LogField(name="合同-主信息主键(lng_contract.id)",index=1) + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 价格-管输主键(lng_price_trans_png.id) + */ + @LogField(name="价格-管输主键(lng_price_trans_png.id)",index=2) + @ApiModelProperty("价格-管输主键(lng_price_trans_png.id)") + private Long ppId; + + /** + * 阶梯 + */ + @LogField(name="阶梯",index=3) + @ApiModelProperty("阶梯") + private Short sort; + + /** + * 约定 + */ + @LogField(name="约定",index=4) + @ApiModelProperty("约定") + private String sortDesc; + + /** + * 阶梯气量(方) + */ + @LogField(name="阶梯气量(方)",index=5) + @ApiModelProperty("阶梯气量(方)") + private BigDecimal qtyM3; + + /** + * 阶梯气量(吉焦)(隐藏) + */ + @LogField(name="阶梯气量(吉焦)(隐藏)",index=6) + @ApiModelProperty("阶梯气量(吉焦)(隐藏)") + private BigDecimal qtyGj; + + /** + * 管输单价(元/方) + */ + @LogField(name="管输单价(元/方)",index=7) + @ApiModelProperty("管输单价(元/方)") + private BigDecimal priceTransM3; + + /** + * 管输单价(元/吉焦)(隐藏) + */ + @LogField(name="管输单价(元/吉焦)(隐藏)",index=8) + @ApiModelProperty("管输单价(元/吉焦)(隐藏)") + private BigDecimal priceTransGj; + + /** + * 比值(方/吉焦)(隐藏) + */ + @LogField(name="比值(方/吉焦)(隐藏)",index=9) + @ApiModelProperty("比值(方/吉焦)(隐藏)") + private BigDecimal rateM3Gj; + + /** + * 备注 + */ + @LogField(name="备注",index=10) + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java index 9fd0794..fa54a77 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java @@ -1,14 +1,13 @@ package com.xjrsoft.module.contract.dto; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogTable; +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; /** @@ -19,7 +18,7 @@ import java.time.LocalDateTime; */ @Data @LogTable(source="lng_price_trans_png",name="管输合同") -public class UpdateLngPriceTransPngDto implements Serializable { +public class UpdateLngPriceTransPngDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -36,62 +35,87 @@ public class UpdateLngPriceTransPngDto implements Serializable { @LogField(name="合同-主信息主键",index=1) @ApiModelProperty("合同-主信息主键(lng_contract.id)") private Long kId; + + + /** + * 合同-管输-上下载点主键 + */ + @LogField(name="合同-管输-上下载点主键",index=2) + @ApiModelProperty("合同-管输-上下载点主键") + private Long ktpId; + + /** + * 上载点 + */ + @LogField(name="上载点",index=3) + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 交割点 + */ + @LogField(name="交割点",index=4) + @ApiModelProperty("交割点") + private String pointDelyCode; /** * 公司编码(天然气公司/惠贸) */ - @LogField(name="公司编码",index=2) + @LogField(name="公司编码",index=5) @ApiModelProperty("公司编码(天然气公司/惠贸)") - private String comCode; + private Long comId; /** * 托运商编码(管道公司/管网) */ - @LogField(name="托运商编码",index=3) + @LogField(name="托运商编码",index=6) @ApiModelProperty("托运商编码(管道公司/管网)") private String suCode; /** * 有效期开始 */ - @LogField(name="有效期开始",index=4) + @LogField(name="有效期开始",index=7) @ApiModelProperty("有效期开始") private LocalDateTime dateFrom; /** * 结束日类型(F-固定日期，Y-每年) */ - @LogField(name="结束日类型",index=5) + @LogField(name="结束日类型",index=8) @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") private String dateToCode; /** * 固定结束日(date_to_code=F，必须录入，否则空着只读) */ - @LogField(name="固定结束日",index=6) + @LogField(name="固定结束日",index=9) @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") private LocalDateTime dateToF; /** * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) */ - @LogField(name="每年结束日",index=7) + @LogField(name="每年结束日",index=10) @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") private String dateToY; /** * 备注 */ - @LogField(name="备注",index=8) + @LogField(name="备注",index=11) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=9) - @ApiModelProperty("租户id") - private Long tenantId; - + /** + * lngPriceTransPngDtl + */ + @ApiModelProperty("lngPriceTransPngDtl子表") + @LogJoin(name = "lngPriceTransPngDtl子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "ppId", valueDirection = ValueDirectionType.RIGHT), + @LogJoinColumn(field = "kId",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDtlDto.class, type = JoinType.MANY) + private List lngPriceTransPngDtlList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java index a9b7227..98f3eb4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java @@ -37,6 +37,7 @@ public class LngContractProcVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("气源地") private String staCode; + private String staName; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java index dc39c36..d7de4fd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java @@ -233,11 +233,6 @@ public class LngContractTPVo { */ @ApiModelProperty("lngContractTransPng子表") private List lngContractTransPngList; - /** - * lngPriceTransPng - */ - @ApiModelProperty("lngPriceTransPng子表") - private List lngPriceTransPngList; /** * lngContractFact */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java index d204690..538efcd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java @@ -6,6 +6,8 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; +import java.util.List; + /** * @title: 表单出参 * @Author 管理员 @@ -37,14 +39,16 @@ public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseMod */ @ApiModelProperty("上载点") private String pointUpCode; - + private String pointUpName; + /** * 交割点 */ @ApiModelProperty("交割点") private String pointDelyCode; - + private String pointDelyName; + /** * 路径(隐藏) @@ -65,4 +69,10 @@ public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseMod */ @ApiModelProperty("备注") private String note; + + /** + * lngPriceTransPng + */ + @ApiModelProperty("lngPriceTransPng子表") + private List lngPriceTransPngList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcDtlVo.java new file mode 100644 index 0000000..b71c898 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcDtlVo.java @@ -0,0 +1,91 @@ +package com.xjrsoft.module.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-24 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceProcDtlVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + + /** + * 价格-加工服务主键(lng_price_proc.id) + */ + @ApiModelProperty("价格-加工服务主键(lng_price_proc.id)") + private Long ppId; + + + /** + * 阶梯 + */ + @ApiModelProperty("阶梯") + private Short sort; + + + /** + * 约定 + */ + @ApiModelProperty("约定") + private String sortDesc; + + + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + + + /** + * 阶梯气量(吉焦) + */ + @ApiModelProperty("阶梯气量(吉焦)") + private BigDecimal qtyGj; + + + /** + * 管道气加工费率(元/吉焦) + */ + @ApiModelProperty("管道气加工费率(元/吉焦)") + private BigDecimal pricePngGj; + + + /** + * LNG加工费率(元/吉焦) + */ + @ApiModelProperty("LNG加工费率(元/吉焦)") + private BigDecimal priceLngGj; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java index cef608c..d3406fa 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java @@ -7,6 +7,7 @@ import lombok.ToString; import lombok.experimental.Accessors; import java.time.LocalDateTime; +import java.util.List; /** * @title: 表单出参 @@ -38,7 +39,7 @@ public class LngPriceProcVo extends com.xjrsoft.common.model.base.BaseModel{ * 公司编码(天然气公司/惠贸) */ @ApiModelProperty("公司编码(天然气公司/惠贸)") - private String comCode; + private Long comId; /** @@ -88,4 +89,11 @@ public class LngPriceProcVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("备注") private String note; + + + /** + * lngPriceProcDtl + */ + @ApiModelProperty("lngPriceProcDtl子表") + private List lngPriceProcDtlList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngDtlVo.java new file mode 100644 index 0000000..f3c45bf --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngDtlVo.java @@ -0,0 +1,98 @@ +package com.xjrsoft.module.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-24 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceTransPngDtlVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + + /** + * 价格-管输主键(lng_price_trans_png.id) + */ + @ApiModelProperty("价格-管输主键(lng_price_trans_png.id)") + private Long ppId; + + + /** + * 阶梯 + */ + @ApiModelProperty("阶梯") + private Short sort; + + + /** + * 约定 + */ + @ApiModelProperty("约定") + private String sortDesc; + + + /** + * 阶梯气量(方) + */ + @ApiModelProperty("阶梯气量(方)") + private BigDecimal qtyM3; + + + /** + * 阶梯气量(吉焦)(隐藏) + */ + @ApiModelProperty("阶梯气量(吉焦)(隐藏)") + private BigDecimal qtyGj; + + + /** + * 管输单价(元/方) + */ + @ApiModelProperty("管输单价(元/方)") + private BigDecimal priceTransM3; + + + /** + * 管输单价(元/吉焦)(隐藏) + */ + @ApiModelProperty("管输单价(元/吉焦)(隐藏)") + private BigDecimal priceTransGj; + + + /** + * 比值(方/吉焦)(隐藏) + */ + @ApiModelProperty("比值(方/吉焦)(隐藏)") + private BigDecimal rateM3Gj; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java index 2eb354f..f425c8c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java @@ -7,6 +7,7 @@ import lombok.ToString; import lombok.experimental.Accessors; import java.time.LocalDateTime; +import java.util.List; /** * @title: 表单出参 @@ -32,13 +33,32 @@ public class LngPriceTransPngVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("合同-主信息主键(lng_contract.id)") private Long kId; + + + /** + * 合同-管输-上下载点主键 + */ + @ApiModelProperty("合同-管输-上下载点主键") + private Long ktpId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; /** * 公司编码(天然气公司/惠贸) */ @ApiModelProperty("公司编码(天然气公司/惠贸)") - private String comCode; + private Long comId; /** @@ -81,4 +101,10 @@ public class LngPriceTransPngVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("备注") private String note; + + /** + * lngPriceTransPngDtl + */ + @ApiModelProperty("lngPriceTransPngDtl子表") + private List lngPriceTransPngDtlList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java index 58014d9..c00d329 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java @@ -39,7 +39,7 @@ public class LngPriceProc implements Serializable { * 公司编码(天然气公司/惠贸) */ @ApiModelProperty("公司编码(天然气公司/惠贸)") - private String comCode; + private Long comId; /** * 服务商编码(惠州接收站/阳江接收站) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProcDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProcDtl.java new file mode 100644 index 0000000..c6dee7f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProcDtl.java @@ -0,0 +1,143 @@ +package com.xjrsoft.module.contract.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-02-24 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_proc_dtl") +@ApiModel(value = "加工合同对象", description = "加工合同") +public class LngPriceProcDtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 价格-加工服务主键(lng_price_proc.id) + */ + @ApiModelProperty("价格-加工服务主键(lng_price_proc.id)") + private Long ppId; + + /** + * 阶梯 + */ + @ApiModelProperty("阶梯") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 约定 + */ + @ApiModelProperty("约定") + private String sortDesc; + + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateTonGj; + + /** + * 阶梯气量(吉焦) + */ + @ApiModelProperty("阶梯气量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGj; + + /** + * 管道气加工费率(元/吉焦) + */ + @ApiModelProperty("管道气加工费率(元/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal pricePngGj; + + /** + * LNG加工费率(元/吉焦) + */ + @ApiModelProperty("LNG加工费率(元/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceLngGj; + + /** + * 备注 + */ + @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/contract/entity/LngPriceTransPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPng.java index 03a2534..82f620f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPng.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPng.java @@ -34,12 +34,30 @@ public class LngPriceTransPng implements Serializable { */ @ApiModelProperty("合同-主信息主键(lng_contract.id)") private Long kId; + + /** + * 合同-管输-上下载点主键 + */ + @ApiModelProperty("合同-管输-上下载点主键") + private Long ktpId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; /** * 公司编码(天然气公司/惠贸) */ @ApiModelProperty("公司编码(天然气公司/惠贸)") - private String comCode; + private Long comId; /** * 托运商编码(管道公司/管网) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPngDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPngDtl.java new file mode 100644 index 0000000..cff19f5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPngDtl.java @@ -0,0 +1,150 @@ +package com.xjrsoft.module.contract.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-02-24 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_trans_png_dtl") +@ApiModel(value = "管输合同对象", description = "管输合同") +public class LngPriceTransPngDtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 价格-管输主键(lng_price_trans_png.id) + */ + @ApiModelProperty("价格-管输主键(lng_price_trans_png.id)") + private Long ppId; + + /** + * 阶梯 + */ + @ApiModelProperty("阶梯") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 约定 + */ + @ApiModelProperty("约定") + private String sortDesc; + + /** + * 阶梯气量(方) + */ + @ApiModelProperty("阶梯气量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3; + + /** + * 阶梯气量(吉焦)(隐藏) + */ + @ApiModelProperty("阶梯气量(吉焦)(隐藏)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGj; + + /** + * 管输单价(元/方) + */ + @ApiModelProperty("管输单价(元/方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceTransM3; + + /** + * 管输单价(元/吉焦)(隐藏) + */ + @ApiModelProperty("管输单价(元/吉焦)(隐藏)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceTransGj; + + /** + * 比值(方/吉焦)(隐藏) + */ + @ApiModelProperty("比值(方/吉焦)(隐藏)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 备注 + */ + @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/contract/mapper/LngContractProcMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractProcMapper.java index 3737236..11a6503 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractProcMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractProcMapper.java @@ -3,7 +3,12 @@ package com.xjrsoft.module.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractProc; +import com.xjrsoft.module.contract.vo.LngContractProcVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @title: mapper @@ -14,4 +19,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngContractProcMapper extends MPJBaseMapper, BaseMapper { + @Select("SELECT t1.*, t2.full_name AS staName" + + " FROM lng_contract_proc t1" + + " LEFT JOIN lng_b_station_lng t2 on t2.code = t1.sta_code" + + " WHERE t1.k_id = #{contractId}") + List selectByContractId(@Param("contractId") Long contractId); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java index 6402334..7aa8a35 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java @@ -3,7 +3,12 @@ package com.xjrsoft.module.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractTransPng; +import com.xjrsoft.module.contract.vo.LngContractTransPngVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @title: mapper @@ -14,4 +19,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngContractTransPngMapper extends MPJBaseMapper, BaseMapper { + @Select("SELECT t1.*, t2.full_name AS pointUpName, t3.full_name AS pointDelyName" + + " FROM lng_contract_trans_png t1" + + " LEFT JOIN lng_b_station_lng t2 on t2.code = t1.point_up_code" + + " LEFT JOIN lng_b_station_png t3 on t3.code = t1.point_dely_code" + + " WHERE t1.k_id = #{contractId}") + List selectByContractId(@Param("contractId") Long contractId); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcDtlMapper.java new file mode 100644 index 0000000..5592512 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcDtlMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngPriceProcDtl; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-24 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceProcDtlMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngDtlMapper.java new file mode 100644 index 0000000..5ee4ded --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngDtlMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngPriceTransPngDtl; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-24 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceTransPngDtlMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java index 1364ba8..ce58171 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java @@ -31,6 +31,7 @@ public class ContractProcServiceImpl extends MPJBaseServiceImpl lngContractProcList = lngContractProcMapper.selectList( - new LambdaQueryWrapper() - .eq(LngContractProc::getKId, lngContract.getId())); - if (CollectionUtils.isNotEmpty(lngContractProcList)) { - vo.setLngContractProcList(BeanUtil.copyToList(lngContractProcList, - LngContractProcVo.class)); - } + List lngContractProcVoList = lngContractProcMapper.selectByContractId(lngContract.getId()); + vo.setLngContractProcList(lngContractProcVoList); List lngPriceProcList = lngPriceProcMapper.selectList( new LambdaQueryWrapper() .eq(LngPriceProc::getKId, lngContract.getId())); if (CollectionUtils.isNotEmpty(lngPriceProcList)) { - vo.setLngPriceProcList(BeanUtil.copyToList(lngPriceProcList, - LngPriceProcVo.class)); + List lngPriceProcVoList = BeanUtil.copyToList(lngPriceProcList, LngPriceProcVo.class); + vo.setLngPriceProcList(lngPriceProcVoList); + lngPriceProcVoList.forEach(x -> { + List lngPriceProcDtlList = lngPriceProcDtlMapper.selectList( + new LambdaQueryWrapper().eq(LngPriceProcDtl::getPpId, x.getId())); + x.setLngPriceProcDtlList(BeanUtil.copyToList(lngPriceProcDtlList, LngPriceProcDtlVo.class)); + }); } List lngContractFactRelList = lngContractFactRelMapper.selectList( new LambdaQueryWrapper() diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java index 3417de9..e94e131 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java @@ -31,6 +31,7 @@ public class ContractTransPngServiceImpl extends MPJBaseServiceImpl lngContractTransPngList = lngContractTransPngMapper.selectList( - new LambdaQueryWrapper() - .eq(LngContractTransPng::getKId, lngContract.getId())); - if (CollectionUtils.isNotEmpty(lngContractTransPngList)) { - vo.setLngContractTransPngList(BeanUtil.copyToList(lngContractTransPngList, - LngContractTransPngVo.class)); - } - List lngPriceTransPngList = lngPriceTransPngMapper.selectList( - new LambdaQueryWrapper() - .eq(LngPriceTransPng::getKId, lngContract.getId())); - if (CollectionUtils.isNotEmpty(lngPriceTransPngList)) { - vo.setLngPriceTransPngList(BeanUtil.copyToList(lngPriceTransPngList, - LngPriceTransPngVo.class)); + List lngContractTransPngVoList = lngContractTransPngMapper + .selectByContractId(lngContract.getId()); + vo.setLngContractTransPngList(lngContractTransPngVoList); + if (CollectionUtils.isNotEmpty(lngContractTransPngVoList)) { + lngContractTransPngVoList.forEach(x -> { + List lngPriceTransPngList = lngPriceTransPngMapper.selectList( + new LambdaQueryWrapper() + .eq(LngPriceTransPng::getKtpId, x.getId())); + if (CollectionUtils.isNotEmpty(lngPriceTransPngList)) { + List lngPriceTransPngVoList = BeanUtil.copyToList(lngPriceTransPngList, + LngPriceTransPngVo.class); + x.setLngPriceTransPngList(lngPriceTransPngVoList); + lngPriceTransPngVoList.forEach(y -> { + List lngPriceTransPngDtlList = lngPriceTransPngDtlMapper.selectList( + new LambdaQueryWrapper().eq(LngPriceTransPngDtl::getPpId, + y.getId())); + y.setLngPriceTransPngDtlList(BeanUtil.copyToList(lngPriceTransPngDtlList, + LngPriceTransPngDtlVo.class)); + }); + } + }); } + + + List lngContractFactRelList = lngContractFactRelMapper.selectList( new LambdaQueryWrapper() .eq(LngContractFactRel::getKId, lngContract.getId())); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java index ff00e70..52a1486 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java @@ -16,6 +16,7 @@ import com.pictc.enums.ExceptionCommonCode; import com.pictc.enums.ValidEnum; import com.pictc.utils.DataLogTools; import com.xjrsoft.common.advice.tran.CurrencyDataProvider; +import com.xjrsoft.common.advice.tran.TranDataManager; import com.xjrsoft.common.enums.YesOrNoEnum; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.common.db.service.CommonCallService; @@ -39,8 +40,8 @@ public class CurrencyServiceImpl extends ServiceImpl content) { String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - UpdateLngCustomerDto obj =content.getObj(); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + UpdateLngCustomerDto obj =content.getObj(); tranProvider.saveData(obj.getCuCode(), obj); return obj; } @@ -172,6 +172,8 @@ public class CustomerController { @Override public UpdateLngCustomerDto after(DataOperationContent content) { + UpdateLngCustomerDto obj =content.getObj(); + tranProvider.removeCacheData(obj.getCuCode()); return null; } })); @@ -194,6 +196,8 @@ public class CustomerController { @Override public UpdateLngCustomerDto after(DataOperationContent content) { + UpdateLngCustomerDto obj =content.getObj(); + tranProvider.saveData(obj.getCuCode(), obj); return null; } })); @@ -216,6 +220,8 @@ public class CustomerController { @Override public UpdateLngCustomerDto after(DataOperationContent content) { + UpdateLngCustomerDto obj =content.getObj(); + tranProvider.saveData(obj.getCuCode(), obj); return null; } })); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java index bd4bb8c..59518b1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java @@ -123,7 +123,7 @@ public class GradeSystemController { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } codeRuleClient.useEncode(GS_CODE); - UpdateLngGradeSystemDto obj =content.getObj(); + UpdateLngGradeSystemDto obj =content.getObj(); tranProvider.saveData(obj.getId().toString(), obj); return obj; } @@ -178,6 +178,8 @@ public class GradeSystemController { @Override public UpdateLngGradeSystemDto after(DataOperationContent content) { + UpdateLngGradeSystemDto obj =content.getObj(); + tranProvider.saveData(obj.getId().toString(), obj); return null; } })); @@ -196,6 +198,8 @@ public class GradeSystemController { @Override public UpdateLngGradeSystemDto after(DataOperationContent content) { + UpdateLngGradeSystemDto obj =content.getObj(); + tranProvider.saveData(obj.getId().toString(), obj); return null; } })); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index e027215..154d6a4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; import com.pictc.enums.ApproveCodeEnum; import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.advice.tran.CustomerDataProvider; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.mdm.client.ILngBankClient; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; @@ -47,16 +48,40 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class CustomerServiceImpl extends MPJBaseServiceImpl implements ICustomerService { - - private final LngCustomerMapper lngCustomerMapper; + + private final LngCustomerMapper lngCustomerMapper; + private final LngCustomerAttrPowerMapper lngCustomerAttrPowerMapper; + private final LngCustomerBankMapper lngCustomerBankMapper; + private final LngCustomerDocMapper lngCustomerDocMapper; + private final LngCustomerContactMapper lngCustomerContactMapper; private final IFileClient fileClient; private final ILngBankClient bankClient; + + private final CustomerDataProvider tranProvider; - + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(List ids) { + List customerList = lngCustomerMapper.selectList(Wrappers.lambdaQuery(LngCustomer.class).in(LngCustomer::getId, ids)); + for(LngCustomer customer: customerList) { + tranProvider.removeCacheData(customer.getCuCode()); + } + List cuCodeList = customerList.stream().map(LngCustomer::getCuCode).filter(Objects::nonNull).collect(Collectors.toList()); + lngCustomerMapper.deleteBatchIds(ids); + if(CollectionUtil.isNotEmpty(cuCodeList)) { + lngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, cuCodeList)); + lngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, cuCodeList)); + lngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, cuCodeList)); + lngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, cuCodeList)); + } + return true; + } + @Override public LngCustomerVo getCustomerById(Long id) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java index ab3e59c..6517087 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java @@ -148,7 +148,7 @@ public class SupplierController { if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } - UpdateLngSupplierDto obj =content.getObj(); + UpdateLngSupplierDto obj =content.getObj(); tranProvider.saveData(obj.getSuCode(), obj); return obj; } @@ -168,6 +168,8 @@ public class SupplierController { @Override public UpdateLngSupplierDto after(DataOperationContent content) { + UpdateLngSupplierDto obj =content.getObj(); + tranProvider.removeCacheData(obj.getSuCode()); return null; } })); @@ -190,6 +192,8 @@ public class SupplierController { @Override public UpdateLngSupplierDto after(DataOperationContent content) { + UpdateLngSupplierDto obj =content.getObj(); + tranProvider.saveData(obj.getSuCode(), obj); return null; } })); @@ -212,6 +216,8 @@ public class SupplierController { @Override public UpdateLngSupplierDto after(DataOperationContent content) { + UpdateLngSupplierDto obj =content.getObj(); + tranProvider.saveData(obj.getSuCode(), obj); return null; } })); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml index ac06c3b..32a510c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml @@ -45,7 +45,7 @@ spring: group: DNE discovery: - ip: 10.0.0.2 + ip: 10.0.0.3 #network-interface: net7 xjrsoft: