diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java new file mode 100644 index 0000000..6e194fe --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.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 AddLngContractDto 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/AddLngContractFactRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java new file mode 100644 index 0000000..179ad52 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java @@ -0,0 +1,46 @@ +package com.xjrsoft.module.contract.dto; + +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 AddLngContractFactRelDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键(关联时写入) + */ + @ApiModelProperty("合同-档案主键(关联时写入)") + private Long kId; + /** + * 合同-合同系统主键(关联时写入) + */ + @ApiModelProperty("合同-合同系统主键(关联时写入)") + private Long kFactId; + /** + * 显示顺序 + */ + @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/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/LngContractPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java new file mode 100644 index 0000000..4b421d5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java @@ -0,0 +1,82 @@ +package com.xjrsoft.module.contract.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngContractPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateTo; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java new file mode 100644 index 0000000..6f22d10 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java @@ -0,0 +1,237 @@ +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.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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract",name="国内管道气采购") +public class UpdateLngContractDto 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="业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)",index=4) + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @LogField(name="是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)",index=5) + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @LogField(name="交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)",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 = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY) + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @LogJoin(name = "lngContractPurPngPoint子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY) + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + @LogJoin(name = "lngContractPurPngQty子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY) + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + @LogJoin(name = "lngContractApproRel子表", + columns = { + @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY) + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + @LogJoin(name = "lngContractFactRel子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractFactRelDto.class, type = JoinType.MANY) + private List lngContractFactRelList; +} 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 new file mode 100644 index 0000000..f01784c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java @@ -0,0 +1,72 @@ +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_fact_rel",name="国内管道气采购") +public class UpdateLngContractFactRelDto 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 kFactId; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=3) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 租户id + */ + @LogField(name="租户id",index=4) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/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..236291d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java @@ -0,0 +1,79 @@ +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; + + +} 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 new file mode 100644 index 0000000..7642052 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java @@ -0,0 +1,97 @@ +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 LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键(关联时写入) + */ + @ApiModelProperty("合同-档案主键(关联时写入)") + private Long kId; + + + /** + * 合同-合同系统主键(关联时写入) + */ + @ApiModelProperty("合同-合同系统主键(关联时写入)") + private Long kFactId; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 创建人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/LngContractPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java new file mode 100644 index 0000000..b762777 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java @@ -0,0 +1,78 @@ +package com.xjrsoft.module.contract.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPageVo { + + /** + * 主键 + */ + @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/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..5818817 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java @@ -0,0 +1,104 @@ +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 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; + + + + + +} 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/LngContractVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java new file mode 100644 index 0000000..9aeb1e1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java @@ -0,0 +1,242 @@ +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 LngContractVo 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; + +} 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..abd43ab --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java @@ -0,0 +1,120 @@ +package com.xjrsoft.module.contract.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.contract.dto.AddLngContractDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.contract.dto.LngContractPageDto; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.service.IContractPurPngService; +import com.xjrsoft.module.contract.vo.LngContractPageVo; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.contract.vo.LngContractVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @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()),LngContract::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getKNo()),LngContract::getKNo,dto.getKNo()) + .like(StrUtil.isNotBlank(dto.getKName()),LngContract::getKName,dto.getKName()) + .like(StrUtil.isNotBlank(dto.getCpName()),LngContract::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()),LngContract::getApproCode,dto.getApproCode()) + .like(StrUtil.isNotBlank(dto.getCpTableName()),LngContract::getCpTableName,dto.getCpTableName()) + .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngContract::getOnlineSign,dto.getOnlineSign()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngContract::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getNote()),LngContract::getNote,dto.getNote()) + .orderByDesc(LngContract::getId) + .select(LngContract.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPageVo.class).contains(x.getProperty())); + IPage page = contractPurPngService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngContract信息") + @SaCheckPermission("contractPurPng:detail") + public R info(@RequestParam Long id){ + LngContract lngContract = contractPurPngService.getByIdDeep(id); + if (lngContract == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngContract, LngContractVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngContract数据详细日志") + @SaCheckPermission("contractPurPng:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngContractDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngContract") + @SaCheckPermission("contractPurPng:add") + public R add(@Valid @RequestBody UpdateLngContractDto dto){ + UpdateLngContractDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngContract") + @SaCheckPermission("contractPurPng:edit") + public R update(@Valid @RequestBody UpdateLngContractDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("contractPurPng:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngContractDto.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/LngContract.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java new file mode 100644 index 0000000..8bd5174 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java @@ -0,0 +1,340 @@ +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") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContract 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") + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "tableId") + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + 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/LngContractFactRel.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java new file mode 100644 index 0000000..ccd224b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java @@ -0,0 +1,147 @@ +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_fact_rel") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractFactRel 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 kFactId; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 创建人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/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..d1036f7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java @@ -0,0 +1,154 @@ +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_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; + + + +} \ 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 new file mode 100644 index 0000000..dc303d3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.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.LngContractFactRel; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractFactRelMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java new file mode 100644 index 0000000..f07d334 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.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.LngContract; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractMapper extends MPJBaseMapper { + +} 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..fbcf416 --- /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 { + +} 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..aeb7788 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.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.LngContractPurPngPoint; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngPointMapper extends MPJBaseMapper { + +} 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..54cc961 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.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.LngContractPurPngQty; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngQtyMapper extends MPJBaseMapper { + +} 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..80ed4f9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java @@ -0,0 +1,42 @@ +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.LngContract; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ + +public interface IContractPurPngService extends MPJBaseService, MPJDeepService, MPJRelationService { + /** + * 新增 + * + * @param lngContract + * @return + */ + Boolean add(LngContract lngContract); + + /** + * 更新 + * + * @param lngContract + * @return + */ + Boolean update(LngContract lngContract); + + /** + * 删除 + * + * @param ids + * @return + */ + Boolean delete(List ids); +} 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..173af26 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java @@ -0,0 +1,238 @@ +package com.xjrsoft.module.contract.service.impl; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.entity.LngContractApproRel; +import com.xjrsoft.module.contract.entity.LngContractFactRel; +import com.xjrsoft.module.contract.entity.LngContractPurPng; +import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; +import com.xjrsoft.module.contract.mapper.LngContractApproRelMapper; +import com.xjrsoft.module.contract.mapper.LngContractFactRelMapper; +import com.xjrsoft.module.contract.mapper.LngContractMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngPointMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngQtyMapper; +import com.xjrsoft.module.contract.service.IContractPurPngService; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ContractPurPngServiceImpl extends MPJBaseServiceImpl implements IContractPurPngService { + private final LngContractMapper contractPurPngLngContractMapper; + + private final LngContractPurPngMapper contractPurPngLngContractPurPngMapper; + private final LngContractPurPngPointMapper contractPurPngLngContractPurPngPointMapper; + private final LngContractPurPngQtyMapper contractPurPngLngContractPurPngQtyMapper; + private final LngContractApproRelMapper contractPurPngLngContractApproRelMapper; + private final LngContractFactRelMapper contractPurPngLngContractFactRelMapper; + + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean add(LngContract lngContract) { + contractPurPngLngContractMapper.insert(lngContract); + for (LngContractPurPng lngContractPurPng : lngContract.getLngContractPurPngList()) { + lngContractPurPng.setKId(lngContract.getId()); + contractPurPngLngContractPurPngMapper.insert(lngContractPurPng); + } + for (LngContractPurPngPoint lngContractPurPngPoint : lngContract.getLngContractPurPngPointList()) { + lngContractPurPngPoint.setKId(lngContract.getId()); + contractPurPngLngContractPurPngPointMapper.insert(lngContractPurPngPoint); + } + for (LngContractPurPngQty lngContractPurPngQty : lngContract.getLngContractPurPngQtyList()) { + lngContractPurPngQty.setKId(lngContract.getId()); + contractPurPngLngContractPurPngQtyMapper.insert(lngContractPurPngQty); + } + for (LngContractApproRel lngContractApproRel : lngContract.getLngContractApproRelList()) { + lngContractApproRel.setTableId(lngContract.getId()); + contractPurPngLngContractApproRelMapper.insert(lngContractApproRel); + } + for (LngContractFactRel lngContractFactRel : lngContract.getLngContractFactRelList()) { + lngContractFactRel.setKId(lngContract.getId()); + contractPurPngLngContractFactRelMapper.insert(lngContractFactRel); + } + + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean update(LngContract lngContract) { + contractPurPngLngContractMapper.updateById(lngContract); + //********************************* LngContractPurPng 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractPurPngList = contractPurPngLngContractPurPngMapper.selectList(Wrappers.lambdaQuery(LngContractPurPng.class).eq(LngContractPurPng::getKId, lngContract.getId()).select(LngContractPurPng::getId)); + List lngContractPurPngIds = lngContractPurPngList.stream().map(LngContractPurPng::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractPurPngOldIds = lngContract.getLngContractPurPngList().stream().map(LngContractPurPng::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractPurPngRemoveIds = lngContractPurPngIds.stream().filter(item -> !lngContractPurPngOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractPurPng lngContractPurPng : lngContract.getLngContractPurPngList()) { + //如果不等于空则修改 + if (lngContractPurPng.getId() != null) { + contractPurPngLngContractPurPngMapper.updateById(lngContractPurPng); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractPurPng.setKId(lngContract.getId()); + contractPurPngLngContractPurPngMapper.insert(lngContractPurPng); + } + } + //已经不存在的id 删除 + if(lngContractPurPngRemoveIds.size() > 0){ + contractPurPngLngContractPurPngMapper.deleteBatchIds(lngContractPurPngRemoveIds); + } + } + //********************************* LngContractPurPng 增删改 结束 *******************************************/ + + //********************************* LngContractPurPngPoint 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractPurPngPointList = contractPurPngLngContractPurPngPointMapper.selectList(Wrappers.lambdaQuery(LngContractPurPngPoint.class).eq(LngContractPurPngPoint::getKId, lngContract.getId()).select(LngContractPurPngPoint::getId)); + List lngContractPurPngPointIds = lngContractPurPngPointList.stream().map(LngContractPurPngPoint::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractPurPngPointOldIds = lngContract.getLngContractPurPngPointList().stream().map(LngContractPurPngPoint::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractPurPngPointRemoveIds = lngContractPurPngPointIds.stream().filter(item -> !lngContractPurPngPointOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractPurPngPoint lngContractPurPngPoint : lngContract.getLngContractPurPngPointList()) { + //如果不等于空则修改 + if (lngContractPurPngPoint.getId() != null) { + contractPurPngLngContractPurPngPointMapper.updateById(lngContractPurPngPoint); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractPurPngPoint.setKId(lngContract.getId()); + contractPurPngLngContractPurPngPointMapper.insert(lngContractPurPngPoint); + } + } + //已经不存在的id 删除 + if(lngContractPurPngPointRemoveIds.size() > 0){ + contractPurPngLngContractPurPngPointMapper.deleteBatchIds(lngContractPurPngPointRemoveIds); + } + } + //********************************* LngContractPurPngPoint 增删改 结束 *******************************************/ + + //********************************* LngContractPurPngQty 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractPurPngQtyList = contractPurPngLngContractPurPngQtyMapper.selectList(Wrappers.lambdaQuery(LngContractPurPngQty.class).eq(LngContractPurPngQty::getKId, lngContract.getId()).select(LngContractPurPngQty::getId)); + List lngContractPurPngQtyIds = lngContractPurPngQtyList.stream().map(LngContractPurPngQty::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractPurPngQtyOldIds = lngContract.getLngContractPurPngQtyList().stream().map(LngContractPurPngQty::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractPurPngQtyRemoveIds = lngContractPurPngQtyIds.stream().filter(item -> !lngContractPurPngQtyOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractPurPngQty lngContractPurPngQty : lngContract.getLngContractPurPngQtyList()) { + //如果不等于空则修改 + if (lngContractPurPngQty.getId() != null) { + contractPurPngLngContractPurPngQtyMapper.updateById(lngContractPurPngQty); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractPurPngQty.setKId(lngContract.getId()); + contractPurPngLngContractPurPngQtyMapper.insert(lngContractPurPngQty); + } + } + //已经不存在的id 删除 + if(lngContractPurPngQtyRemoveIds.size() > 0){ + contractPurPngLngContractPurPngQtyMapper.deleteBatchIds(lngContractPurPngQtyRemoveIds); + } + } + //********************************* LngContractPurPngQty 增删改 结束 *******************************************/ + + //********************************* LngContractApproRel 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractApproRelList = contractPurPngLngContractApproRelMapper.selectList(Wrappers.lambdaQuery(LngContractApproRel.class).eq(LngContractApproRel::getTableId, lngContract.getId()).select(LngContractApproRel::getId)); + List lngContractApproRelIds = lngContractApproRelList.stream().map(LngContractApproRel::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractApproRelOldIds = lngContract.getLngContractApproRelList().stream().map(LngContractApproRel::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractApproRelRemoveIds = lngContractApproRelIds.stream().filter(item -> !lngContractApproRelOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractApproRel lngContractApproRel : lngContract.getLngContractApproRelList()) { + //如果不等于空则修改 + if (lngContractApproRel.getId() != null) { + contractPurPngLngContractApproRelMapper.updateById(lngContractApproRel); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractApproRel.setTableId(lngContract.getId()); + contractPurPngLngContractApproRelMapper.insert(lngContractApproRel); + } + } + //已经不存在的id 删除 + if(lngContractApproRelRemoveIds.size() > 0){ + contractPurPngLngContractApproRelMapper.deleteBatchIds(lngContractApproRelRemoveIds); + } + } + //********************************* LngContractApproRel 增删改 结束 *******************************************/ + + //********************************* LngContractFactRel 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractFactRelList = contractPurPngLngContractFactRelMapper.selectList(Wrappers.lambdaQuery(LngContractFactRel.class).eq(LngContractFactRel::getKId, lngContract.getId()).select(LngContractFactRel::getId)); + List lngContractFactRelIds = lngContractFactRelList.stream().map(LngContractFactRel::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractFactRelOldIds = lngContract.getLngContractFactRelList().stream().map(LngContractFactRel::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractFactRelRemoveIds = lngContractFactRelIds.stream().filter(item -> !lngContractFactRelOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractFactRel lngContractFactRel : lngContract.getLngContractFactRelList()) { + //如果不等于空则修改 + if (lngContractFactRel.getId() != null) { + contractPurPngLngContractFactRelMapper.updateById(lngContractFactRel); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractFactRel.setKId(lngContract.getId()); + contractPurPngLngContractFactRelMapper.insert(lngContractFactRel); + } + } + //已经不存在的id 删除 + if(lngContractFactRelRemoveIds.size() > 0){ + contractPurPngLngContractFactRelMapper.deleteBatchIds(lngContractFactRelRemoveIds); + } + } + //********************************* LngContractFactRel 增删改 结束 *******************************************/ + + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(List ids) { + contractPurPngLngContractMapper.deleteBatchIds(ids); + contractPurPngLngContractPurPngMapper.delete(Wrappers.lambdaQuery(LngContractPurPng.class).in(LngContractPurPng::getKId, ids)); + contractPurPngLngContractPurPngPointMapper.delete(Wrappers.lambdaQuery(LngContractPurPngPoint.class).in(LngContractPurPngPoint::getKId, ids)); + contractPurPngLngContractPurPngQtyMapper.delete(Wrappers.lambdaQuery(LngContractPurPngQty.class).in(LngContractPurPngQty::getKId, ids)); + contractPurPngLngContractApproRelMapper.delete(Wrappers.lambdaQuery(LngContractApproRel.class).in(LngContractApproRel::getTableId, ids)); + contractPurPngLngContractFactRelMapper.delete(Wrappers.lambdaQuery(LngContractFactRel.class).in(LngContractFactRel::getKId, ids)); + + return true; + } +}