diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java index 17edad4..31634d9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.dto; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -11,15 +12,12 @@ import lombok.experimental.Accessors; /** -* @title: 国内管道气销售 +* @title: 国内管道气 * @Author 管理员 * @Date: 2025-12-30 * @Version 1.0 */ -@Getter -@Setter -@ToString -@Accessors(chain = true) +@Data public class AddLngContractFactRelDto extends com.xjrsoft.common.model.base.BaseModel { private static final long serialVersionUID = 1L; @@ -39,6 +37,10 @@ public class AddLngContractFactRelDto extends com.xjrsoft.common.model.base.Base */ @ApiModelProperty("显示顺序") private Short sort; - + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurDto.java new file mode 100644 index 0000000..39bdcb0 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurDto.java @@ -0,0 +1,157 @@ +package com.xjrsoft.module.contract.dto; + +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + 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("合同签订日期") + private LocalDateTime dateSign; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + /** + * 币种 + */ + @ApiModelProperty("币种") + private String curCode; + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + private Long empId; + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + private Long bDeptId; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + private List lngContractFactRelList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java new file mode 100644 index 0000000..a663412 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java @@ -0,0 +1,52 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurPngDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + private Long kId; + /** + * + */ + @ApiModelProperty("") + private String prcTypeCode; + /** + * + */ + @ApiModelProperty("") + private String periodTypeCode; + /** + * + */ + @ApiModelProperty("") + private String uomCode; + /** + * + */ + @ApiModelProperty("") + private String note; + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java new file mode 100644 index 0000000..c41c5bd --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java @@ -0,0 +1,47 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurPngPointDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + /** + * 备注 + */ + @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/AddLngContractPurPngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngQtyDto.java new file mode 100644 index 0000000..fb32dda --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngQtyDto.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: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurPngQtyDto 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; + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + private BigDecimal qtyGjMonth; + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + private BigDecimal qtyM3Month; + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + private BigDecimal qtyGjDay; + /** + * 日气量(方)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + private BigDecimal qtyM3Day; + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/M3-方/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/UpdateLngContractFactRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java index d14f6da..a693a0c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java @@ -1,34 +1,23 @@ package com.xjrsoft.module.contract.dto; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; 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 com.fasterxml.jackson.annotation.JsonFormat; -import java.util.List; - -import com.pictc.annotations.datalog.LogTable; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogJoin; -import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; -import com.pictc.annotations.datalog.ValueDirectionType; - /** -* @title: 国内管道气销售 +* @title: 国内管道气采购/销售 * @Author 管理员 * @Date: 2025-12-30 * @Version 1.0 */ @Data -@LogTable(source="lng_contract_fact_rel",name="国内管道气销售") +@LogTable(source="lng_contract_fact_rel",name="国内管道气采购/销售") public class UpdateLngContractFactRelDto implements Serializable { private static final long serialVersionUID = 1L; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java new file mode 100644 index 0000000..4c6e8be --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.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 UpdateLngContractPurDto 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/UpdateLngContractPurPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java new file mode 100644 index 0000000..549085e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java @@ -0,0 +1,86 @@ +package com.xjrsoft.module.contract.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png",name="国内管道气采购") +public class UpdateLngContractPurPngDto 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; + + /** + * + */ + @LogField(name="",index=3) + @ApiModelProperty("") + private String periodTypeCode; + + /** + * + */ + @LogField(name="",index=4) + @ApiModelProperty("") + private String uomCode; + + /** + * + */ + @LogField(name="",index=5) + @ApiModelProperty("") + private String note; + + /** + * + */ + @LogField(name="",index=6) + @ApiModelProperty("") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java new file mode 100644 index 0000000..162f15f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java @@ -0,0 +1,91 @@ +package com.xjrsoft.module.contract.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png_point",name="国内管道气采购") +public class UpdateLngContractPurPngPointDto 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 pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @LogField(name="自主托运(Y-是，N-否)",index=3) + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + /** + * 备注 + */ + @LogField(name="备注",index=4) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=5) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @LogJoin(name = "lngContractPurPngPoint子表", + columns = { + @LogJoinColumn(field = "kpppId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointSalesDto.class, type = JoinType.MANY) + private List lngContractPurPngPointSalesList; + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java new file mode 100644 index 0000000..fb88b44 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java @@ -0,0 +1,94 @@ +package com.xjrsoft.module.contract.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png_point_sales",name="国内管道气采购上载点-交割点") +public class UpdateLngContractPurPngPointSalesDto 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 Long kpppId; + + /** + * 上载点编码 + */ + @LogField(name="上载点编码",index=3) + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @LogField(name="自主托运(Y-是，N-否)",index=4) + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 交割点编码 + */ + @LogField(name="交割点编码",index=5) + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 备注 + */ + @LogField(name="备注",index=6) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=7) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java new file mode 100644 index 0000000..39fb1a1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java @@ -0,0 +1,142 @@ +package com.xjrsoft.module.contract.dto; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png_qty",name="国内管道气采购") +public class UpdateLngContractPurPngQtyDto 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; + + /** + * 优先级(必须录入) + */ + @LogField(name="优先级(必须录入)",index=4) + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @LogField(name="基础量/增量(基础量/增量1/增量2)",index=5) + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=6) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @LogField(name="月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)",index=7) + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + private BigDecimal qtyGjMonth; + + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @LogField(name="月气量(方)(qty_gj_month*1000/rate_m3_gj)",index=8) + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + private BigDecimal qtyM3Month; + + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @LogField(name="日气量(吉焦)(根据当月天数自动计算)",index=9) + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + private BigDecimal qtyGjDay; + + /** + * 日气量(方)(根据当月天数自动计算) + */ + @LogField(name="日气量(方)(根据当月天数自动计算)",index=10) + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + private BigDecimal qtyM3Day; + + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @LogField(name="照付不议类型(P-比例/M3-方/GJ-吉焦)",index=11) + @ApiModelProperty("照付不议类型(P-比例/M3-方/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/vo/LngContractFactRelVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java index 864e677..eddf922 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java @@ -1,10 +1,7 @@ package com.xjrsoft.module.contract.vo; import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; +import lombok.Data; import java.time.LocalDateTime; @@ -14,11 +11,8 @@ import java.time.LocalDateTime; * @Date: 2025-12-30 * @Version 1.0 */ -@Getter -@Setter -@ToString -@Accessors(chain = true) -public class LngContractFactRelVo { +@Data +public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseModel{ /** * 主键 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java new file mode 100644 index 0000000..7eeeece --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java @@ -0,0 +1,73 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java new file mode 100644 index 0000000..3814398 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java @@ -0,0 +1,72 @@ +package com.xjrsoft.module.contract.vo; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngPointSalesVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 备注 + */ + @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/vo/LngContractPurPngPointVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java new file mode 100644 index 0000000..6575350 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java @@ -0,0 +1,109 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngPointVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 备注 + */ + @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; + + + /** + * lngContractPurPngPointSales + */ + @ApiModelProperty("lngContractPurPngPointSales子表") + private List lngContractPurPngPointSalesList; + + +} 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 new file mode 100644 index 0000000..7b57daa --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java @@ -0,0 +1,174 @@ +package com.xjrsoft.module.contract.vo; + +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: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngQtyVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 开始日期(需要校验周期) + */ + @ApiModelProperty("开始日期(需要校验周期)") + private LocalDateTime dateFrom; + + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + private BigDecimal qtyGjMonth; + + + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + private BigDecimal qtyM3Month; + + + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + private BigDecimal qtyGjDay; + + + /** + * 日气量(方)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + private BigDecimal qtyM3Day; + + + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/M3-方/GJ-吉焦)") + private String zfbyTypeCode; + + + /** + * 照付不议比例%/量数值 + */ + @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/LngContractPurPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java new file mode 100644 index 0000000..7518d57 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java @@ -0,0 +1,118 @@ +package com.xjrsoft.module.contract.vo; + +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: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * + */ + @ApiModelProperty("") + private Long id; + + + /** + * + */ + @ApiModelProperty("") + private Long kId; + + + /** + * + */ + @ApiModelProperty("") + private String prcTypeCode; + + + /** + * + */ + @ApiModelProperty("") + private String periodTypeCode; + + + /** + * + */ + @ApiModelProperty("") + private String uomCode; + + + /** + * + */ + @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; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java new file mode 100644 index 0000000..858f499 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java @@ -0,0 +1,253 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.LogAttrField; +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 LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + 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("合同签订日期") + private LocalDateTime dateSign; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + + /** + * 币种 + */ + @ApiModelProperty("币种") + private String curCode; + + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + private Long empId; + + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + private Long bDeptId; + + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @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; + + + + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + private List lngContractPurPngQtyList; + /** + * + * 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-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java index d3a42e0..74afc02 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java @@ -334,4 +334,11 @@ public class UpdateLngCustomerDto implements Serializable { */ @ApiModelProperty("数据权限id") private Long ruleUserId; + + /** + * 是否基础设施使用方 + */ + @LogField(name="是否基础设施使用方",index=31) + @ApiModelProperty("是否基础设施使用方") + private String facSign; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java index b679e92..f301089 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java @@ -76,7 +76,7 @@ public class LngCustomerPageVo { */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") //@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") - @Trans(type = TransType.DIC, id = "1990669393069129729") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java index 698a446..c989e15 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.pictc.annotations.datalog.LogField; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -276,7 +277,12 @@ public class LngCustomerVo { @ApiModelProperty("数据权限id") private Long ruleUserId; - + /** + * 是否基础设施使用方 + */ + @LogField(name="是否基础设施使用方",index=31) + @ApiModelProperty("是否基础设施使用方") + private String facSign; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java index 7033474..eac9d2d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java @@ -59,12 +59,16 @@ public class LngScorePageVo { */ @ApiModelProperty("分数") private BigDecimal score; + /** - * 审批状态(未审批/审批中/已审批/已驳回) - */ - @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729") - private String approCode; + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + private String approCode; + + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approName; /** * 备注 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java index 5351b30..830ae09 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java @@ -59,12 +59,16 @@ public class LngScorePageVo { */ @ApiModelProperty("分数") private BigDecimal score; + /** - * 审批状态(未审批/审批中/已审批/已驳回) - */ - @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729") - private String approCode; + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + private String approCode; + + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approName; /** * 备注 */ 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 new file mode 100644 index 0000000..a6ff724 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java @@ -0,0 +1,144 @@ +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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.contract.dto.LngContractPageDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto; +import com.xjrsoft.module.contract.entity.LngContractPur; +import com.xjrsoft.module.contract.service.IContractPurPngService; +import com.xjrsoft.module.contract.vo.LngContractPurPageVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +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" + "/contractPurPng") +@Api(value = "/contract" + "/contractPurPng",tags = "国内管道气采购代码") +@AllArgsConstructor +public class ContractPurPngController { + + + private final IContractPurPngService contractPurPngService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngContract列表(分页)") + @SaCheckPermission("contractPurPng:list") + public R page(@Valid LngContractPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngContractPur::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getKNo()),LngContractPur::getKNo,dto.getKNo()) + .like(StrUtil.isNotBlank(dto.getKName()),LngContractPur::getKName,dto.getKName()) + .like(StrUtil.isNotBlank(dto.getCpName()),LngContractPur::getCpName,dto.getCpName()) + //.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngContract::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd()) + //.between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngContract::getDateTo,dto.getDateToStart(),dto.getDateToEnd()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngContractPur::getApproCode,dto.getApproCode()) + .like(StrUtil.isNotBlank(dto.getCpTableName()),LngContractPur::getCpTableName,dto.getCpTableName()) + .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngContractPur::getOnlineSign,dto.getOnlineSign()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngContractPur::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getNote()),LngContractPur::getNote,dto.getNote()) + .orderByDesc(LngContractPur::getId) + .select(LngContractPur.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPurPageVo.class).contains(x.getProperty())); + IPage page = contractPurPngService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPurPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngContract信息") + // @SaCheckPermission("contractPurPng:detail") + public R info(@RequestParam Long id){ + return R.ok(contractPurPngService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngContract数据详细日志") + @SaCheckPermission("contractPurPng:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngContractPurDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngContract") + @SaCheckPermission("contractPurPng:add") + public R add(@Valid @RequestBody UpdateLngContractPurDto dto){ + //UpdateLngContractPurDto res = dataService.insert(dto); + UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractPurDto after(DataOperationContent content) { + return null; + } + }); + + return R.ok(res); + } + + @PutMapping + @ApiOperation(value = "修改LngContract") + @SaCheckPermission("contractPurPng:edit") + public R update(@Valid @RequestBody UpdateLngContractPurDto dto){ + //return R.ok(dataService.updateById(dto)); + UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractPurDto after(DataOperationContent content) { + return null; + } + }); + return R.ok(res); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("contractPurPng:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngContractPurDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java index 9bdcb8c..9c82631 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java @@ -10,14 +10,14 @@ import java.time.LocalDateTime; /** -* @title: 国内管道气销售 +* @title: 国内管道气 * @Author 管理员 * @Date: 2025-12-30 * @Version 1.0 */ @Data @TableName("lng_contract_fact_rel") -@ApiModel(value = "国内管道气销售对象", description = "国内管道气销售") +@ApiModel(value = "国内管道气采购/销售对象", description = "国内管道气采购") public class LngContractFactRel implements Serializable { private static final long serialVersionUID = 1L; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java new file mode 100644 index 0000000..7b34632 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java @@ -0,0 +1,287 @@ +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 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; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPur 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("lngContractPurPng子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同上载点关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPng.class, type = JoinType.MANY) + + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同上载点关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPngPoint.class, type = JoinType.MANY) + + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同数量关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPngQty.class, type = JoinType.MANY) + + private List lngContractPurPngQtyList; + /** + * 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/LngContractPurPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java new file mode 100644 index 0000000..1030435 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java @@ -0,0 +1,163 @@ +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: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_pur_png") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPurPng implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * + */ + @ApiModelProperty("") + + + + private String prcTypeCode; + + /** + * + */ + @ApiModelProperty("") + + + + private String periodTypeCode; + + /** + * + */ + @ApiModelProperty("") + + + + private String uomCode; + + /** + * + */ + @ApiModelProperty("") + + + + private String note; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * + */ + @ApiModelProperty("") + + + + @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/LngContractPurPngPoint.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java new file mode 100644 index 0000000..e3d1d06 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java @@ -0,0 +1,156 @@ +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_pur_png_point") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPurPngPoint implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + + + + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + + + + private String transSign; + + /** + * 备注 + */ + @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; + + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPointSales子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kpppId") + @LogJoin(name = "交割点信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kpppId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPngPointSales.class, type = JoinType.MANY) + + private List lngContractPurPngPointSalesList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java new file mode 100644 index 0000000..560fe3c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java @@ -0,0 +1,129 @@ +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 com.pictc.annotations.datalog.LogField; + +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_pur_png_point_sales") +@ApiModel(value = "国内管道气采购-上载点-交割点对象", description = "国内管道气采购-上载点-交割点") +public class LngContractPurPngPointSales implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpppId; + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 备注 + */ + @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/LngContractPurPngQty.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngQty.java new file mode 100644 index 0000000..f3f83ac --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngQty.java @@ -0,0 +1,244 @@ +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: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_pur_png_qty") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPurPngQty implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + 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; + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer sort; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + + + + private String baseInc; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGjMonth; + + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3Month; + + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGjDay; + + /** + * 日气量(方)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3Day; + + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/M3-方/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/mapper/LngContractFactRelMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java index 6fb8add..5f17e9e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractFactRelMapper extends MPJBaseMapper, BaseMapper { +public interface LngContractFactRelMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java new file mode 100644 index 0000000..f961ec9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.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.LngContractPur; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java new file mode 100644 index 0000000..1fb8da7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.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.LngContractPurPng; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngMapper extends MPJBaseMapper , BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java new file mode 100644 index 0000000..b17289a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java @@ -0,0 +1,19 @@ +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.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; + +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngPointMapper extends MPJBaseMapper , BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java new file mode 100644 index 0000000..7a2de11 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java @@ -0,0 +1,20 @@ +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.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; + +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngPointSalesMapper extends MPJBaseMapper , BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java new file mode 100644 index 0000000..0227a34 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java @@ -0,0 +1,18 @@ +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.LngContractPurPngQty; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngQtyMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java new file mode 100644 index 0000000..e33116c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java @@ -0,0 +1,24 @@ +package com.xjrsoft.module.contract.service; + +import com.baomidou.mybatisplus.extension.service.IService; +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.LngContractPur; +import com.xjrsoft.module.contract.vo.LngContractPurVo; + +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ + +public interface IContractPurPngService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngContractPurVo getInfoById(Long id); + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java new file mode 100644 index 0000000..c06fe30 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java @@ -0,0 +1,58 @@ +package com.xjrsoft.module.contract.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.contract.entity.LngContractPur; +import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales; +import com.xjrsoft.module.contract.mapper.LngContractPurMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngPointSalesMapper; +import com.xjrsoft.module.contract.service.IContractPurPngService; +import com.xjrsoft.module.contract.vo.LngContractPurPngPointVo; +import com.xjrsoft.module.contract.vo.LngContractPurVo; +import com.xjrsoft.module.sales.entity.LngCustomer; +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: 2025-12-30 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ContractPurPngServiceImpl extends MPJBaseServiceImpl implements IContractPurPngService { + + private final IFileClient fileClient; + + private final LngContractPurPngPointSalesMapper lngContractPurPngPointSalesMapper; + + @Override + public LngContractPurVo getInfoById(Long id) { + LngContractPur lngContractPur = this.getByIdDeep(id); + if(lngContractPur == null) { + return null; + } + + if(lngContractPur.getLngContractPurPngPointList() != null) { + for(LngContractPurPngPoint pp:lngContractPur.getLngContractPurPngPointList()) { + List list = lngContractPurPngPointSalesMapper.selectList(new LambdaQueryWrapper() + .eq(LngContractPurPngPointSales::getKpppId, pp.getId())); + pp.setLngContractPurPngPointSalesList(list); + } + } + LngContractPurVo vo = BeanUtil.toBean(lngContractPur, LngContractPurVo.class); + + 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/sales/controller/CustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java index 9cff337..b0a4da2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -164,7 +164,18 @@ public class CustomerController { @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(customerService.delete(ids)); + //return R.ok(customerService.delete(ids)); + return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + return null; + } + })); } @@ -172,7 +183,18 @@ public class CustomerController { @ApiOperation(value = "启用LngCustomer") @SaCheckPermission("customer:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids)); + + return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + return null; + } + })); } @@ -180,7 +202,18 @@ public class CustomerController { @ApiOperation(value = "禁用LngCustomer") @SaCheckPermission("customer:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + //return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + return null; + } + })); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java index 46db016..895ef88 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -13,6 +13,7 @@ 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.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.ValueDirectionType; @@ -266,6 +267,11 @@ public class LngCustomer implements Serializable { @TableField(fill = FieldFill.INSERT) private Long ruleUserId; + /** + * 是否基础设施使用方 + */ + @ApiModelProperty(name="是否基础设施使用方") + private String facSign; /** * lngCustomerAttrPower diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java index f615b68..73fb9e4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java @@ -20,7 +20,6 @@ import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; import com.pictc.enums.BusinessCode; import com.pictc.enums.ExceptionCommonCode; -import com.xjrsoft.common.advice.tran.CustomerDataProvider; import com.xjrsoft.common.advice.tran.SupplierDataProvider; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; @@ -161,7 +160,18 @@ public class SupplierController { @ApiOperation(value = "删除") @SaCheckPermission("supplier:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids)); + //return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngSupplierDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngSupplierDto after(DataOperationContent content) { + return null; + } + })); } @@ -169,7 +179,18 @@ public class SupplierController { @ApiOperation(value = "启用LngSupplier") @SaCheckPermission("supplier:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); + //return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); + return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngSupplierDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngSupplierDto after(DataOperationContent content) { + return null; + } + })); } @@ -177,7 +198,18 @@ public class SupplierController { @ApiOperation(value = "禁用LngSupplier") @SaCheckPermission("supplier:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); + //return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); + return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngSupplierDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngSupplierDto after(DataOperationContent content) { + return null; + } + })); }