From 7d2b7cfd75e58fa1767464c6253f30f3f2c5a03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Wed, 11 Feb 2026 17:29:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/AddLngContractProcDto.java | 65 +++++ .../dto/AddLngContractTransPngDto.java | 70 +++++ .../contract/dto/AddLngPriceProcDto.java | 80 ++++++ .../contract/dto/AddLngPriceTransPngDto.java | 75 +++++ .../contract/dto/UpdateLngContractPDto.java | 228 +++++++++++++++ .../dto/UpdateLngContractProcDto.java | 75 +++++ .../contract/dto/UpdateLngContractTPDto.java | 228 +++++++++++++++ .../dto/UpdateLngContractTransPngDto.java | 82 ++++++ .../contract/dto/UpdateLngPriceProcDto.java | 104 +++++++ .../dto/UpdateLngPriceTransPngDto.java | 97 +++++++ .../module/contract/vo/LngContractPVo.java | 266 ++++++++++++++++++ .../module/contract/vo/LngContractProcVo.java | 61 ++++ .../module/contract/vo/LngContractTPVo.java | 266 ++++++++++++++++++ .../contract/vo/LngContractTransPngVo.java | 68 +++++ .../module/contract/vo/LngPriceProcVo.java | 91 ++++++ .../contract/vo/LngPriceTransPngVo.java | 84 ++++++ .../controller/ContractProcController.java | 159 +++++++++++ .../ContractTransPngController.java | 176 ++++++++++++ .../contract/entity/LngContractProc.java | 113 ++++++++ .../contract/entity/LngContractTransPng.java | 119 ++++++++ .../module/contract/entity/LngPriceProc.java | 139 +++++++++ .../contract/entity/LngPriceTransPng.java | 133 +++++++++ .../mapper/LngContractProcMapper.java | 17 ++ .../mapper/LngContractTransPngMapper.java | 17 ++ .../contract/mapper/LngPriceProcMapper.java | 17 ++ .../mapper/LngPriceTransPngMapper.java | 17 ++ .../service/IContractProcService.java | 19 ++ .../service/IContractTransPngService.java | 19 ++ .../service/impl/ContractProcServiceImpl.java | 94 +++++++ .../impl/ContractTransPngServiceImpl.java | 94 +++++++ 30 files changed, 3073 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractTransPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractProcController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractTransPngController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractProc.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractTransPng.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPng.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractProcMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractProcService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractTransPngService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java new file mode 100644 index 0000000..879290c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java @@ -0,0 +1,65 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngContractProcDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键(lng_contract.id) + */ + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 超期存储费说明 + */ + @ApiModelProperty("超期存储费说明") + private String periodDesc; + /** + * 损耗说明 + */ + @ApiModelProperty("损耗说明") + private String wasteDesc; + /** + * 备注 + */ + @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/AddLngContractTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractTransPngDto.java new file mode 100644 index 0000000..fe656c8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractTransPngDto.java @@ -0,0 +1,70 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngContractTransPngDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键(lng_contract.id) + */ + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + /** + * 路径(隐藏) + */ + @ApiModelProperty("路径(隐藏)") + private String routing; + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + /** + * 备注 + */ + @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/AddLngPriceProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java new file mode 100644 index 0000000..a701ac2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java @@ -0,0 +1,80 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + + + + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceProcDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + /** + * 服务商编码(惠州接收站/阳江接收站) + */ + @ApiModelProperty("服务商编码(惠州接收站/阳江接收站)") + private String suCode; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + private LocalDateTime dateToF; + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + /** + * 备注 + */ + @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/AddLngPriceTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java new file mode 100644 index 0000000..06b39c8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java @@ -0,0 +1,75 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + + + + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngPriceTransPngDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + /** + * 托运商编码(管道公司/管网) + */ + @ApiModelProperty("托运商编码(管道公司/管网)") + private String suCode; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + private LocalDateTime dateToF; + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + /** + * 备注 + */ + @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/UpdateLngContractPDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java new file mode 100644 index 0000000..274c91f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPDto.java @@ -0,0 +1,228 @@ +package com.xjrsoft.module.contract.dto; + +import com.pictc.annotations.datalog.*; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract",name="加工合同") +public class UpdateLngContractPDto 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; + + + /** + * lngContractProc + */ + @ApiModelProperty("lngContractProc子表") + @LogJoin(name = "lngContractProc子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractProcDto.class, type = JoinType.MANY) + private List lngContractProcList; + /** + * lngPriceProc + */ + @ApiModelProperty("lngPriceProc子表") + @LogJoin(name = "lngPriceProc子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceProcDto.class, type = JoinType.MANY) + private List lngPriceProcList; + /** + * 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; + /** + * 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; + + /** + * 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/UpdateLngContractProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java new file mode 100644 index 0000000..b327a70 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractProcDto.java @@ -0,0 +1,75 @@ +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; + + + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_proc",name="加工合同") +public class UpdateLngContractProcDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键(lng_contract.id) + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + + /** + * 气源地 + */ + @LogField(name="气源地",index=2) + @ApiModelProperty("气源地") + private String staCode; + + /** + * 超期存储费说明 + */ + @LogField(name="超期存储费说明",index=3) + @ApiModelProperty("超期存储费说明") + private String periodDesc; + + /** + * 损耗说明 + */ + @LogField(name="损耗说明",index=4) + @ApiModelProperty("损耗说明") + private String wasteDesc; + + /** + * 备注 + */ + @LogField(name="备注",index=5) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=6) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java new file mode 100644 index 0000000..25b8e56 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTPDto.java @@ -0,0 +1,228 @@ +package com.xjrsoft.module.contract.dto; + +import com.pictc.annotations.datalog.*; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract",name="管输合同") +public class UpdateLngContractTPDto 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; + + + /** + * lngContractTransPng + */ + @ApiModelProperty("lngContractTransPng子表") + @LogJoin(name = "lngContractTransPng子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractTransPngDto.class, type = JoinType.MANY) + private List lngContractTransPngList; + /** + * lngPriceTransPng + */ + @ApiModelProperty("lngPriceTransPng子表") + @LogJoin(name = "lngPriceTransPng子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDto.class, type = JoinType.MANY) + private List lngPriceTransPngList; + /** + * 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; + /** + * 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; + + /** + * 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/UpdateLngContractTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java new file mode 100644 index 0000000..e40cfd9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractTransPngDto.java @@ -0,0 +1,82 @@ +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; + + + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_trans_png",name="管输合同") +public class UpdateLngContractTransPngDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键(lng_contract.id) + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + + /** + * 上载点 + */ + @LogField(name="上载点",index=2) + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 交割点 + */ + @LogField(name="交割点",index=3) + @ApiModelProperty("交割点") + private String pointDelyCode; + + /** + * 路径(隐藏) + */ + @LogField(name="路径",index=4) + @ApiModelProperty("路径(隐藏)") + private String routing; + + /** + * 计量单位(隐藏) + */ + @LogField(name="计量单位",index=5) + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 备注 + */ + @LogField(name="备注",index=6) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=7) + @ApiModelProperty("租户id") + private Long tenantId; + + private Boolean hasDel = false; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java new file mode 100644 index 0000000..9b29597 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceProcDto.java @@ -0,0 +1,104 @@ +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.LocalDateTime; + + + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_proc",name="加工合同") +public class UpdateLngPriceProcDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @LogField(name="合同-主信息主键",index=1) + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 公司编码(天然气公司/惠贸) + */ + @LogField(name="公司编码",index=2) + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + + /** + * 服务商编码(惠州接收站/阳江接收站) + */ + @LogField(name="服务商编码",index=3) + @ApiModelProperty("服务商编码(惠州接收站/阳江接收站)") + private String suCode; + + /** + * 气源地 + */ + @LogField(name="气源地",index=4) + @ApiModelProperty("气源地") + private String staCode; + + /** + * 有效期开始 + */ + @LogField(name="有效期开始",index=5) + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @LogField(name="结束日类型",index=6) + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @LogField(name="固定结束日",index=7) + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + private LocalDateTime dateToF; + + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @LogField(name="每年结束日",index=8) + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + + /** + * 备注 + */ + @LogField(name="备注",index=9) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=10) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java new file mode 100644 index 0000000..9fd0794 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngPriceTransPngDto.java @@ -0,0 +1,97 @@ +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.LocalDateTime; + + + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_price_trans_png",name="管输合同") +public class UpdateLngPriceTransPngDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @LogField(name="合同-主信息主键",index=1) + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 公司编码(天然气公司/惠贸) + */ + @LogField(name="公司编码",index=2) + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + + /** + * 托运商编码(管道公司/管网) + */ + @LogField(name="托运商编码",index=3) + @ApiModelProperty("托运商编码(管道公司/管网)") + private String suCode; + + /** + * 有效期开始 + */ + @LogField(name="有效期开始",index=4) + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @LogField(name="结束日类型",index=5) + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @LogField(name="固定结束日",index=6) + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + private LocalDateTime dateToF; + + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @LogField(name="每年结束日",index=7) + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + + /** + * 备注 + */ + @LogField(name="备注",index=8) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=9) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPVo.java new file mode 100644 index 0000000..579040e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPVo.java @@ -0,0 +1,266 @@ +package com.xjrsoft.module.contract.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.sales.vo.LngApproVo; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngContractPVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") + private Long comId; + + private String comName; + + + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + + + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + private String cpCode; + + + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + + + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + private String kPeriod; + + + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + + /** + * 币种 + */ + @ApiModelProperty("币种") + @Trans(type = TransType.CURRENCY, transToFieldName = "curName") + private String curCode; + private String curName; + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + @Trans(type = TransType.USER, transToFieldName = "empName") + private Long empId; + private String empName; + + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") + private Long bDeptId; + private String bDeptName; + + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + /** + * lngContractProc + */ + @ApiModelProperty("lngContractProc子表") + private List lngContractProcList; + /** + * lngPriceProc + */ + @ApiModelProperty("lngPriceProc子表") + private List lngPriceProcList; + /** + * lngContractFact + */ + @ApiModelProperty("lngContractFac子表") + private List lngContractFactList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + private List lngContractFactRelList; + /** + * lngApproVoList + */ + @ApiModelProperty("lngAppro子表") + private List lngApproVoList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + private List lngContractApproRelList; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java new file mode 100644 index 0000000..a9b7227 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractProcVo.java @@ -0,0 +1,61 @@ +package com.xjrsoft.module.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngContractProcVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键(lng_contract.id) + */ + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + + + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + + /** + * 超期存储费说明 + */ + @ApiModelProperty("超期存储费说明") + private String periodDesc; + + + /** + * 损耗说明 + */ + @ApiModelProperty("损耗说明") + private String wasteDesc; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java new file mode 100644 index 0000000..dc39c36 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTPVo.java @@ -0,0 +1,266 @@ +package com.xjrsoft.module.contract.vo; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.sales.vo.LngApproVo; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngContractTPVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") + private Long comId; + + private String comName; + + + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + + + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + private String cpCode; + + + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + + + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + private String kPeriod; + + + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + + /** + * 币种 + */ + @ApiModelProperty("币种") + @Trans(type = TransType.CURRENCY, transToFieldName = "curName") + private String curCode; + private String curName; + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + @Trans(type = TransType.USER, transToFieldName = "empName") + private Long empId; + private String empName; + + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") + private Long bDeptId; + private String bDeptName; + + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + /** + * lngContractTransPng + */ + @ApiModelProperty("lngContractTransPng子表") + private List lngContractTransPngList; + /** + * lngPriceTransPng + */ + @ApiModelProperty("lngPriceTransPng子表") + private List lngPriceTransPngList; + /** + * lngContractFact + */ + @ApiModelProperty("lngContractFac子表") + private List lngContractFactList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + private List lngContractFactRelList; + /** + * lngApproVoList + */ + @ApiModelProperty("lngAppro子表") + private List lngApproVoList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + private List lngContractApproRelList; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java new file mode 100644 index 0000000..d204690 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractTransPngVo.java @@ -0,0 +1,68 @@ +package com.xjrsoft.module.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键(lng_contract.id) + */ + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + + + /** + * 路径(隐藏) + */ + @ApiModelProperty("路径(隐藏)") + private String routing; + + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java new file mode 100644 index 0000000..cef608c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceProcVo.java @@ -0,0 +1,91 @@ +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 java.time.LocalDateTime; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceProcVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + + + /** + * 服务商编码(惠州接收站/阳江接收站) + */ + @ApiModelProperty("服务商编码(惠州接收站/阳江接收站)") + private String suCode; + + + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + + + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + private LocalDateTime dateToF; + + + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java new file mode 100644 index 0000000..2eb354f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngPriceTransPngVo.java @@ -0,0 +1,84 @@ +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 java.time.LocalDateTime; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngPriceTransPngVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + + + /** + * 托运商编码(管道公司/管网) + */ + @ApiModelProperty("托运商编码(管道公司/管网)") + private String suCode; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + + + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + private LocalDateTime dateToF; + + + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractProcController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractProcController.java new file mode 100644 index 0000000..3a5a0b6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractProcController.java @@ -0,0 +1,159 @@ +package com.xjrsoft.module.contract.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.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.UpdateLngContractPDto; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.service.IContractProcService; +import com.xjrsoft.module.contract.vo.LngContractPageVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/contract" + "/contractProc") +@Api(value = "/contract" + "/contractProc",tags = "加工合同代码") +@AllArgsConstructor +public class ContractProcController { + + + private final IContractProcService contractProcService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngContract列表(分页)") + @SaCheckPermission("contractProc:list") + public R page(@Valid LngContractPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngContract::getId,dto.getId()) + .orderByDesc(LngContract::getId) + .select(LngContract.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPageVo.class).contains(x.getProperty())); + IPage page = contractProcService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngContract信息") + @SaCheckPermission("contractProc:detail") + public R info(@RequestParam Long id){ + return R.ok(contractProcService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngContract数据详细日志") + @SaCheckPermission("contractProc:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngContractPDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngContract") + @SaCheckPermission("contractProc:add") + public R add(@Valid @RequestBody UpdateLngContractPDto dto){ + UpdateLngContractPDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractPDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractPDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + @PutMapping + @ApiOperation(value = "修改LngContract") + @SaCheckPermission("contractProc:edit") + public R update(@Valid @RequestBody UpdateLngContractPDto dto){ + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngContractPDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractPDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("contractProc:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngContractPDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngContractPDto before(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + + @Override + public UpdateLngContractPDto after(DataOperationContent content) { + return null; + } + })); + } +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractTransPngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractTransPngController.java new file mode 100644 index 0000000..66298c1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractTransPngController.java @@ -0,0 +1,176 @@ +package com.xjrsoft.module.contract.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.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.UpdateLngContractTPDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractTransPngDto; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.service.IContractTransPngService; +import com.xjrsoft.module.contract.vo.LngContractPageVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/contract" + "/contractTransPng") +@Api(value = "/contract" + "/contractTransPng",tags = "管输合同代码") +@AllArgsConstructor +public class ContractTransPngController { + + + private final IContractTransPngService contractTransPngService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngContract列表(分页)") + @SaCheckPermission("contractTransPng:list") + public R page(@Valid LngContractPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngContract::getId,dto.getId()) + .orderByDesc(LngContract::getId) + .select(LngContract.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPageVo.class).contains(x.getProperty())); + IPage page = contractTransPngService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngContract信息") + @SaCheckPermission("contractTransPng:detail") + public R info(@RequestParam Long id){ + return R.ok(contractTransPngService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngContract数据详细日志") + @SaCheckPermission("contractTransPng:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngContractTPDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngContract") + @SaCheckPermission("contractTransPng:add") + public R add(@Valid @RequestBody UpdateLngContractTPDto dto){ + UpdateLngContractTPDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractTPDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractTPDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + @PutMapping + @ApiOperation(value = "修改LngContract") + @SaCheckPermission("contractTransPng:edit") + public R update(@Valid @RequestBody UpdateLngContractTPDto dto){ + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngContractTPDto before(DataOperationContent content) { + List list = dto.getLngContractTransPngList(); + for (UpdateLngContractTransPngDto dto : list) { + if (dto.getHasDel()) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", + "lng_contract_trans_png"); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(dto.getId())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + } + } + return content.getObj(); + } + + @Override + public UpdateLngContractTPDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("contractTransPng:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngContractTPDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngContractTPDto before(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + + @Override + public UpdateLngContractTPDto after(DataOperationContent content) { + return null; + } + })); + } +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractProc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractProc.java new file mode 100644 index 0000000..23e17a9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractProc.java @@ -0,0 +1,113 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_proc") +@ApiModel(value = "加工合同对象", description = "加工合同") +public class LngContractProc implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 合同-档案主键(lng_contract.id) + */ + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + /** + * 超期存储费说明 + */ + @ApiModelProperty("超期存储费说明") + private String periodDesc; + + /** + * 损耗说明 + */ + @ApiModelProperty("损耗说明") + private String wasteDesc; + + /** + * 备注 + */ + @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/LngContractTransPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractTransPng.java new file mode 100644 index 0000000..f7df976 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractTransPng.java @@ -0,0 +1,119 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_trans_png") +@ApiModel(value = "管输合同对象", description = "管输合同") +public class LngContractTransPng implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 合同-档案主键(lng_contract.id) + */ + @ApiModelProperty("合同-档案主键(lng_contract.id)") + private Long kId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 交割点 + */ + @ApiModelProperty("交割点") + private String pointDelyCode; + + /** + * 路径(隐藏) + */ + @ApiModelProperty("路径(隐藏)") + private String routing; + + /** + * 计量单位(隐藏) + */ + @ApiModelProperty("计量单位(隐藏)") + private String uomCode; + + /** + * 备注 + */ + @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/LngPriceProc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java new file mode 100644 index 0000000..58014d9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceProc.java @@ -0,0 +1,139 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** +* @title: 加工合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_proc") +@ApiModel(value = "加工合同对象", description = "加工合同") +public class LngPriceProc implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + + /** + * 服务商编码(惠州接收站/阳江接收站) + */ + @ApiModelProperty("服务商编码(惠州接收站/阳江接收站)") + private String suCode; + + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateToF; + + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + + /** + * 备注 + */ + @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/LngPriceTransPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPng.java new file mode 100644 index 0000000..03a2534 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngPriceTransPng.java @@ -0,0 +1,133 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** +* @title: 管输合同 +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Data +@TableName("lng_price_trans_png") +@ApiModel(value = "管输合同对象", description = "管输合同") +public class LngPriceTransPng implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 合同-主信息主键(lng_contract.id) + */ + @ApiModelProperty("合同-主信息主键(lng_contract.id)") + private Long kId; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private String comCode; + + /** + * 托运商编码(管道公司/管网) + */ + @ApiModelProperty("托运商编码(管道公司/管网)") + private String suCode; + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结束日类型(F-固定日期，Y-每年) + */ + @ApiModelProperty("结束日类型(F-固定日期，Y-每年)") + private String dateToCode; + + /** + * 固定结束日(date_to_code=F，必须录入，否则空着只读) + */ + @ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateToF; + + /** + * 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式) + */ + @ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)") + private String dateToY; + + /** + * 备注 + */ + @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/LngContractProcMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractProcMapper.java new file mode 100644 index 0000000..3737236 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractProcMapper.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.LngContractProc; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Mapper +public interface LngContractProcMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.java new file mode 100644 index 0000000..6402334 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractTransPngMapper.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.LngContractTransPng; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Mapper +public interface LngContractTransPngMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcMapper.java new file mode 100644 index 0000000..b48ecb6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceProcMapper.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.LngPriceProc; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceProcMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngMapper.java new file mode 100644 index 0000000..d6b5a7f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngPriceTransPngMapper.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.LngPriceTransPng; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Mapper +public interface LngPriceTransPngMapper extends MPJBaseMapper, BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractProcService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractProcService.java new file mode 100644 index 0000000..67bca2e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractProcService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.contract.service; + +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.vo.LngContractPVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ + +public interface IContractProcService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngContractPVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractTransPngService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractTransPngService.java new file mode 100644 index 0000000..0e1f81b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractTransPngService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.contract.service; + +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.vo.LngContractTPVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ + +public interface IContractTransPngService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngContractTPVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java new file mode 100644 index 0000000..1364ba8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractProcServiceImpl.java @@ -0,0 +1,94 @@ +package com.xjrsoft.module.contract.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.google.common.collect.Lists; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.contract.entity.*; +import com.xjrsoft.module.contract.mapper.*; +import com.xjrsoft.module.contract.service.IContractProcService; +import com.xjrsoft.module.contract.vo.*; +import com.xjrsoft.module.sales.vo.LngApproVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ContractProcServiceImpl extends MPJBaseServiceImpl implements IContractProcService { + + private final LngContractProcMapper lngContractProcMapper; + private final LngPriceProcMapper lngPriceProcMapper; + private final LngContractFactMapper lngContractFactMapper; + private final LngContractFactRelMapper lngContractFactRelMapper; + private final LngContractApproRelMapper lngContractApproRelMapper; + private final IFileClient fileClient; + + @Override + public LngContractPVo getInfoById(Long id) { + LngContract lngContract = this.getById(id); + if(lngContract == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据")); + } + LngContractPVo vo = BeanUtil.toBean(lngContract, LngContractPVo.class); + List lngContractProcList = lngContractProcMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractProc::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractProcList)) { + vo.setLngContractProcList(BeanUtil.copyToList(lngContractProcList, + LngContractProcVo.class)); + } + List lngPriceProcList = lngPriceProcMapper.selectList( + new LambdaQueryWrapper() + .eq(LngPriceProc::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngPriceProcList)) { + vo.setLngPriceProcList(BeanUtil.copyToList(lngPriceProcList, + LngPriceProcVo.class)); + } + List lngContractFactRelList = lngContractFactRelMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractFactRel::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractFactRelList)) { + List lngContractFactVoList = Lists.newArrayList(); + lngContractFactRelList.forEach(x -> { + LngContractFact lngContractFact = lngContractFactMapper.selectById(x.getKFactId()); + List fileList = fileClient.getTableFiles("lng_contract_fact", + "lngFileUploadList", lngContractFact.getId()); + LngContractFactVo lngContractFactVo = BeanUtil.toBean(lngContractFact, LngContractFactVo.class); + lngContractFactVo.setLngFileUploadList(fileList); + lngContractFactVoList.add(lngContractFactVo); + }); + vo.setLngContractFactList(lngContractFactVoList); + } + List lngContractApproRelList = lngContractApproRelMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractApproRel::getTableId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractApproRelList)) { + List approVoList = Lists.newArrayList(); + lngContractApproRelList.forEach(x -> { + LngApproVo approVo = lngContractFactMapper.getLngApproVo(x.getApproId()); + List fileList = fileClient.getTableFiles("lng_appro", + "lngFileUploadList", approVo.getId()); + approVo.setLngFileUploadList(fileList); + approVoList.add(approVo); + }); + vo.setLngApproVoList(approVoList); + } + 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/contract/service/impl/ContractTransPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java new file mode 100644 index 0000000..3417de9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractTransPngServiceImpl.java @@ -0,0 +1,94 @@ +package com.xjrsoft.module.contract.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.google.common.collect.Lists; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.contract.entity.*; +import com.xjrsoft.module.contract.mapper.*; +import com.xjrsoft.module.contract.service.IContractTransPngService; +import com.xjrsoft.module.contract.vo.*; +import com.xjrsoft.module.sales.vo.LngApproVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-10 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ContractTransPngServiceImpl extends MPJBaseServiceImpl implements IContractTransPngService { + + private final LngContractTransPngMapper lngContractTransPngMapper; + private final LngPriceTransPngMapper lngPriceTransPngMapper; + private final LngContractFactMapper lngContractFactMapper; + private final LngContractFactRelMapper lngContractFactRelMapper; + private final LngContractApproRelMapper lngContractApproRelMapper; + private final IFileClient fileClient; + + @Override + public LngContractTPVo getInfoById(Long id) { + LngContract lngContract = this.getById(id); + if(lngContract == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据")); + } + LngContractTPVo vo = BeanUtil.toBean(lngContract, LngContractTPVo.class); + List lngContractTransPngList = lngContractTransPngMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractTransPng::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractTransPngList)) { + vo.setLngContractTransPngList(BeanUtil.copyToList(lngContractTransPngList, + LngContractTransPngVo.class)); + } + List lngPriceTransPngList = lngPriceTransPngMapper.selectList( + new LambdaQueryWrapper() + .eq(LngPriceTransPng::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngPriceTransPngList)) { + vo.setLngPriceTransPngList(BeanUtil.copyToList(lngPriceTransPngList, + LngPriceTransPngVo.class)); + } + List lngContractFactRelList = lngContractFactRelMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractFactRel::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractFactRelList)) { + List lngContractFactVoList = Lists.newArrayList(); + lngContractFactRelList.forEach(x -> { + LngContractFact lngContractFact = lngContractFactMapper.selectById(x.getKFactId()); + List fileList = fileClient.getTableFiles("lng_contract_fact", + "lngFileUploadList", lngContractFact.getId()); + LngContractFactVo lngContractFactVo = BeanUtil.toBean(lngContractFact, LngContractFactVo.class); + lngContractFactVo.setLngFileUploadList(fileList); + lngContractFactVoList.add(lngContractFactVo); + }); + vo.setLngContractFactList(lngContractFactVoList); + } + List lngContractApproRelList = lngContractApproRelMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractApproRel::getTableId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractApproRelList)) { + List approVoList = Lists.newArrayList(); + lngContractApproRelList.forEach(x -> { + LngApproVo approVo = lngContractFactMapper.getLngApproVo(x.getApproId()); + List fileList = fileClient.getTableFiles("lng_appro", + "lngFileUploadList", approVo.getId()); + approVo.setLngFileUploadList(fileList); + approVoList.add(approVo); + }); + vo.setLngApproVoList(approVoList); + } + List fileList = fileClient.getTableFiles("lng_contract", + "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +} From aa6d36e4f1acec1312eb0d0864f72a359fd7ab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Thu, 12 Feb 2026 14:46:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?---=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/contract/dto/AddLngContractProcDto.java | 5 ----- .../module/contract/dto/AddLngContractTransPngDto.java | 6 +----- .../com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java | 5 ----- .../xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java | 5 ----- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java index 879290c..131db57 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractProcDto.java @@ -56,10 +56,5 @@ public class AddLngContractProcDto extends com.xjrsoft.common.model.base.BaseMod */ @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/AddLngContractTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractTransPngDto.java index fe656c8..910c76a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractTransPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractTransPngDto.java @@ -61,10 +61,6 @@ public class AddLngContractTransPngDto extends com.xjrsoft.common.model.base.Bas */ @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/AddLngPriceProcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java index a701ac2..c2d16be 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceProcDto.java @@ -71,10 +71,5 @@ public class AddLngPriceProcDto extends com.xjrsoft.common.model.base.BaseModel */ @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/AddLngPriceTransPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java index 06b39c8..fdcd522 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngPriceTransPngDto.java @@ -66,10 +66,5 @@ public class AddLngPriceTransPngDto extends com.xjrsoft.common.model.base.BaseMo */ @ApiModelProperty("备注") private String note; - /** - * 租户id - */ - @ApiModelProperty("租户id") - private Long tenantId; }