geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

国内LNG销售

Browse Source
This commit is contained in:
shunyi.kuang
2026-01-29 17:24:40 +08:00
parent 55ab32736f
commit 6566adc731
9 changed files with 108 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java
View File

@ -3,8 +3,6 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

12
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java
View File

@ -1,16 +1,10 @@
package com.xjrsoft.module.contract.vo; package com.xjrsoft.module.contract.vo;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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: 表单出参 * @title: 表单出参

52
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java
View File

@ -1,16 +1,9 @@
package com.xjrsoft.module.contract.vo; package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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: 表单出参 * @title: 表单出参
@ -24,95 +17,94 @@ public class LngContractPurPngVo extends com.xjrsoft.common.model.base.BaseModel
/** /**
* *
*/ */
@ApiModelProperty("") @ApiModelProperty("id")
private Long id; private Long id;
/** /**
* *
*/ */
@ApiModelProperty("") @ApiModelProperty("合同id")
private Long kId; private Long kId;
/** /**
* *
*/ */
@ApiModelProperty("") @ApiModelProperty("定价机制")
private String prcTypeCode; private String prcTypeCode;
/** /**
* *
*/ */
@ApiModelProperty("") @ApiModelProperty("量价周期")
private String periodTypeCode; private String periodTypeCode;
/** /**
* *
*/ */
@ApiModelProperty("") @ApiModelProperty("主计量单位")
private String uomCode; private String uomCode;
/** /**
* *
*/ */
@ApiModelProperty("") @ApiModelProperty("备注")
private String note; private String note;
/** /**
* * 创建人id
*/ */
@ApiModelProperty("") @ApiModelProperty("创建人id")
private Long createUserId; private Long createUserId;
/** /**
* * 创建时间
*/ */
@ApiModelProperty("") @ApiModelProperty("创建时间")
private LocalDateTime createDate; private LocalDateTime createDate;
/** /**
* * 修改人id
*/ */
@ApiModelProperty("") @ApiModelProperty("修改人id")
private Long modifyUserId; private Long modifyUserId;
/** /**
* * 修改时间
*/ */
@ApiModelProperty("") @ApiModelProperty("修改时间")
private LocalDateTime modifyDate; private LocalDateTime modifyDate;
/** /**
* * 租户id
*/ */
@ApiModelProperty("") @ApiModelProperty("租户id")
private Long tenantId; private Long tenantId;
/** /**
* * 部门id
*/ */
@ApiModelProperty("") @ApiModelProperty("部门id")
private Long deptId; private Long deptId;
/** /**
* * 数据权限id
*/ */
@ApiModelProperty("") @ApiModelProperty("数据权限id")
private Long ruleUserId; private Long ruleUserId;
} }

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java
View File

