From 839da1d83175d3f17b7d4033a52831e324933b44 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Wed, 31 Dec 2025 17:05:57 +0800 Subject: [PATCH] update --- .../contract/dto/UpdateLngContractPurDto.java | 29 ++-- .../dto/UpdateLngContractPurPngPointDto.java | 12 ++ .../UpdateLngContractPurPngPointSalesDto.java | 94 +++++++++++++ .../vo/LngContractPurPngPointSalesVo.java | 72 ++++++++++ .../contract/vo/LngContractPurPngPointVo.java | 7 +- .../module/contract/vo/LngContractPurVo.java | 11 ++ .../controller/ContractPurPngController.java | 10 +- .../contract/entity/LngContractPur.java | 112 +++++---------- .../entity/LngContractPurPngPoint.java | 44 +++--- .../entity/LngContractPurPngPointSales.java | 129 ++++++++++++++++++ .../LngContractPurPngPointSalesMapper.java | 20 +++ .../service/IContractPurPngService.java | 4 + .../impl/ContractPurPngServiceImpl.java | 36 +++++ 13 files changed, 460 insertions(+), 120 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java index 801f897..4c6e8be 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java @@ -6,11 +6,13 @@ import java.util.List; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogAttrField; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,7 +41,7 @@ public class UpdateLngContractPurDto implements Serializable { /** * 合同主体ID(天然气公司/惠贸) */ - @LogField(name="合同主体ID(天然气公司/惠贸)",index=1) + @LogField(name="合同主体ID",index=1) @ApiModelProperty("合同主体ID(天然气公司/惠贸)") private Long comId; @@ -60,21 +62,21 @@ public class UpdateLngContractPurDto implements Serializable { /** * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) */ - @LogField(name="业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)",index=4) + @LogField(name="业务类型",index=4) @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") private String typeCode; /** * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) */ - @LogField(name="是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)",index=5) + @LogField(name="是否线上合同",index=5) @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") private String onlineSign; /** * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) */ - @LogField(name="交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)",index=6) + @LogField(name="交易对手类型",index=6) @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") private String cpTableName; @@ -165,7 +167,7 @@ public class UpdateLngContractPurDto implements Serializable { /** * 状态(未提交/审批中/已审批/已驳回) */ - @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=19) + @LogField(name="状态",index=19) @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") private String approCode; @@ -190,7 +192,7 @@ public class UpdateLngContractPurDto implements Serializable { @ApiModelProperty("lngContractPurPng子表") @LogJoin(name = "lngContractPurPng子表", columns = { - @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY) private List lngContractPurPngList; @@ -200,7 +202,7 @@ public class UpdateLngContractPurDto implements Serializable { @ApiModelProperty("lngContractPurPngPoint子表") @LogJoin(name = "lngContractPurPngPoint子表", columns = { - @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY) private List lngContractPurPngPointList; @@ -210,7 +212,7 @@ public class UpdateLngContractPurDto implements Serializable { @ApiModelProperty("lngContractPurPngQty子表") @LogJoin(name = "lngContractPurPngQty子表", columns = { - @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY) private List lngContractPurPngQtyList; @@ -220,7 +222,7 @@ public class UpdateLngContractPurDto implements Serializable { @ApiModelProperty("lngContractApproRel子表") @LogJoin(name = "lngContractApproRel子表", columns = { - @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY) private List lngContractApproRelList; @@ -230,8 +232,15 @@ public class UpdateLngContractPurDto implements Serializable { @ApiModelProperty("lngContractFactRel子表") @LogJoin(name = "lngContractFactRel子表", columns = { - @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractFactRelDto.class, type = JoinType.MANY) private List lngContractFactRelList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java index 236291d..162f15f 100644 --- 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 @@ -75,5 +75,17 @@ public class UpdateLngContractPurPngPointDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @LogJoin(name = "lngContractPurPngPoint子表", + columns = { + @LogJoinColumn(field = "kpppId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointSalesDto.class, type = JoinType.MANY) + private List lngContractPurPngPointSalesList; + + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java new file mode 100644 index 0000000..fb88b44 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java @@ -0,0 +1,94 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png_point_sales",name="国内管道气采购上载点-交割点") +public class UpdateLngContractPurPngPointSalesDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-国内采购-管道气-上载点主键",index=2) + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点编码 + */ + @LogField(name="上载点编码",index=3) + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @LogField(name="自主托运(Y-是，N-否)",index=4) + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 交割点编码 + */ + @LogField(name="交割点编码",index=5) + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 备注 + */ + @LogField(name="备注",index=6) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=7) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java new file mode 100644 index 0000000..3814398 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java @@ -0,0 +1,72 @@ +package com.xjrsoft.module.contract.vo; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngPointSalesVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java index 5818817..6575350 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.vo; import java.time.LocalDateTime; +import java.util.List; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -98,7 +99,11 @@ public class LngContractPurPngPointVo extends com.xjrsoft.common.model.base.Base private Long ruleUserId; - + /** + * lngContractPurPngPointSales + */ + @ApiModelProperty("lngContractPurPngPointSales子表") + private List lngContractPurPngPointSalesList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java index 3e896c0..858f499 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java @@ -3,6 +3,9 @@ package com.xjrsoft.module.contract.vo; import java.time.LocalDateTime; import java.util.List; +import com.pictc.annotations.datalog.LogAttrField; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -229,6 +232,7 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("lngContractPurPngQty子表") private List lngContractPurPngQtyList; /** + * * lngContractApproRel */ @ApiModelProperty("lngContractApproRel子表") @@ -238,5 +242,12 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("lngContractFactRel子表") private List lngContractFactRelList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java index 2a6812e..11ac712 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java @@ -79,13 +79,9 @@ public class ContractPurPngController { @GetMapping(value = "/info") @ApiOperation(value="根据id查询LngContract信息") - @SaCheckPermission("contractPurPng:detail") + // @SaCheckPermission("contractPurPng:detail") public R info(@RequestParam Long id){ - LngContractPur lngContract = contractPurPngService.getByIdDeep(id); - if (lngContract == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngContract, LngContractPurVo.class)); + return R.ok(contractPurPngService.getInfoById(id)); } @GetMapping(value = "/datalog") @@ -116,7 +112,7 @@ public class ContractPurPngController { @ApiOperation(value = "删除") @SaCheckPermission("contractPurPng:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngContractPurDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngContractPurDto.class, ids)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java index 0289c33..7b34632 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java @@ -8,6 +8,12 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; import com.github.yulichang.annotation.EntityMapping; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.ValueDirectionType; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,9 +41,6 @@ public class LngContractPur implements Serializable { * 主键 */ @ApiModelProperty("主键") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) @TableId private Long id; @@ -46,9 +49,6 @@ public class LngContractPur implements Serializable { * 合同主体ID(天然气公司/惠贸) */ @ApiModelProperty("合同主体ID(天然气公司/惠贸)") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private Long comId; @@ -56,81 +56,54 @@ public class LngContractPur implements Serializable { * 合同号 */ @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; @@ -145,9 +118,6 @@ public class LngContractPur implements Serializable { * 有效期结束 */ @ApiModelProperty("有效期结束") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime dateTo; @@ -155,9 +125,6 @@ public class LngContractPur implements Serializable { * 确认函开始日 */ @ApiModelProperty("确认函开始日") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime dateCfmFrom; @@ -165,9 +132,6 @@ public class LngContractPur implements Serializable { * 确认函结束日 */ @ApiModelProperty("确认函结束日") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime dateCfmTo; @@ -175,27 +139,18 @@ public class LngContractPur implements Serializable { * 币种 */ @ApiModelProperty("币种") - - - private String curCode; /** * 合同金额 */ @ApiModelProperty("合同金额") - - - private String amountDesc; /** * 我方联系人 */ @ApiModelProperty("我方联系人") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private Long empId; @@ -203,9 +158,6 @@ public class LngContractPur implements Serializable { * 业务部门ID */ @ApiModelProperty("业务部门ID") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private Long bDeptId; @@ -213,27 +165,18 @@ public class LngContractPur implements Serializable { * 状态(未提交/审批中/已审批/已驳回) */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") - - - private String approCode; /** * 备注 */ @ApiModelProperty("备注") - - - private String note; /** * 创建人id */ @ApiModelProperty("创建人id") - - - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long createUserId; @@ -241,9 +184,6 @@ public class LngContractPur implements Serializable { * 创建时间 */ @ApiModelProperty("创建时间") - - - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private LocalDateTime createDate; @@ -251,9 +191,6 @@ public class LngContractPur implements Serializable { * 修改人id */ @ApiModelProperty("修改人id") - - - @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) private Long modifyUserId; @@ -261,9 +198,6 @@ public class LngContractPur implements Serializable { * 修改时间 */ @ApiModelProperty("修改时间") - - - @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) private LocalDateTime modifyDate; @@ -271,9 +205,6 @@ public class LngContractPur implements Serializable { * 租户id */ @ApiModelProperty("租户id") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private Long tenantId; @@ -281,9 +212,6 @@ public class LngContractPur implements Serializable { * 部门id */ @ApiModelProperty("部门id") - - - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long deptId; @@ -291,9 +219,6 @@ public class LngContractPur implements Serializable { * 数据权限id */ @ApiModelProperty("数据权限id") - - - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long ruleUserId; @@ -304,6 +229,11 @@ public class LngContractPur implements Serializable { @ApiModelProperty("lngContractPurPng子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同上载点关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPng.class, type = JoinType.MANY) + private List lngContractPurPngList; /** * lngContractPurPngPoint @@ -311,6 +241,11 @@ public class LngContractPur implements Serializable { @ApiModelProperty("lngContractPurPngPoint子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同上载点关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPngPoint.class, type = JoinType.MANY) + private List lngContractPurPngPointList; /** * lngContractPurPngQty @@ -318,6 +253,11 @@ public class LngContractPur implements Serializable { @ApiModelProperty("lngContractPurPngQty子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同数量关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPngQty.class, type = JoinType.MANY) + private List lngContractPurPngQtyList; /** * lngContractApproRel @@ -325,6 +265,11 @@ public class LngContractPur implements Serializable { @ApiModelProperty("lngContractApproRel子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "tableId") + @LogJoin(name = "合同审批要素关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractApproRel.class, type = JoinType.MANY) + private List lngContractApproRelList; /** * lngContractFactRel @@ -332,6 +277,11 @@ public class LngContractPur implements Serializable { @ApiModelProperty("lngContractFactRel子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "kId") + @LogJoin(name = "合同要素关联信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractFactRel.class, type = JoinType.MANY) + private List lngContractFactRelList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java index d1036f7..e3d1d06 100644 --- 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 @@ -1,21 +1,24 @@ package com.xjrsoft.module.contract.entity; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableName; import com.github.yulichang.annotation.EntityMapping; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.ValueDirectionType; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** @@ -35,9 +38,6 @@ public class LngContractPurPngPoint implements Serializable { * 主键 */ @ApiModelProperty("主键") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) @TableId private Long id; @@ -123,9 +123,6 @@ public class LngContractPurPngPoint implements Serializable { * 租户id */ @ApiModelProperty("租户id") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private Long tenantId; @@ -133,9 +130,6 @@ public class LngContractPurPngPoint implements Serializable { * 部门id */ @ApiModelProperty("部门id") - - - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long deptId; @@ -143,12 +137,20 @@ public class LngContractPurPngPoint implements Serializable { * 数据权限id */ @ApiModelProperty("数据权限id") - - - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long ruleUserId; - + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPointSales子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kpppId") + @LogJoin(name = "交割点信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "kpppId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngContractPurPngPointSales.class, type = JoinType.MANY) + + private List lngContractPurPngPointSalesList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java new file mode 100644 index 0000000..560fe3c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPointSales.java @@ -0,0 +1,129 @@ +package com.xjrsoft.module.contract.entity; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.pictc.annotations.datalog.LogField; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_pur_png_point_sales") +@ApiModel(value = "国内管道气采购-上载点-交割点对象", description = "国内管道气采购-上载点-交割点") +public class LngContractPurPngPointSales implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpppId; + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java new file mode 100644 index 0000000..7a2de11 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointSalesMapper.java @@ -0,0 +1,20 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; + +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngPointSalesMapper extends MPJBaseMapper , BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java index 240880b..e33116c 100644 --- 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 @@ -5,6 +5,8 @@ import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.contract.entity.LngContractPur; +import com.xjrsoft.module.contract.vo.LngContractPurVo; + import lombok.Data; import java.util.List; @@ -16,5 +18,7 @@ import java.util.List; */ public interface IContractPurPngService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngContractPurVo getInfoById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java index d60463e..c06fe30 100644 --- 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 @@ -1,12 +1,24 @@ package com.xjrsoft.module.contract.service.impl; +import java.util.List; + import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.module.contract.entity.LngContractPur; +import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales; import com.xjrsoft.module.contract.mapper.LngContractPurMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngPointSalesMapper; import com.xjrsoft.module.contract.service.IContractPurPngService; +import com.xjrsoft.module.contract.vo.LngContractPurPngPointVo; +import com.xjrsoft.module.contract.vo.LngContractPurVo; +import com.xjrsoft.module.sales.entity.LngCustomer; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; /** @@ -19,4 +31,28 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class ContractPurPngServiceImpl extends MPJBaseServiceImpl implements IContractPurPngService { + private final IFileClient fileClient; + + private final LngContractPurPngPointSalesMapper lngContractPurPngPointSalesMapper; + + @Override + public LngContractPurVo getInfoById(Long id) { + LngContractPur lngContractPur = this.getByIdDeep(id); + if(lngContractPur == null) { + return null; + } + + if(lngContractPur.getLngContractPurPngPointList() != null) { + for(LngContractPurPngPoint pp:lngContractPur.getLngContractPurPngPointList()) { + List list = lngContractPurPngPointSalesMapper.selectList(new LambdaQueryWrapper() + .eq(LngContractPurPngPointSales::getKpppId, pp.getId())); + pp.setLngContractPurPngPointSalesList(list); + } + } + LngContractPurVo vo = BeanUtil.toBean(lngContractPur, LngContractPurVo.class); + + List fileList = fileClient.getTableFiles("lng_contract", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } }