From 6566adc731e8a57ffd8b77abccaf4bd4eaff76a6 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 29 Jan 2026 17:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85LNG=E9=94=80=E5=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/vo/LngContractPurPngPointVo.java | 2 - .../contract/vo/LngContractPurPngQtyVo.java | 12 +- .../contract/vo/LngContractPurPngVo.java | 118 ++++++++---------- .../contract/vo/LngContractSalesLngQtyVo.java | 7 ++ .../contract/vo/LngContractSalesLngStaVo.java | 6 + .../contract/vo/LngContractSalesLngVo.java | 15 ++- .../contract/vo/LngContractSalesVo.java | 24 ++-- .../contract/entity/LngContractSales.java | 19 ++- .../impl/ContractSalesLngServiceImpl.java | 3 +- 9 files changed, 108 insertions(+), 98 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java index a5b8dad..dc78e06 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java @@ -3,8 +3,6 @@ package com.xjrsoft.module.contract.vo; import java.time.LocalDateTime; import java.util.List; -import com.baomidou.mybatisplus.annotation.TableField; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java index 7b57daa..54b7fc1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java @@ -1,16 +1,10 @@ package com.xjrsoft.module.contract.vo; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** * @title: 表单出参 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java index 7518d57..a6fee74 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java @@ -1,16 +1,9 @@ package com.xjrsoft.module.contract.vo; +import java.time.LocalDateTime; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** * @title: 表单出参 @@ -24,94 +17,93 @@ public class LngContractPurPngVo extends com.xjrsoft.common.model.base.BaseModel /** * */ - @ApiModelProperty("") + @ApiModelProperty("id") private Long id; /** * */ - @ApiModelProperty("") + @ApiModelProperty("合同id") private Long kId; /** * */ - @ApiModelProperty("") + @ApiModelProperty("定价机制") private String prcTypeCode; /** * */ - @ApiModelProperty("") + @ApiModelProperty("量价周期") private String periodTypeCode; /** * */ - @ApiModelProperty("") + @ApiModelProperty("主计量单位") private String uomCode; /** * */ - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; /** - * - */ - @ApiModelProperty("") - private Long createUserId; - - - /** - * - */ - @ApiModelProperty("") - private LocalDateTime createDate; - - - /** - * - */ - @ApiModelProperty("") - private Long modifyUserId; - - - /** - * - */ - @ApiModelProperty("") - private LocalDateTime modifyDate; - - - /** - * - */ - @ApiModelProperty("") - private Long tenantId; - - - /** - * - */ - @ApiModelProperty("") - private Long deptId; - - - /** - * - */ - @ApiModelProperty("") - private Long ruleUserId; - - + * 创建人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/contract/vo/LngContractSalesLngQtyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java index 373aadf..4539b7a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java @@ -3,6 +3,9 @@ package com.xjrsoft.module.contract.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -47,7 +50,9 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base * 基础量/增量(基础量/增量1/增量2) */ @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + @Trans(type = TransType.DIC, id = "2007987645607911425",transToFieldName = "baseIncName") private String baseInc; + private String baseIncName; /** @@ -96,7 +101,9 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base * 照付不议类型(P-比例/TON-吨/GJ-吉焦) */ @ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)") + @Trans(type = TransType.DIC, id = "2007988744662360066",transToFieldName = "zfbyTypeName") private String zfbyTypeCode; + private String zfbyTypeName; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java index 413d5bf..7495a22 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java @@ -2,6 +2,9 @@ package com.xjrsoft.module.contract.vo; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,8 +35,11 @@ public class LngContractSalesLngStaVo extends com.xjrsoft.common.model.base.Base * 气源地(不能重复) */ @ApiModelProperty("气源地(不能重复)") + @Trans(type = TransType.LNG_STATION,transToFieldName = "staName") private String staCode; + private String staName; + /** * 备注 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java index b3736f0..ed2ff70 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java @@ -2,6 +2,9 @@ package com.xjrsoft.module.contract.vo; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,29 +35,37 @@ public class LngContractSalesLngVo extends com.xjrsoft.common.model.base.BaseMod * 定价机制(固定价/公式价/对标价/无) */ @ApiModelProperty("定价机制(固定价/公式价/对标价/无)") + @Trans(type = TransType.DIC, id = "2006201894415179778",transToFieldName = "prcTypeName") private String prcTypeCode; - + private String prcTypeName; /** * 量价周期(1-自然月，-1-自然月往前1日) */ @ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)") + @Trans(type = TransType.DIC, id = "2006202997290639362",transToFieldName = "prcTypeName") private String periodTypeCode; + private String periodTypeName; + /** * 计量单位(隐藏) */ @ApiModelProperty("计量单位(隐藏)") + @Trans(type = TransType.DIC, id = "1980562721538633730",transToFieldName = "uomName") private String uomCode; + private String uomName; + /** * 全部气源地可用(Y-是，N-否；是时不录入子表) */ @ApiModelProperty("全部气源地可用(Y-是，N-否；是时不录入子表)") + @Trans(type = TransType.DIC, id = "1978056598125330433",transToFieldName = "uomName") private String allStaSign; - + private String allStaSignName; /** * 备注 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java index 16d51bb..50e8257 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java @@ -227,20 +227,26 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{ /** - * lngContractPurPng + * lngContractSalesLng */ - @ApiModelProperty("lngContractPurPng子表") - private List lngContractPurPngList; + @ApiModelProperty("lngContractSalesLng子表") + private List lngContractSalesLngList; /** - * lngContractPurPngPoint + * lngContractSalesLngSta */ - @ApiModelProperty("lngContractPurPngPoint子表") - private List lngContractPurPngPointList; + @ApiModelProperty("lngContractSalesLngSta子表") + private List lngContractSalesLngStaList; /** - * lngContractPurPngQty + * lngContractSalesLngQty */ - @ApiModelProperty("lngContractPurPngQty子表") - private List lngContractPurPngQtyList; + @ApiModelProperty("lngContractSalesLngQty子表") + private List lngContractSalesLngQtyList; + + /** + * lngContractSalesLngQty + */ + @ApiModelProperty("lngContractSalesLngDisc子表") + private List lngContractSalesLngDiscList; /** * * lngContractApproRel diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSales.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSales.java index 821069c..8159326 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSales.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSales.java @@ -1,12 +1,14 @@ package com.xjrsoft.module.contract.entity; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableName; import com.github.yulichang.annotation.EntityMapping; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; @@ -17,11 +19,6 @@ import com.pictc.annotations.datalog.ValueDirectionType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** @@ -32,7 +29,7 @@ import java.util.List; */ @Data @TableName("lng_contract") -@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +@ApiModel(value = "国内LNG销售对象", description = "国内LNG销售") public class LngContractSales implements Serializable { private static final long serialVersionUID = 1L; @@ -246,7 +243,7 @@ public class LngContractSales implements Serializable { @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = LngContractSalesLngSta.class, type = JoinType.MANY) - private List LngContractSalesLngStaList; + private List lngContractSalesLngStaList; /** * lngContractSalesLngDisc @@ -259,7 +256,7 @@ public class LngContractSales implements Serializable { @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = LngContractSalesLngDisc.class, type = JoinType.MANY) - private List LngContractSalesLngDiscList; + private List lngContractSalesLngDiscList; /** * LngContractSalesLngQty */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java index cbd53df..b3e35a6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java @@ -46,8 +46,7 @@ public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl lngContractFactRelList = vo.getLngContractFactRelList(); if (CollectionUtils.isNotEmpty(lngContractFactRelList)) {