@ -3,6 +3,9 @@ package com.xjrsoft.module.contract.vo;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -47,7 +50,9 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
* 基础量/增量(基础量/增量1/增量2) * 基础量/增量(基础量/增量1/增量2)
*/ */
@ApiModelProperty("基础量/增量(基础量/增量1/增量2)") @ApiModelProperty("基础量/增量(基础量/增量1/增量2)")
@Trans(type = TransType.DIC, id = "2007987645607911425",transToFieldName = "baseIncName")
private String baseInc; private String baseInc;
private String baseIncName;
/** /**
@ -96,7 +101,9 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
* 照付不议类型(P-比例/TON-吨/GJ-吉焦) * 照付不议类型(P-比例/TON-吨/GJ-吉焦)
*/ */
@ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)") @ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)")
@Trans(type = TransType.DIC, id = "2007988744662360066",transToFieldName = "zfbyTypeName")
private String zfbyTypeCode; private String zfbyTypeCode;
private String zfbyTypeName;
/** /**

6
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java
View File

@ -2,6 +2,9 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -32,8 +35,11 @@ public class LngContractSalesLngStaVo extends com.xjrsoft.common.model.base.Base
* 气源地(不能重复) * 气源地(不能重复)
*/ */
@ApiModelProperty("气源地(不能重复)") @ApiModelProperty("气源地(不能重复)")
@Trans(type = TransType.LNG_STATION,transToFieldName = "staName")
private String staCode; private String staCode;
private String staName;
/** /**
* 备注 * 备注

15
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java
View File

@ -2,6 +2,9 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -32,29 +35,37 @@ public class LngContractSalesLngVo extends com.xjrsoft.common.model.base.BaseMod
* 定价机制(固定价/公式价/对标价/无) * 定价机制(固定价/公式价/对标价/无)
*/ */
@ApiModelProperty("定价机制(固定价/公式价/对标价/无)") @ApiModelProperty("定价机制(固定价/公式价/对标价/无)")
@Trans(type = TransType.DIC, id = "2006201894415179778",transToFieldName = "prcTypeName")
private String prcTypeCode; private String prcTypeCode;
private String prcTypeName;
/** /**
* 量价周期(1-自然月，-1-自然月往前1日) * 量价周期(1-自然月，-1-自然月往前1日)
*/ */
@ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)") @ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)")
@Trans(type = TransType.DIC, id = "2006202997290639362",transToFieldName = "prcTypeName")
private String periodTypeCode; private String periodTypeCode;
private String periodTypeName;
/** /**
* 计量单位(隐藏) * 计量单位(隐藏)
*/ */
@ApiModelProperty("计量单位(隐藏)") @ApiModelProperty("计量单位(隐藏)")
@Trans(type = TransType.DIC, id = "1980562721538633730",transToFieldName = "uomName")
private String uomCode; private String uomCode;
private String uomName;
/** /**
* 全部气源地可用(Y-是，N-否；是时不录入子表) * 全部气源地可用(Y-是，N-否；是时不录入子表)
*/ */
@ApiModelProperty("全部气源地可用(Y-是，N-否；是时不录入子表)") @ApiModelProperty("全部气源地可用(Y-是，N-否；是时不录入子表)")
@Trans(type = TransType.DIC, id = "1978056598125330433",transToFieldName = "uomName")
private String allStaSign; private String allStaSign;
private String allStaSignName;
/** /**
* 备注 * 备注

24
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java
View File

@ -227,20 +227,26 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
/** /**
* lngContractPurPng * lngContractSalesLng
*/ */
@ApiModelProperty("lngContractPurPng子表") @ApiModelProperty("lngContractSalesLng子表")
private List<LngContractPurPngVo> lngContractPurPngList; private List<LngContractSalesLngVo> lngContractSalesLngList;
/** /**
* lngContractPurPngPoint * lngContractSalesLngSta
*/ */
@ApiModelProperty("lngContractPurPngPoint子表") @ApiModelProperty("lngContractSalesLngSta子表")
private List<LngContractPurPngPointVo> lngContractPurPngPointList; private List<LngContractSalesLngStaVo> lngContractSalesLngStaList;
/** /**
* lngContractPurPngQty * lngContractSalesLngQty
*/ */
@ApiModelProperty("lngContractPurPngQty子表") @ApiModelProperty("lngContractSalesLngQty子表")
private List<LngContractPurPngQtyVo> lngContractPurPngQtyList; private List<LngContractSalesLngQtyVo> lngContractSalesLngQtyList;
/**
* lngContractSalesLngQty
*/
@ApiModelProperty("lngContractSalesLngDisc子表")
private List<LngContractSalesLngDiscVo> lngContractSalesLngDiscList;
/** /**
* *
* lngContractApproRel * lngContractApproRel

19
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSales.java
View File

@ -1,12 +1,14 @@
package com.xjrsoft.module.contract.entity; 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.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; 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.TableId;
import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping; import com.github.yulichang.annotation.EntityMapping;
import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@TableName("lng_contract") @TableName("lng_contract")
@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") @ApiModel(value = "国内LNG销售对象", description = "国内LNG销售")
public class LngContractSales implements Serializable { public class LngContractSales implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -246,7 +243,7 @@ public class LngContractSales implements Serializable {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngContractSalesLngSta.class, type = JoinType.MANY) }, caseType = JoinCaseType.FULL, target = LngContractSalesLngSta.class, type = JoinType.MANY)
private List<LngContractSalesLngSta> LngContractSalesLngStaList; private List<LngContractSalesLngSta> lngContractSalesLngStaList;
/** /**
* lngContractSalesLngDisc * lngContractSalesLngDisc
@ -259,7 +256,7 @@ public class LngContractSales implements Serializable {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngContractSalesLngDisc.class, type = JoinType.MANY) }, caseType = JoinCaseType.FULL, target = LngContractSalesLngDisc.class, type = JoinType.MANY)
private List<LngContractSalesLngDisc> LngContractSalesLngDiscList; private List<LngContractSalesLngDisc> lngContractSalesLngDiscList;
/** /**
* LngContractSalesLngQty * LngContractSalesLngQty
*/ */

1
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java
View File

@ -47,7 +47,6 @@ public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl<LngContractS
return null; return null;
} }
LngContractSalesVo vo = BeanUtil.toBean(lngContractSales, LngContractSalesVo.class); LngContractSalesVo vo = BeanUtil.toBean(lngContractSales, LngContractSalesVo.class);
List<LngContractFactRelVo> lngContractFactRelList = vo.getLngContractFactRelList(); List<LngContractFactRelVo> lngContractFactRelList = vo.getLngContractFactRelList();
if (CollectionUtils.isNotEmpty(lngContractFactRelList)) { if (CollectionUtils.isNotEmpty(lngContractFactRelList)) {