diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngDiscDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngDiscDto.java new file mode 100644 index 0000000..81d2569 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngDiscDto.java @@ -0,0 +1,59 @@ +package com.xjrsoft.module.contract.dto; + +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class AddLngContractSalesLngDiscDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + /** + * 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利) + */ + @ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)") + private String discTypeCode; + /** + * 开始日期 + */ + @ApiModelProperty("开始日期") + private LocalDateTime dateFrom; + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + /** + * 优惠说明 + */ + @ApiModelProperty("优惠说明") + private String discDesc; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngDto.java new file mode 100644 index 0000000..c3948d7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngDto.java @@ -0,0 +1,57 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class AddLngContractSalesLngDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + /** + * 定价机制(固定价/公式价/对标价/无) + */ + @ApiModelProperty("定价机制(固定价/公式价/对标价/无)") + private String prcTypeCode; + /** + * 量价周期(1-自然月，-1-自然月往前1日) + */ + @ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)") + private String periodTypeCode; + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + /** + * 全部气源地可用(Y-是，N-否；是时不录入子表) + */ + @ApiModelProperty("全部气源地可用(Y-是，N-否；是时不录入子表)") + private String allStaSign; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngQtyDto.java new file mode 100644 index 0000000..e05a49b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngQtyDto.java @@ -0,0 +1,95 @@ +package com.xjrsoft.module.contract.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class AddLngContractSalesLngQtyDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + /** + * 开始日期 + */ + @ApiModelProperty("开始日期") + private LocalDateTime dateFrom; + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + /** + * 总合同量(吉焦) + */ + @ApiModelProperty("总合同量(吉焦)") + private BigDecimal qtyGjMonth; + /** + * 总合同量(吨) + */ + @ApiModelProperty("总合同量(吨)") + private BigDecimal qtyTonMonth; + /** + * 日合同量(吉焦)(根据天数自动计算) + */ + @ApiModelProperty("日合同量(吉焦)(根据天数自动计算)") + private BigDecimal qtyGjDay; + /** + * 日合同量(吨)(根据天数自动计算) + */ + @ApiModelProperty("日合同量(吨)(根据天数自动计算)") + private BigDecimal qtyTonDay; + /** + * 照付不议类型(P-比例/TON-吨/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)") + private String zfbyTypeCode; + /** + * 照付不议比例%/量数值 + */ + @ApiModelProperty("照付不议比例%/量数值") + private BigDecimal zfbyValue; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngStaDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngStaDto.java new file mode 100644 index 0000000..d371d4d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesLngStaDto.java @@ -0,0 +1,42 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class AddLngContractSalesLngStaDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 气源地(不能重复) + */ + @ApiModelProperty("气源地(不能重复)") + private String staCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java new file mode 100644 index 0000000..2df761c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java @@ -0,0 +1,246 @@ +package com.xjrsoft.module.contract.dto; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +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.module.system.dto.UpdateLngFileUploadDto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract",name="国内管道气采购") +public class UpdateLngContractSalesDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @LogField(name="合同主体ID",index=1) + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + + /** + * 合同号 + */ + @LogField(name="合同号",index=2) + @ApiModelProperty("合同号") + private String kNo; + + /** + * 合同名称 + */ + @LogField(name="合同名称",index=3) + @ApiModelProperty("合同名称") + private String kName; + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @LogField(name="业务类型",index=4) + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @LogField(name="是否线上合同",index=5) + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @LogField(name="交易对手类型",index=6) + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + /** + * 主交易对手编码 + */ + @LogField(name="主交易对手编码",index=7) + @ApiModelProperty("主交易对手编码") + private String cpCode; + + /** + * 主交易对手名称 + */ + @LogField(name="主交易对手名称",index=8) + @ApiModelProperty("主交易对手名称") + private String cpName; + + /** + * 合同期限 + */ + @LogField(name="合同期限",index=9) + @ApiModelProperty("合同期限") + private String kPeriod; + + /** + * 合同签订日期 + */ + @LogField(name="合同签订日期",index=10) + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + + /** + * 有效期开始 + */ + @LogField(name="有效期开始",index=11) + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + /** + * 有效期结束 + */ + @LogField(name="有效期结束",index=12) + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + /** + * 确认函开始日 + */ + @LogField(name="确认函开始日",index=13) + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + /** + * 确认函结束日 + */ + @LogField(name="确认函结束日",index=14) + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + /** + * 币种 + */ + @LogField(name="币种",index=15) + @ApiModelProperty("币种") + private String curCode; + + /** + * 合同金额 + */ + @LogField(name="合同金额",index=16) + @ApiModelProperty("合同金额") + private String amountDesc; + + /** + * 我方联系人 + */ + @LogField(name="我方联系人",index=17) + @ApiModelProperty("我方联系人") + private Long empId; + + /** + * 业务部门ID + */ + @LogField(name="业务部门ID",index=18) + @ApiModelProperty("业务部门ID") + private Long bDeptId; + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @LogField(name="状态",index=19) + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 备注 + */ + @LogField(name="备注",index=20) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=21) + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + @LogJoin(name = "lngContractPurPng子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY) + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @LogJoin(name = "lngContractPurPngPoint子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY) + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + @LogJoin(name = "lngContractPurPngQty子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY) + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + @LogJoin(name = "lngContractApproRel子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY) + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + @LogJoin(name = "lngContractFactRel子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractFactRelDto.class, type = JoinType.MANY) + private List lngContractFactRelList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} 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 new file mode 100644 index 0000000..9ffcc8c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java @@ -0,0 +1,84 @@ +package com.xjrsoft.module.contract.dto; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_sales_lng_disc",name="国内LNG销售合同") +public class UpdateLngContractSalesLngDiscDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利) + */ + @LogField(name="返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)",index=2) + @ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)") + private String discTypeCode; + + /** + * 开始日期 + */ + @LogField(name="开始日期",index=3) + @ApiModelProperty("开始日期") + private LocalDateTime dateFrom; + + /** + * 结束日期 + */ + @LogField(name="结束日期",index=4) + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + /** + * 优惠说明 + */ + @LogField(name="优惠说明",index=5) + @ApiModelProperty("优惠说明") + private String discDesc; + + /** + * 备注 + */ + @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 new file mode 100644 index 0000000..e114b5a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java @@ -0,0 +1,83 @@ +package com.xjrsoft.module.contract.dto; + +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_sales_lng",name="国内LNG销售合同") +public class UpdateLngContractSalesLngDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 定价机制(固定价/公式价/对标价/无) + */ + @LogField(name="定价机制(固定价/公式价/对标价/无)",index=2) + @ApiModelProperty("定价机制(固定价/公式价/对标价/无)") + private String prcTypeCode; + + /** + * 量价周期(1-自然月，-1-自然月往前1日) + */ + @LogField(name="量价周期(1-自然月，-1-自然月往前1日)",index=3) + @ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)") + private String periodTypeCode; + + /** + * 计量单位(隐藏) + */ + @LogField(name="计量单位(隐藏)",index=4) + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 全部气源地可用(Y-是，N-否；是时不录入子表) + */ + @LogField(name="全部气源地可用(Y-是，N-否；是时不录入子表)",index=5) + @ApiModelProperty("全部气源地可用(Y-是，N-否；是时不录入子表)") + private String allStaSign; + + /** + * 备注 + */ + @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 new file mode 100644 index 0000000..c776918 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java @@ -0,0 +1,134 @@ +package com.xjrsoft.module.contract.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_sales_lng_qty",name="国内LNG销售合同") +public class UpdateLngContractSalesLngQtyDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 开始日期 + */ + @LogField(name="开始日期",index=2) + @ApiModelProperty("开始日期") + private LocalDateTime dateFrom; + + /** + * 结束日期 + */ + @LogField(name="结束日期",index=3) + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @LogField(name="基础量/增量(基础量/增量1/增量2)",index=4) + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + + /** + * 优先级(必须录入) + */ + @LogField(name="优先级(必须录入)",index=5) + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + + /** + * 比值(吨/吉焦) + */ + @LogField(name="比值(吨/吉焦)",index=6) + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + + /** + * 总合同量(吉焦) + */ + @LogField(name="总合同量(吉焦)",index=7) + @ApiModelProperty("总合同量(吉焦)") + private BigDecimal qtyGjMonth; + + /** + * 总合同量(吨) + */ + @LogField(name="总合同量(吨)",index=8) + @ApiModelProperty("总合同量(吨)") + private BigDecimal qtyTonMonth; + + /** + * 日合同量(吉焦)(根据天数自动计算) + */ + @LogField(name="日合同量(吉焦)(根据天数自动计算)",index=9) + @ApiModelProperty("日合同量(吉焦)(根据天数自动计算)") + private BigDecimal qtyGjDay; + + /** + * 日合同量(吨)(根据天数自动计算) + */ + @LogField(name="日合同量(吨)(根据天数自动计算)",index=10) + @ApiModelProperty("日合同量(吨)(根据天数自动计算)") + private BigDecimal qtyTonDay; + + /** + * 照付不议类型(P-比例/TON-吨/GJ-吉焦) + */ + @LogField(name="照付不议类型(P-比例/TON-吨/GJ-吉焦)",index=11) + @ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)") + private String zfbyTypeCode; + + /** + * 照付不议比例%/量数值 + */ + @LogField(name="照付不议比例%/量数值",index=12) + @ApiModelProperty("照付不议比例%/量数值") + private BigDecimal zfbyValue; + + /** + * 备注 + */ + @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 new file mode 100644 index 0000000..92aba0f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngStaDto.java @@ -0,0 +1,62 @@ +package com.xjrsoft.module.contract.dto; + +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_sales_lng_sta",name="国内LNG销售合同") +public class UpdateLngContractSalesLngStaDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 气源地(不能重复) + */ + @LogField(name="气源地(不能重复)",index=2) + @ApiModelProperty("气源地(不能重复)") + private String staCode; + + /** + * 备注 + */ + @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/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/LngContractSalesLngDiscVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java new file mode 100644 index 0000000..ba685b7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java @@ -0,0 +1,118 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利) + */ + @ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)") + private String discTypeCode; + + + /** + * 开始日期 + */ + @ApiModelProperty("开始日期") + private LocalDateTime dateFrom; + + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + + /** + * 优惠说明 + */ + @ApiModelProperty("优惠说明") + private String discDesc; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java new file mode 100644 index 0000000..4539b7a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java @@ -0,0 +1,175 @@ +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; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 开始日期 + */ + @ApiModelProperty("开始日期") + private LocalDateTime dateFrom; + + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + @Trans(type = TransType.DIC, id = "2007987645607911425",transToFieldName = "baseIncName") + private String baseInc; + private String baseIncName; + + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + + + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + + + /** + * 总合同量(吉焦) + */ + @ApiModelProperty("总合同量(吉焦)") + private BigDecimal qtyGjMonth; + + + /** + * 总合同量(吨) + */ + @ApiModelProperty("总合同量(吨)") + private BigDecimal qtyTonMonth; + + + /** + * 日合同量(吉焦)(根据天数自动计算) + */ + @ApiModelProperty("日合同量(吉焦)(根据天数自动计算)") + private BigDecimal qtyGjDay; + + + /** + * 日合同量(吨)(根据天数自动计算) + */ + @ApiModelProperty("日合同量(吨)(根据天数自动计算)") + private BigDecimal qtyTonDay; + + + /** + * 照付不议类型(P-比例/TON-吨/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)") + @Trans(type = TransType.DIC, id = "2007988744662360066",transToFieldName = "zfbyTypeName") + private String zfbyTypeCode; + private String zfbyTypeName; + + + /** + * 照付不议比例%/量数值 + */ + @ApiModelProperty("照付不议比例%/量数值") + private BigDecimal zfbyValue; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java new file mode 100644 index 0000000..7495a22 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngStaVo.java @@ -0,0 +1,103 @@ +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; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class LngContractSalesLngStaVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 气源地(不能重复) + */ + @ApiModelProperty("气源地(不能重复)") + @Trans(type = TransType.LNG_STATION,transToFieldName = "staName") + private String staCode; + + private String staName; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java new file mode 100644 index 0000000..ed2ff70 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java @@ -0,0 +1,129 @@ +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; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +public class LngContractSalesLngVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 定价机制(固定价/公式价/对标价/无) + */ + @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; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java new file mode 100644 index 0000000..50e8257 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java @@ -0,0 +1,269 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.LogAttrField; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") + private Long comId; + + private String comName; + + + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + + + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + private String cpCode; + + + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + + + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + private String kPeriod; + + + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + + /** + * 币种 + */ + @ApiModelProperty("币种") + @Trans(type = TransType.CURRENCY, transToFieldName = "curName") + private String curCode; + private String curName; + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + @Trans(type = TransType.USER, transToFieldName = "empName") + private Long empId; + private String empName; + + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") + private Long bDeptId; + private String bDeptName; + + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + private String transName; + + + /** + * lngContractSalesLng + */ + @ApiModelProperty("lngContractSalesLng子表") + private List lngContractSalesLngList; + /** + * lngContractSalesLngSta + */ + @ApiModelProperty("lngContractSalesLngSta子表") + private List lngContractSalesLngStaList; + /** + * lngContractSalesLngQty + */ + @ApiModelProperty("lngContractSalesLngQty子表") + private List lngContractSalesLngQtyList; + + /** + * lngContractSalesLngQty + */ + @ApiModelProperty("lngContractSalesLngDisc子表") + private List lngContractSalesLngDiscList; + /** + * + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + private List lngContractFactRelList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java index bd39f76..2c2c2e5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java @@ -51,7 +51,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/contract" + "/contractPurPng") +@RequestMapping("/contract/contractPurPng") @Api(value = "/contract" + "/contractPurPng",tags = "国内管道气采购代码") @AllArgsConstructor public class ContractPurPngController { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java new file mode 100644 index 0000000..a624e0d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java @@ -0,0 +1,167 @@ +package com.xjrsoft.module.contract.controller; + +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.module.contract.dto.LngContractPageDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractSalesDto; +import com.xjrsoft.module.contract.service.IContractSalesLngService; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/contract/contractSalesLng") +@Api(value = "/contract" + "/contractSalesLng",tags = "国内Lng销售代码") +@AllArgsConstructor +public class ContractSalesLngController { + + + private final IContractSalesLngService contractSalesLngService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngContract列表(分页)") + @SaCheckPermission("contractSalesLng:list") + public R page(@Valid LngContractPageDto dto){ + //return R.ok(contractSalesLngService.queryPage(dto)); + return null; + + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngContract信息") + // @SaCheckPermission("contractSalesLng:detail") + public R info(@RequestParam Long id){ + return R.ok(contractSalesLngService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngContract数据详细日志") + @SaCheckPermission("contractSalesLng:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngContractPurDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngContract") + @SaCheckPermission("contractSalesLng:add") + public R add(@Valid @RequestBody UpdateLngContractSalesDto dto){ + + UpdateLngContractSalesDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractSalesDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractSalesDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + + return R.ok(res); + } + + @PutMapping + @ApiOperation(value = "修改LngContract") + @SaCheckPermission("contractSalesLng:edit") + public R update(@Valid @RequestBody UpdateLngContractSalesDto dto){ + //return R.ok(dataService.updateById(dto)); + boolean res = dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngContractSalesDto before(DataOperationContent content) { + + return content.getObj(); + } + + @Override + public UpdateLngContractSalesDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + }); + return R.ok(res); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("contractSalesLng:delete") + public R delete(@Valid @RequestBody List ids){ + + boolean res = dataService.deleteByIds(UpdateLngContractPurDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngContractPurDto before(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + + @Override + public UpdateLngContractPurDto after(DataOperationContent content) { + return null; + } + }); + return R.ok(res); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + } + + + 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 new file mode 100644 index 0000000..8159326 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSales.java @@ -0,0 +1,297 @@ +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.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.yulichang.annotation.EntityMapping; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.ValueDirectionType; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract") +@ApiModel(value = "国内LNG销售对象", description = "国内LNG销售") +public class LngContractSales implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + private String cpCode; + + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + private String kPeriod; + + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateSign; + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateCfmFrom; + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateCfmTo; + + /** + * 币种 + */ + @ApiModelProperty("币种") + private String curCode; + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long empId; + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long bDeptId; + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 备注 + */ + @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; + + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractSalesLng子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractSalesLng.class, type = JoinType.MANY) + + private List lngContractSalesLngList; + /** + * lngContractSalesLngSta + */ + @ApiModelProperty("lngContractSalesLngSta子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同气源地关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractSalesLngSta.class, type = JoinType.MANY) + + private List lngContractSalesLngStaList; + + /** + * lngContractSalesLngDisc + */ + @ApiModelProperty("lngContractSalesLngDisc子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同返优惠关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractSalesLngDisc.class, type = JoinType.MANY) + + private List lngContractSalesLngDiscList; + /** + * LngContractSalesLngQty + */ + @ApiModelProperty("LngContractSalesLngQty子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同数量关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractSalesLngQty.class, type = JoinType.MANY) + + private List lngContractSalesLngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "tableId") + @LogJoin(name = "合同审批要素关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractApproRel.class, type = JoinType.MANY) + + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同要素关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractFactRel.class, type = JoinType.MANY) + + private List lngContractFactRelList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java new file mode 100644 index 0000000..33e3f9b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java @@ -0,0 +1,130 @@ +package com.xjrsoft.module.contract.entity; + +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.github.yulichang.annotation.EntityMapping; +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; + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_sales_lng") +@ApiModel(value = "国内LNG销售合同对象", description = "国内LNG销售合同") +public class LngContractSalesLng implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 定价机制(固定价/公式价/对标价/无) + */ + @ApiModelProperty("定价机制(固定价/公式价/对标价/无)") + private String prcTypeCode; + + /** + * 量价周期(1-自然月，-1-自然月往前1日) + */ + @ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)") + private String periodTypeCode; + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 全部气源地可用(Y-是，N-否；是时不录入子表) + */ + @ApiModelProperty("全部气源地可用(Y-是，N-否；是时不录入子表)") + private String allStaSign; + + /** + * 备注 + */ + @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/LngContractSalesLngDisc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngDisc.java new file mode 100644 index 0000000..960952a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngDisc.java @@ -0,0 +1,128 @@ +package com.xjrsoft.module.contract.entity; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_sales_lng_disc") +@ApiModel(value = "国内LNG销售合同对象", description = "国内LNG销售合同") +public class LngContractSalesLngDisc implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利) + */ + @ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)") + private String discTypeCode; + + /** + * 开始日期 + */ + @ApiModelProperty("开始日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 优惠说明 + */ + @ApiModelProperty("优惠说明") + private String discDesc; + + /** + * 备注 + */ + @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/LngContractSalesLngQty.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngQty.java new file mode 100644 index 0000000..ca368e0 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngQty.java @@ -0,0 +1,181 @@ +package com.xjrsoft.module.contract.entity; + +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.github.yulichang.annotation.EntityMapping; +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; + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_sales_lng_qty") +@ApiModel(value = "国内LNG销售合同对象", description = "国内LNG销售合同") +public class LngContractSalesLngQty implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 开始日期 + */ + @ApiModelProperty("开始日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer sort; + + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateTonGj; + + /** + * 总合同量(吉焦) + */ + @ApiModelProperty("总合同量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGjMonth; + + /** + * 总合同量(吨) + */ + @ApiModelProperty("总合同量(吨)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTonMonth; + + /** + * 日合同量(吉焦)(根据天数自动计算) + */ + @ApiModelProperty("日合同量(吉焦)(根据天数自动计算)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGjDay; + + /** + * 日合同量(吨)(根据天数自动计算) + */ + @ApiModelProperty("日合同量(吨)(根据天数自动计算)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTonDay; + + /** + * 照付不议类型(P-比例/TON-吨/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/TON-吨/GJ-吉焦)") + private String zfbyTypeCode; + + /** + * 照付不议比例%/量数值 + */ + @ApiModelProperty("照付不议比例%/量数值") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal zfbyValue; + + /** + * 备注 + */ + @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/LngContractSalesLngSta.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngSta.java new file mode 100644 index 0000000..516fa4a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngSta.java @@ -0,0 +1,112 @@ +package com.xjrsoft.module.contract.entity; + +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.github.yulichang.annotation.EntityMapping; +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; + + +/** +* @title: 国内LNG销售合同 +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_sales_lng_sta") +@ApiModel(value = "国内LNG销售合同对象", description = "国内LNG销售合同") +public class LngContractSalesLngSta implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 气源地(不能重复) + */ + @ApiModelProperty("气源地(不能重复)") + private String staCode; + + /** + * 备注 + */ + @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/LngContractSalesLngDiscMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngDiscMapper.java new file mode 100644 index 0000000..6e08fcd --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngDiscMapper.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.LngContractSalesLngDisc; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Mapper +public interface LngContractSalesLngDiscMapper extends MPJBaseMapper ,BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngMapper.java new file mode 100644 index 0000000..a07aef5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngMapper.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.LngContractSalesLng; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Mapper +public interface LngContractSalesLngMapper extends MPJBaseMapper ,BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngQtyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngQtyMapper.java new file mode 100644 index 0000000..16efe72 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngQtyMapper.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.LngContractSalesLngQty; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Mapper +public interface LngContractSalesLngQtyMapper extends MPJBaseMapper,BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngStaMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngStaMapper.java new file mode 100644 index 0000000..86b9d40 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesLngStaMapper.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.LngContractSalesLngSta; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Mapper +public interface LngContractSalesLngStaMapper extends MPJBaseMapper,BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesMapper.java new file mode 100644 index 0000000..3a205fc --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesMapper.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.contract.mapper; + +import org.apache.ibatis.annotations.Mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContractSales; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractSalesMapper extends MPJBaseMapper, BaseMapper { + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractSalesLngService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractSalesLngService.java new file mode 100644 index 0000000..d837350 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractSalesLngService.java @@ -0,0 +1,20 @@ +package com.xjrsoft.module.contract.service; + +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.contract.entity.LngContractSales; +import com.xjrsoft.module.contract.vo.LngContractSalesVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ + +public interface IContractSalesLngService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngContractSalesVo getInfoById(Long id); + +} 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 new file mode 100644 index 0000000..b3e35a6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java @@ -0,0 +1,96 @@ +package com.xjrsoft.module.contract.service.impl; + +import java.util.List; + +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.contract.entity.LngContractFact; +import com.xjrsoft.module.contract.entity.LngContractSales; +import com.xjrsoft.module.contract.mapper.LngContractFactMapper; +import com.xjrsoft.module.contract.mapper.LngContractSalesMapper; +import com.xjrsoft.module.contract.service.IContractSalesLngService; +import com.xjrsoft.module.contract.vo.LngContractApproRelVo; +import com.xjrsoft.module.contract.vo.LngContractFactRelVo; +import com.xjrsoft.module.contract.vo.LngContractSalesVo; +import com.xjrsoft.module.sales.entity.LngAppro; +import com.xjrsoft.module.sales.mapper.LngApproMapper; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-01-29 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl implements IContractSalesLngService { + private final LngContractSalesMapper lngcontractSalesMapper; + + private final IFileClient fileClient; + + private final LngContractFactMapper lngContractFactMapper; + + private final LngApproMapper lngApproMapper; + + + @Override + public LngContractSalesVo getInfoById(Long id) { + LngContractSales lngContractSales = this.getByIdDeep(id); + if(lngContractSales == null) { + return null; + } + + LngContractSalesVo vo = BeanUtil.toBean(lngContractSales, LngContractSalesVo.class); + List lngContractFactRelList = vo.getLngContractFactRelList(); + if (CollectionUtils.isNotEmpty(lngContractFactRelList)) { + lngContractFactRelList.forEach(x -> { + LngContractFact lngContractFact = lngContractFactMapper.selectById(x.getKFactId()); + if(lngContractFact != null) { + x.setComId(lngContractFact.getComId()); + x.setKName(lngContractFact.getKName()); + x.setKNo(lngContractFact.getKNo()); + x.setEmpId(lngContractFact.getEmpId()); + x.setTel(lngContractFact.getTel()); + x.setKTypeCode1(lngContractFact.getKTypeCode1()); + x.setRelTypeCode(lngContractFact.getRelTypeCode()); + List fileList = fileClient.getTableFiles("lng_contract_fact", + "lngFileUploadList", lngContractFact.getId()); + x.setLngFileUploadList(fileList); + } + + }); + + } + List lngContractApproRelList = vo.getLngContractApproRelList(); + if (CollectionUtils.isNotEmpty(lngContractApproRelList)) { + lngContractApproRelList.forEach(x -> { + LngAppro appro = lngApproMapper.selectById(x.getApproId()); + if(appro != null) { + List fileList = fileClient.getTableFiles("lng_appro", + "lngFileUploadList", appro.getId()); + x.setLngFileUploadList(fileList); + x.setBDeptId(appro.getBDeptId()); + x.setCode(appro.getCode()); + x.setTypeCode(x.getTypeCode()); + x.setEmpId(x.getEmpId()); + x.setDateAppro(appro.getDateAppro()); + x.setTitle(appro.getTitle()); + } + }); + } + + List fileList = fileClient.getTableFiles("lng_contract", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java index ffe2df3..07fc0a8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java @@ -109,7 +109,7 @@ public class DemandServiceImpl extends MPJBaseServiceImpl dtoList = Lists.newArrayList(); for(Long id:ids) { - LngPngDemand lngPngDemand = this.getById(id); + LngPngDemandVo lngPngDemand = this.getInfoById(id); if (lngPngDemand == null) { throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); } @@ -122,7 +122,7 @@ public class DemandServiceImpl extends MPJBaseServiceImpl approList = approMapper.selectList(queryApproWrapper); List approIds = approList.stream().map(LngPngAppro::getId).collect(Collectors.toList()); - dataService.insertBatch(dtoList,new DataOperationListener() { + dataService.updateBatch(dtoList,new DataOperationListener() { @Override public UpdateLngPngDemandDto before(DataOperationContent content) {