From a4fa3d1f310a9476ce1f85f99f2fb9bf1681e3c7 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 30 Dec 2025 14:41:41 +0800 Subject: [PATCH 1/5] update --- .../sales/dto/UpdateLngCustomerDto.java | 7 ++++ .../module/sales/vo/LngCustomerVo.java | 8 +++- .../sales/controller/CustomerController.java | 39 ++++++++++++++++-- .../module/sales/entity/LngCustomer.java | 6 +++ .../controller/SupplierController.java | 40 +++++++++++++++++-- 5 files changed, 92 insertions(+), 8 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java index d3a42e0..74afc02 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java @@ -334,4 +334,11 @@ public class UpdateLngCustomerDto implements Serializable { */ @ApiModelProperty("数据权限id") private Long ruleUserId; + + /** + * 是否基础设施使用方 + */ + @LogField(name="是否基础设施使用方",index=31) + @ApiModelProperty("是否基础设施使用方") + private String facSign; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java index 698a446..c989e15 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.pictc.annotations.datalog.LogField; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -276,7 +277,12 @@ public class LngCustomerVo { @ApiModelProperty("数据权限id") private Long ruleUserId; - + /** + * 是否基础设施使用方 + */ + @LogField(name="是否基础设施使用方",index=31) + @ApiModelProperty("是否基础设施使用方") + private String facSign; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java index 9cff337..b0a4da2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -164,7 +164,18 @@ public class CustomerController { @ApiOperation(value = "删除") @SaCheckPermission("customer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(customerService.delete(ids)); + //return R.ok(customerService.delete(ids)); + return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + return null; + } + })); } @@ -172,7 +183,18 @@ public class CustomerController { @ApiOperation(value = "启用LngCustomer") @SaCheckPermission("customer:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids)); + + return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + return null; + } + })); } @@ -180,7 +202,18 @@ public class CustomerController { @ApiOperation(value = "禁用LngCustomer") @SaCheckPermission("customer:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + //return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids)); + return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngCustomerDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngCustomerDto after(DataOperationContent content) { + return null; + } + })); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java index 46db016..895ef88 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.github.yulichang.annotation.EntityMapping; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.ValueDirectionType; @@ -266,6 +267,11 @@ public class LngCustomer implements Serializable { @TableField(fill = FieldFill.INSERT) private Long ruleUserId; + /** + * 是否基础设施使用方 + */ + @ApiModelProperty(name="是否基础设施使用方") + private String facSign; /** * lngCustomerAttrPower diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java index f615b68..73fb9e4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java @@ -20,7 +20,6 @@ import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; import com.pictc.enums.BusinessCode; import com.pictc.enums.ExceptionCommonCode; -import com.xjrsoft.common.advice.tran.CustomerDataProvider; import com.xjrsoft.common.advice.tran.SupplierDataProvider; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; @@ -161,7 +160,18 @@ public class SupplierController { @ApiOperation(value = "删除") @SaCheckPermission("supplier:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids)); + //return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngSupplierDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngSupplierDto after(DataOperationContent content) { + return null; + } + })); } @@ -169,7 +179,18 @@ public class SupplierController { @ApiOperation(value = "启用LngSupplier") @SaCheckPermission("supplier:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); + //return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids)); + return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngSupplierDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngSupplierDto after(DataOperationContent content) { + return null; + } + })); } @@ -177,7 +198,18 @@ public class SupplierController { @ApiOperation(value = "禁用LngSupplier") @SaCheckPermission("supplier:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); + //return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids)); + return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids, new DataOperationListener() { + @Override + public UpdateLngSupplierDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngSupplierDto after(DataOperationContent content) { + return null; + } + })); } From 25418aa73864de17c40147d2adba043d7cc12252 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Wed, 31 Dec 2025 09:19:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=9F=E6=88=90ContractPurPng=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/AddLngContractDto.java | 157 ++++++++ .../dto/AddLngContractFactRelDto.java | 46 +++ .../contract/dto/AddLngContractPurPngDto.java | 52 +++ .../dto/AddLngContractPurPngPointDto.java | 47 +++ .../dto/AddLngContractPurPngQtyDto.java | 95 +++++ .../contract/dto/LngContractPageDto.java | 82 +++++ .../contract/dto/UpdateLngContractDto.java | 237 ++++++++++++ .../dto/UpdateLngContractFactRelDto.java | 72 ++++ .../dto/UpdateLngContractPurPngDto.java | 86 +++++ .../dto/UpdateLngContractPurPngPointDto.java | 79 ++++ .../dto/UpdateLngContractPurPngQtyDto.java | 142 ++++++++ .../contract/vo/LngContractFactRelVo.java | 97 +++++ .../module/contract/vo/LngContractPageVo.java | 78 ++++ .../contract/vo/LngContractPurPngPointVo.java | 104 ++++++ .../contract/vo/LngContractPurPngQtyVo.java | 174 +++++++++ .../contract/vo/LngContractPurPngVo.java | 118 ++++++ .../module/contract/vo/LngContractVo.java | 242 +++++++++++++ .../controller/ContractPurPngController.java | 120 +++++++ .../module/contract/entity/LngContract.java | 340 ++++++++++++++++++ .../contract/entity/LngContractFactRel.java | 147 ++++++++ .../contract/entity/LngContractPurPng.java | 163 +++++++++ .../entity/LngContractPurPngPoint.java | 154 ++++++++ .../contract/entity/LngContractPurPngQty.java | 244 +++++++++++++ .../mapper/LngContractFactRelMapper.java | 17 + .../contract/mapper/LngContractMapper.java | 17 + .../mapper/LngContractPurPngMapper.java | 17 + .../mapper/LngContractPurPngPointMapper.java | 17 + .../mapper/LngContractPurPngQtyMapper.java | 17 + .../service/IContractPurPngService.java | 42 +++ .../impl/ContractPurPngServiceImpl.java | 238 ++++++++++++ 30 files changed, 3441 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngQtyDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngQty.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java new file mode 100644 index 0000000..6e194fe --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java @@ -0,0 +1,157 @@ +package com.xjrsoft.module.contract.dto; + +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + private String cpCode; + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + private String kPeriod; + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + /** + * 币种 + */ + @ApiModelProperty("币种") + private String curCode; + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + private Long empId; + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + private Long bDeptId; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + private List lngContractFactRelList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java new file mode 100644 index 0000000..179ad52 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java @@ -0,0 +1,46 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractFactRelDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键(关联时写入) + */ + @ApiModelProperty("合同-档案主键(关联时写入)") + private Long kId; + /** + * 合同-合同系统主键(关联时写入) + */ + @ApiModelProperty("合同-合同系统主键(关联时写入)") + private Long kFactId; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java new file mode 100644 index 0000000..a663412 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngDto.java @@ -0,0 +1,52 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurPngDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + private Long kId; + /** + * + */ + @ApiModelProperty("") + private String prcTypeCode; + /** + * + */ + @ApiModelProperty("") + private String periodTypeCode; + /** + * + */ + @ApiModelProperty("") + private String uomCode; + /** + * + */ + @ApiModelProperty("") + private String note; + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java new file mode 100644 index 0000000..c41c5bd --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngPointDto.java @@ -0,0 +1,47 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurPngPointDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngQtyDto.java new file mode 100644 index 0000000..fb32dda --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurPngQtyDto.java @@ -0,0 +1,95 @@ +package com.xjrsoft.module.contract.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class AddLngContractPurPngQtyDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + /** + * 开始日期(需要校验周期) + */ + @ApiModelProperty("开始日期(需要校验周期)") + private LocalDateTime dateFrom; + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + private BigDecimal qtyGjMonth; + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + private BigDecimal qtyM3Month; + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + private BigDecimal qtyGjDay; + /** + * 日气量(方)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + private BigDecimal qtyM3Day; + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/M3-方/GJ-吉焦)") + private String zfbyTypeCode; + /** + * 照付不议比例%/量数值 + */ + @ApiModelProperty("照付不议比例%/量数值") + private BigDecimal zfbyValue; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java new file mode 100644 index 0000000..4b421d5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java @@ -0,0 +1,82 @@ +package com.xjrsoft.module.contract.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngContractPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateTo; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java new file mode 100644 index 0000000..6f22d10 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java @@ -0,0 +1,237 @@ +package com.xjrsoft.module.contract.dto; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.ValueDirectionType; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract",name="国内管道气采购") +public class UpdateLngContractDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @LogField(name="合同主体ID(天然气公司/惠贸)",index=1) + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + + /** + * 合同号 + */ + @LogField(name="合同号",index=2) + @ApiModelProperty("合同号") + private String kNo; + + /** + * 合同名称 + */ + @LogField(name="合同名称",index=3) + @ApiModelProperty("合同名称") + private String kName; + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @LogField(name="业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)",index=4) + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @LogField(name="是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)",index=5) + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @LogField(name="交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)",index=6) + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + /** + * 主交易对手编码 + */ + @LogField(name="主交易对手编码",index=7) + @ApiModelProperty("主交易对手编码") + private String cpCode; + + /** + * 主交易对手名称 + */ + @LogField(name="主交易对手名称",index=8) + @ApiModelProperty("主交易对手名称") + private String cpName; + + /** + * 合同期限 + */ + @LogField(name="合同期限",index=9) + @ApiModelProperty("合同期限") + private String kPeriod; + + /** + * 合同签订日期 + */ + @LogField(name="合同签订日期",index=10) + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + + /** + * 有效期开始 + */ + @LogField(name="有效期开始",index=11) + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + /** + * 有效期结束 + */ + @LogField(name="有效期结束",index=12) + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + /** + * 确认函开始日 + */ + @LogField(name="确认函开始日",index=13) + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + /** + * 确认函结束日 + */ + @LogField(name="确认函结束日",index=14) + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + /** + * 币种 + */ + @LogField(name="币种",index=15) + @ApiModelProperty("币种") + private String curCode; + + /** + * 合同金额 + */ + @LogField(name="合同金额",index=16) + @ApiModelProperty("合同金额") + private String amountDesc; + + /** + * 我方联系人 + */ + @LogField(name="我方联系人",index=17) + @ApiModelProperty("我方联系人") + private Long empId; + + /** + * 业务部门ID + */ + @LogField(name="业务部门ID",index=18) + @ApiModelProperty("业务部门ID") + private Long bDeptId; + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @LogField(name="状态(未提交/审批中/已审批/已驳回)",index=19) + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 备注 + */ + @LogField(name="备注",index=20) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=21) + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + @LogJoin(name = "lngContractPurPng子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY) + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @LogJoin(name = "lngContractPurPngPoint子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY) + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + @LogJoin(name = "lngContractPurPngQty子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY) + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + @LogJoin(name = "lngContractApproRel子表", + columns = { + @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY) + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + @LogJoin(name = "lngContractFactRel子表", + columns = { + @LogJoinColumn(field = "kId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractFactRelDto.class, type = JoinType.MANY) + private List lngContractFactRelList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java new file mode 100644 index 0000000..f01784c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java @@ -0,0 +1,72 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_fact_rel",name="国内管道气采购") +public class UpdateLngContractFactRelDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键(关联时写入) + */ + @LogField(name="合同-档案主键(关联时写入)",index=1) + @ApiModelProperty("合同-档案主键(关联时写入)") + private Long kId; + + /** + * 合同-合同系统主键(关联时写入) + */ + @LogField(name="合同-合同系统主键(关联时写入)",index=2) + @ApiModelProperty("合同-合同系统主键(关联时写入)") + private Long kFactId; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=3) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 租户id + */ + @LogField(name="租户id",index=4) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java new file mode 100644 index 0000000..549085e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java @@ -0,0 +1,86 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png",name="国内管道气采购") +public class UpdateLngContractPurPngDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @LogField(name="",index=0) + @ApiModelProperty("") + private Long id; + + /** + * + */ + @LogField(name="",index=1) + @ApiModelProperty("") + private Long kId; + + /** + * + */ + @LogField(name="",index=2) + @ApiModelProperty("") + private String prcTypeCode; + + /** + * + */ + @LogField(name="",index=3) + @ApiModelProperty("") + private String periodTypeCode; + + /** + * + */ + @LogField(name="",index=4) + @ApiModelProperty("") + private String uomCode; + + /** + * + */ + @LogField(name="",index=5) + @ApiModelProperty("") + private String note; + + /** + * + */ + @LogField(name="",index=6) + @ApiModelProperty("") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java new file mode 100644 index 0000000..236291d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java @@ -0,0 +1,79 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png_point",name="国内管道气采购") +public class UpdateLngContractPurPngPointDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 上载点编码 + */ + @LogField(name="上载点编码",index=2) + @ApiModelProperty("上载点编码") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @LogField(name="自主托运(Y-是，N-否)",index=3) + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + /** + * 备注 + */ + @LogField(name="备注",index=4) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=5) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java new file mode 100644 index 0000000..39fb1a1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngQtyDto.java @@ -0,0 +1,142 @@ +package com.xjrsoft.module.contract.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_contract_pur_png_qty",name="国内管道气采购") +public class UpdateLngContractPurPngQtyDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 合同-档案主键 + */ + @LogField(name="合同-档案主键",index=1) + @ApiModelProperty("合同-档案主键") + private Long kId; + + /** + * 开始日期(需要校验周期) + */ + @LogField(name="开始日期(需要校验周期)",index=2) + @ApiModelProperty("开始日期(需要校验周期)") + private LocalDateTime dateFrom; + + /** + * 结束日期 + */ + @LogField(name="结束日期",index=3) + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + /** + * 优先级(必须录入) + */ + @LogField(name="优先级(必须录入)",index=4) + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @LogField(name="基础量/增量(基础量/增量1/增量2)",index=5) + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=6) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @LogField(name="月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)",index=7) + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + private BigDecimal qtyGjMonth; + + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @LogField(name="月气量(方)(qty_gj_month*1000/rate_m3_gj)",index=8) + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + private BigDecimal qtyM3Month; + + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @LogField(name="日气量(吉焦)(根据当月天数自动计算)",index=9) + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + private BigDecimal qtyGjDay; + + /** + * 日气量(方)(根据当月天数自动计算) + */ + @LogField(name="日气量(方)(根据当月天数自动计算)",index=10) + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + private BigDecimal qtyM3Day; + + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @LogField(name="照付不议类型(P-比例/M3-方/GJ-吉焦)",index=11) + @ApiModelProperty("照付不议类型(P-比例/M3-方/GJ-吉焦)") + private String zfbyTypeCode; + + /** + * 照付不议比例%/量数值 + */ + @LogField(name="照付不议比例%/量数值",index=12) + @ApiModelProperty("照付不议比例%/量数值") + private BigDecimal zfbyValue; + + /** + * 备注 + */ + @LogField(name="备注",index=13) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=14) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java new file mode 100644 index 0000000..7642052 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java @@ -0,0 +1,97 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键(关联时写入) + */ + @ApiModelProperty("合同-档案主键(关联时写入)") + private Long kId; + + + /** + * 合同-合同系统主键(关联时写入) + */ + @ApiModelProperty("合同-合同系统主键(关联时写入)") + private Long kFactId; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java new file mode 100644 index 0000000..b762777 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java @@ -0,0 +1,78 @@ +package com.xjrsoft.module.contract.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java new file mode 100644 index 0000000..5818817 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java @@ -0,0 +1,104 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngPointVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + private String pointUpCode; + + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java new file mode 100644 index 0000000..7b57daa --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngQtyVo.java @@ -0,0 +1,174 @@ +package com.xjrsoft.module.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngQtyVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + private Long kId; + + + /** + * 开始日期(需要校验周期) + */ + @ApiModelProperty("开始日期(需要校验周期)") + private LocalDateTime dateFrom; + + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + private LocalDateTime dateTo; + + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + private Integer sort; + + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + private String baseInc; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + private BigDecimal qtyGjMonth; + + + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + private BigDecimal qtyM3Month; + + + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + private BigDecimal qtyGjDay; + + + /** + * 日气量(方)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + private BigDecimal qtyM3Day; + + + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/M3-方/GJ-吉焦)") + private String zfbyTypeCode; + + + /** + * 照付不议比例%/量数值 + */ + @ApiModelProperty("照付不议比例%/量数值") + private BigDecimal zfbyValue; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java new file mode 100644 index 0000000..7518d57 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java @@ -0,0 +1,118 @@ +package com.xjrsoft.module.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractPurPngVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * + */ + @ApiModelProperty("") + private Long id; + + + /** + * + */ + @ApiModelProperty("") + private Long kId; + + + /** + * + */ + @ApiModelProperty("") + private String prcTypeCode; + + + /** + * + */ + @ApiModelProperty("") + private String periodTypeCode; + + + /** + * + */ + @ApiModelProperty("") + private String uomCode; + + + /** + * + */ + @ApiModelProperty("") + private String note; + + + /** + * + */ + @ApiModelProperty("") + private Long createUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime createDate; + + + /** + * + */ + @ApiModelProperty("") + private Long modifyUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime modifyDate; + + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + + /** + * + */ + @ApiModelProperty("") + private Long deptId; + + + /** + * + */ + @ApiModelProperty("") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java new file mode 100644 index 0000000..9aeb1e1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java @@ -0,0 +1,242 @@ +package com.xjrsoft.module.contract.vo; + +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +public class LngContractVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + private Long comId; + + + /** + * 合同号 + */ + @ApiModelProperty("合同号") + private String kNo; + + + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + private String kName; + + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + private String typeCode; + + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + private String onlineSign; + + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + private String cpTableName; + + + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + private String cpCode; + + + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + private String cpName; + + + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + private String kPeriod; + + + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + private LocalDateTime dateSign; + + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + private LocalDateTime dateFrom; + + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + private LocalDateTime dateTo; + + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + private LocalDateTime dateCfmFrom; + + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + private LocalDateTime dateCfmTo; + + + /** + * 币种 + */ + @ApiModelProperty("币种") + private String curCode; + + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + private String amountDesc; + + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + private Long empId; + + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + private Long bDeptId; + + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approCode; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + private List lngContractFactRelList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java new file mode 100644 index 0000000..abd43ab --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java @@ -0,0 +1,120 @@ +package com.xjrsoft.module.contract.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.contract.dto.AddLngContractDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.contract.dto.LngContractPageDto; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.service.IContractPurPngService; +import com.xjrsoft.module.contract.vo.LngContractPageVo; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.contract.vo.LngContractVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/contract" + "/contractPurPng") +@Api(value = "/contract" + "/contractPurPng",tags = "国内管道气采购代码") +@AllArgsConstructor +public class ContractPurPngController { + + + private final IContractPurPngService contractPurPngService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngContract列表(分页)") + @SaCheckPermission("contractPurPng:list") + public R page(@Valid LngContractPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngContract::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getKNo()),LngContract::getKNo,dto.getKNo()) + .like(StrUtil.isNotBlank(dto.getKName()),LngContract::getKName,dto.getKName()) + .like(StrUtil.isNotBlank(dto.getCpName()),LngContract::getCpName,dto.getCpName()) + //.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngContract::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd()) + //.between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngContract::getDateTo,dto.getDateToStart(),dto.getDateToEnd()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngContract::getApproCode,dto.getApproCode()) + .like(StrUtil.isNotBlank(dto.getCpTableName()),LngContract::getCpTableName,dto.getCpTableName()) + .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngContract::getOnlineSign,dto.getOnlineSign()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngContract::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getNote()),LngContract::getNote,dto.getNote()) + .orderByDesc(LngContract::getId) + .select(LngContract.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPageVo.class).contains(x.getProperty())); + IPage page = contractPurPngService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngContract信息") + @SaCheckPermission("contractPurPng:detail") + public R info(@RequestParam Long id){ + LngContract lngContract = contractPurPngService.getByIdDeep(id); + if (lngContract == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngContract, LngContractVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngContract数据详细日志") + @SaCheckPermission("contractPurPng:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngContractDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngContract") + @SaCheckPermission("contractPurPng:add") + public R add(@Valid @RequestBody UpdateLngContractDto dto){ + UpdateLngContractDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngContract") + @SaCheckPermission("contractPurPng:edit") + public R update(@Valid @RequestBody UpdateLngContractDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("contractPurPng:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngContractDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java new file mode 100644 index 0000000..8bd5174 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java @@ -0,0 +1,340 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContract implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同主体ID(天然气公司/惠贸) + */ + @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 合同号 + */ + @ApiModelProperty("合同号") + + + + private String kNo; + + /** + * 合同名称 + */ + @ApiModelProperty("合同名称") + + + + private String kName; + + /** + * 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务) + */ + @ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)") + + + + private String typeCode; + + /** + * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) + */ + @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") + + + + private String onlineSign; + + /** + * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) + */ + @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") + + + + private String cpTableName; + + /** + * 主交易对手编码 + */ + @ApiModelProperty("主交易对手编码") + + + + private String cpCode; + + /** + * 主交易对手名称 + */ + @ApiModelProperty("主交易对手名称") + + + + private String cpName; + + /** + * 合同期限 + */ + @ApiModelProperty("合同期限") + + + + private String kPeriod; + + /** + * 合同签订日期 + */ + @ApiModelProperty("合同签订日期") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateSign; + + /** + * 有效期开始 + */ + @ApiModelProperty("有效期开始") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 有效期结束 + */ + @ApiModelProperty("有效期结束") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 确认函开始日 + */ + @ApiModelProperty("确认函开始日") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateCfmFrom; + + /** + * 确认函结束日 + */ + @ApiModelProperty("确认函结束日") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateCfmTo; + + /** + * 币种 + */ + @ApiModelProperty("币种") + + + + private String curCode; + + /** + * 合同金额 + */ + @ApiModelProperty("合同金额") + + + + private String amountDesc; + + /** + * 我方联系人 + */ + @ApiModelProperty("我方联系人") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long empId; + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long bDeptId; + + /** + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + + + + private String approCode; + + /** + * 备注 + */ + @ApiModelProperty("备注") + + + + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + /** + * lngContractPurPng + */ + @ApiModelProperty("lngContractPurPng子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + private List lngContractPurPngList; + /** + * lngContractPurPngPoint + */ + @ApiModelProperty("lngContractPurPngPoint子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + private List lngContractPurPngPointList; + /** + * lngContractPurPngQty + */ + @ApiModelProperty("lngContractPurPngQty子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + private List lngContractPurPngQtyList; + /** + * lngContractApproRel + */ + @ApiModelProperty("lngContractApproRel子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "tableId") + private List lngContractApproRelList; + /** + * lngContractFactRel + */ + @ApiModelProperty("lngContractFactRel子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "kId") + private List lngContractFactRelList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java new file mode 100644 index 0000000..ccd224b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java @@ -0,0 +1,147 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_fact_rel") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractFactRel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同-档案主键(关联时写入) + */ + @ApiModelProperty("合同-档案主键(关联时写入)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 合同-合同系统主键(关联时写入) + */ + @ApiModelProperty("合同-合同系统主键(关联时写入)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kFactId; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java new file mode 100644 index 0000000..1030435 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java @@ -0,0 +1,163 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_pur_png") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPurPng implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * + */ + @ApiModelProperty("") + + + + private String prcTypeCode; + + /** + * + */ + @ApiModelProperty("") + + + + private String periodTypeCode; + + /** + * + */ + @ApiModelProperty("") + + + + private String uomCode; + + /** + * + */ + @ApiModelProperty("") + + + + private String note; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * + */ + @ApiModelProperty("") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java new file mode 100644 index 0000000..d1036f7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngPoint.java @@ -0,0 +1,154 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_pur_png_point") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPurPngPoint implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 上载点编码 + */ + @ApiModelProperty("上载点编码") + + + + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + + + + private String transSign; + + /** + * 备注 + */ + @ApiModelProperty("备注") + + + + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngQty.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngQty.java new file mode 100644 index 0000000..f3f83ac --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPngQty.java @@ -0,0 +1,244 @@ +package com.xjrsoft.module.contract.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 国内管道气采购 +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Data +@TableName("lng_contract_pur_png_qty") +@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") +public class LngContractPurPngQty implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 合同-档案主键 + */ + @ApiModelProperty("合同-档案主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 开始日期(需要校验周期) + */ + @ApiModelProperty("开始日期(需要校验周期)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结束日期 + */ + @ApiModelProperty("结束日期") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 优先级(必须录入) + */ + @ApiModelProperty("优先级(必须录入)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Integer sort; + + /** + * 基础量/增量(基础量/增量1/增量2) + */ + @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") + + + + private String baseInc; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000) + */ + @ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGjMonth; + + /** + * 月气量(方)(qty_gj_month*1000/rate_m3_gj) + */ + @ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3Month; + + /** + * 日气量(吉焦)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGjDay; + + /** + * 日气量(方)(根据当月天数自动计算) + */ + @ApiModelProperty("日气量(方)(根据当月天数自动计算)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3Day; + + /** + * 照付不议类型(P-比例/M3-方/GJ-吉焦) + */ + @ApiModelProperty("照付不议类型(P-比例/M3-方/GJ-吉焦)") + + + + private String zfbyTypeCode; + + /** + * 照付不议比例%/量数值 + */ + @ApiModelProperty("照付不议比例%/量数值") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal zfbyValue; + + /** + * 备注 + */ + @ApiModelProperty("备注") + + + + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + + + + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + + + + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java new file mode 100644 index 0000000..dc303d3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContractFactRel; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractFactRelMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java new file mode 100644 index 0000000..f07d334 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContract; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java new file mode 100644 index 0000000..fbcf416 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContractPurPng; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java new file mode 100644 index 0000000..aeb7788 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngPointMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java new file mode 100644 index 0000000..54cc961 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.contract.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Mapper +public interface LngContractPurPngQtyMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java new file mode 100644 index 0000000..80ed4f9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java @@ -0,0 +1,42 @@ +package com.xjrsoft.module.contract.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.contract.entity.LngContract; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ + +public interface IContractPurPngService extends MPJBaseService, MPJDeepService, MPJRelationService { + /** + * 新增 + * + * @param lngContract + * @return + */ + Boolean add(LngContract lngContract); + + /** + * 更新 + * + * @param lngContract + * @return + */ + Boolean update(LngContract lngContract); + + /** + * 删除 + * + * @param ids + * @return + */ + Boolean delete(List ids); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java new file mode 100644 index 0000000..173af26 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java @@ -0,0 +1,238 @@ +package com.xjrsoft.module.contract.service.impl; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.entity.LngContractApproRel; +import com.xjrsoft.module.contract.entity.LngContractFactRel; +import com.xjrsoft.module.contract.entity.LngContractPurPng; +import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; +import com.xjrsoft.module.contract.mapper.LngContractApproRelMapper; +import com.xjrsoft.module.contract.mapper.LngContractFactRelMapper; +import com.xjrsoft.module.contract.mapper.LngContractMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngPointMapper; +import com.xjrsoft.module.contract.mapper.LngContractPurPngQtyMapper; +import com.xjrsoft.module.contract.service.IContractPurPngService; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-12-30 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ContractPurPngServiceImpl extends MPJBaseServiceImpl implements IContractPurPngService { + private final LngContractMapper contractPurPngLngContractMapper; + + private final LngContractPurPngMapper contractPurPngLngContractPurPngMapper; + private final LngContractPurPngPointMapper contractPurPngLngContractPurPngPointMapper; + private final LngContractPurPngQtyMapper contractPurPngLngContractPurPngQtyMapper; + private final LngContractApproRelMapper contractPurPngLngContractApproRelMapper; + private final LngContractFactRelMapper contractPurPngLngContractFactRelMapper; + + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean add(LngContract lngContract) { + contractPurPngLngContractMapper.insert(lngContract); + for (LngContractPurPng lngContractPurPng : lngContract.getLngContractPurPngList()) { + lngContractPurPng.setKId(lngContract.getId()); + contractPurPngLngContractPurPngMapper.insert(lngContractPurPng); + } + for (LngContractPurPngPoint lngContractPurPngPoint : lngContract.getLngContractPurPngPointList()) { + lngContractPurPngPoint.setKId(lngContract.getId()); + contractPurPngLngContractPurPngPointMapper.insert(lngContractPurPngPoint); + } + for (LngContractPurPngQty lngContractPurPngQty : lngContract.getLngContractPurPngQtyList()) { + lngContractPurPngQty.setKId(lngContract.getId()); + contractPurPngLngContractPurPngQtyMapper.insert(lngContractPurPngQty); + } + for (LngContractApproRel lngContractApproRel : lngContract.getLngContractApproRelList()) { + lngContractApproRel.setTableId(lngContract.getId()); + contractPurPngLngContractApproRelMapper.insert(lngContractApproRel); + } + for (LngContractFactRel lngContractFactRel : lngContract.getLngContractFactRelList()) { + lngContractFactRel.setKId(lngContract.getId()); + contractPurPngLngContractFactRelMapper.insert(lngContractFactRel); + } + + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean update(LngContract lngContract) { + contractPurPngLngContractMapper.updateById(lngContract); + //********************************* LngContractPurPng 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractPurPngList = contractPurPngLngContractPurPngMapper.selectList(Wrappers.lambdaQuery(LngContractPurPng.class).eq(LngContractPurPng::getKId, lngContract.getId()).select(LngContractPurPng::getId)); + List lngContractPurPngIds = lngContractPurPngList.stream().map(LngContractPurPng::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractPurPngOldIds = lngContract.getLngContractPurPngList().stream().map(LngContractPurPng::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractPurPngRemoveIds = lngContractPurPngIds.stream().filter(item -> !lngContractPurPngOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractPurPng lngContractPurPng : lngContract.getLngContractPurPngList()) { + //如果不等于空则修改 + if (lngContractPurPng.getId() != null) { + contractPurPngLngContractPurPngMapper.updateById(lngContractPurPng); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractPurPng.setKId(lngContract.getId()); + contractPurPngLngContractPurPngMapper.insert(lngContractPurPng); + } + } + //已经不存在的id 删除 + if(lngContractPurPngRemoveIds.size() > 0){ + contractPurPngLngContractPurPngMapper.deleteBatchIds(lngContractPurPngRemoveIds); + } + } + //********************************* LngContractPurPng 增删改 结束 *******************************************/ + + //********************************* LngContractPurPngPoint 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractPurPngPointList = contractPurPngLngContractPurPngPointMapper.selectList(Wrappers.lambdaQuery(LngContractPurPngPoint.class).eq(LngContractPurPngPoint::getKId, lngContract.getId()).select(LngContractPurPngPoint::getId)); + List lngContractPurPngPointIds = lngContractPurPngPointList.stream().map(LngContractPurPngPoint::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractPurPngPointOldIds = lngContract.getLngContractPurPngPointList().stream().map(LngContractPurPngPoint::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractPurPngPointRemoveIds = lngContractPurPngPointIds.stream().filter(item -> !lngContractPurPngPointOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractPurPngPoint lngContractPurPngPoint : lngContract.getLngContractPurPngPointList()) { + //如果不等于空则修改 + if (lngContractPurPngPoint.getId() != null) { + contractPurPngLngContractPurPngPointMapper.updateById(lngContractPurPngPoint); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractPurPngPoint.setKId(lngContract.getId()); + contractPurPngLngContractPurPngPointMapper.insert(lngContractPurPngPoint); + } + } + //已经不存在的id 删除 + if(lngContractPurPngPointRemoveIds.size() > 0){ + contractPurPngLngContractPurPngPointMapper.deleteBatchIds(lngContractPurPngPointRemoveIds); + } + } + //********************************* LngContractPurPngPoint 增删改 结束 *******************************************/ + + //********************************* LngContractPurPngQty 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractPurPngQtyList = contractPurPngLngContractPurPngQtyMapper.selectList(Wrappers.lambdaQuery(LngContractPurPngQty.class).eq(LngContractPurPngQty::getKId, lngContract.getId()).select(LngContractPurPngQty::getId)); + List lngContractPurPngQtyIds = lngContractPurPngQtyList.stream().map(LngContractPurPngQty::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractPurPngQtyOldIds = lngContract.getLngContractPurPngQtyList().stream().map(LngContractPurPngQty::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractPurPngQtyRemoveIds = lngContractPurPngQtyIds.stream().filter(item -> !lngContractPurPngQtyOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractPurPngQty lngContractPurPngQty : lngContract.getLngContractPurPngQtyList()) { + //如果不等于空则修改 + if (lngContractPurPngQty.getId() != null) { + contractPurPngLngContractPurPngQtyMapper.updateById(lngContractPurPngQty); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractPurPngQty.setKId(lngContract.getId()); + contractPurPngLngContractPurPngQtyMapper.insert(lngContractPurPngQty); + } + } + //已经不存在的id 删除 + if(lngContractPurPngQtyRemoveIds.size() > 0){ + contractPurPngLngContractPurPngQtyMapper.deleteBatchIds(lngContractPurPngQtyRemoveIds); + } + } + //********************************* LngContractPurPngQty 增删改 结束 *******************************************/ + + //********************************* LngContractApproRel 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractApproRelList = contractPurPngLngContractApproRelMapper.selectList(Wrappers.lambdaQuery(LngContractApproRel.class).eq(LngContractApproRel::getTableId, lngContract.getId()).select(LngContractApproRel::getId)); + List lngContractApproRelIds = lngContractApproRelList.stream().map(LngContractApproRel::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractApproRelOldIds = lngContract.getLngContractApproRelList().stream().map(LngContractApproRel::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractApproRelRemoveIds = lngContractApproRelIds.stream().filter(item -> !lngContractApproRelOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractApproRel lngContractApproRel : lngContract.getLngContractApproRelList()) { + //如果不等于空则修改 + if (lngContractApproRel.getId() != null) { + contractPurPngLngContractApproRelMapper.updateById(lngContractApproRel); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractApproRel.setTableId(lngContract.getId()); + contractPurPngLngContractApproRelMapper.insert(lngContractApproRel); + } + } + //已经不存在的id 删除 + if(lngContractApproRelRemoveIds.size() > 0){ + contractPurPngLngContractApproRelMapper.deleteBatchIds(lngContractApproRelRemoveIds); + } + } + //********************************* LngContractApproRel 增删改 结束 *******************************************/ + + //********************************* LngContractFactRel 增删改 开始 *******************************************/ + { + // 查出所有子级的id + List lngContractFactRelList = contractPurPngLngContractFactRelMapper.selectList(Wrappers.lambdaQuery(LngContractFactRel.class).eq(LngContractFactRel::getKId, lngContract.getId()).select(LngContractFactRel::getId)); + List lngContractFactRelIds = lngContractFactRelList.stream().map(LngContractFactRel::getId).collect(Collectors.toList()); + //原有子表单 没有被删除的主键 + List lngContractFactRelOldIds = lngContract.getLngContractFactRelList().stream().map(LngContractFactRel::getId).filter(Objects::nonNull).collect(Collectors.toList()); + //找到需要删除的id + List lngContractFactRelRemoveIds = lngContractFactRelIds.stream().filter(item -> !lngContractFactRelOldIds.contains(item)).collect(Collectors.toList()); + + for (LngContractFactRel lngContractFactRel : lngContract.getLngContractFactRelList()) { + //如果不等于空则修改 + if (lngContractFactRel.getId() != null) { + contractPurPngLngContractFactRelMapper.updateById(lngContractFactRel); + } + //如果等于空 则新增 + else { + //已经不存在的id 删除 + lngContractFactRel.setKId(lngContract.getId()); + contractPurPngLngContractFactRelMapper.insert(lngContractFactRel); + } + } + //已经不存在的id 删除 + if(lngContractFactRelRemoveIds.size() > 0){ + contractPurPngLngContractFactRelMapper.deleteBatchIds(lngContractFactRelRemoveIds); + } + } + //********************************* LngContractFactRel 增删改 结束 *******************************************/ + + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(List ids) { + contractPurPngLngContractMapper.deleteBatchIds(ids); + contractPurPngLngContractPurPngMapper.delete(Wrappers.lambdaQuery(LngContractPurPng.class).in(LngContractPurPng::getKId, ids)); + contractPurPngLngContractPurPngPointMapper.delete(Wrappers.lambdaQuery(LngContractPurPngPoint.class).in(LngContractPurPngPoint::getKId, ids)); + contractPurPngLngContractPurPngQtyMapper.delete(Wrappers.lambdaQuery(LngContractPurPngQty.class).in(LngContractPurPngQty::getKId, ids)); + contractPurPngLngContractApproRelMapper.delete(Wrappers.lambdaQuery(LngContractApproRel.class).in(LngContractApproRel::getTableId, ids)); + contractPurPngLngContractFactRelMapper.delete(Wrappers.lambdaQuery(LngContractFactRel.class).in(LngContractFactRel::getKId, ids)); + + return true; + } +} From e7d0f4b1675c449df8de4cce10a0815ab1fd8d26 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Wed, 31 Dec 2025 10:43:46 +0800 Subject: [PATCH 3/5] update --- ...ractDto.java => AddLngContractPurDto.java} | 2 +- ...tDto.java => UpdateLngContractPurDto.java} | 2 +- ...tPageVo.java => LngContractPurPageVo.java} | 11 +- ...gContractVo.java => LngContractPurVo.java} | 2 +- .../controller/ContractPurPngController.java | 96 ++++---- .../{LngContract.java => LngContractPur.java} | 5 +- .../mapper/LngContractFactRelMapper.java | 5 +- ...tMapper.java => LngContractPurMapper.java} | 4 +- .../mapper/LngContractPurPngMapper.java | 2 +- .../mapper/LngContractPurPngPointMapper.java | 4 +- .../mapper/LngContractPurPngQtyMapper.java | 5 +- .../service/IContractPurPngService.java | 28 +-- .../impl/ContractPurPngServiceImpl.java | 224 +----------------- 13 files changed, 76 insertions(+), 314 deletions(-) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/{AddLngContractDto.java => AddLngContractPurDto.java} (97%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/{UpdateLngContractDto.java => UpdateLngContractPurDto.java} (99%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/{LngContractPageVo.java => LngContractPurPageVo.java} (88%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/{LngContractVo.java => LngContractPurVo.java} (98%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/{LngContract.java => LngContractPur.java} (99%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/{LngContractMapper.java => LngContractPurMapper.java} (63%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurDto.java similarity index 97% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurDto.java index 6e194fe..39bdcb0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurDto.java @@ -19,7 +19,7 @@ import lombok.experimental.Accessors; * @Version 1.0 */ @Data -public class AddLngContractDto extends com.xjrsoft.common.model.base.BaseModel { +public class AddLngContractPurDto extends com.xjrsoft.common.model.base.BaseModel { private static final long serialVersionUID = 1L; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java similarity index 99% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java index 6f22d10..801f897 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java @@ -25,7 +25,7 @@ import lombok.Data; */ @Data @LogTable(source="lng_contract",name="国内管道气采购") -public class UpdateLngContractDto implements Serializable { +public class UpdateLngContractPurDto implements Serializable { private static final long serialVersionUID = 1L; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java similarity index 88% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java index b762777..7eeeece 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java @@ -1,15 +1,10 @@ package com.xjrsoft.module.contract.vo; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; - /** * @title: 分页列表出参 * @Author 管理员 @@ -17,7 +12,7 @@ import java.math.BigDecimal; * @Version 1.0 */ @Data -public class LngContractPageVo { +public class LngContractPurPageVo { /** * 主键 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java similarity index 98% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java index 9aeb1e1..3e896c0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java @@ -13,7 +13,7 @@ import lombok.Data; * @Version 1.0 */ @Data -public class LngContractVo extends com.xjrsoft.common.model.base.BaseModel{ +public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{ /** * 主键 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 abd43ab..2a6812e 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 @@ -1,36 +1,40 @@ package com.xjrsoft.module.contract.controller; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.contract.dto.LngContractPageDto; +import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto; +import com.xjrsoft.module.contract.entity.LngContractPur; +import com.xjrsoft.module.contract.service.IContractPurPngService; +import com.xjrsoft.module.contract.vo.LngContractPurPageVo; +import com.xjrsoft.module.contract.vo.LngContractPurVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.xjrsoft.common.page.ConventPage; -import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.model.result.R; -import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.contract.dto.AddLngContractDto; -import com.xjrsoft.module.contract.dto.UpdateLngContractDto; -import cn.dev33.satoken.annotation.SaCheckPermission; - -import com.xjrsoft.module.contract.dto.LngContractPageDto; -import com.xjrsoft.module.contract.entity.LngContract; -import com.xjrsoft.module.contract.service.IContractPurPngService; -import com.xjrsoft.module.contract.vo.LngContractPageVo; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.contract.vo.LngContractVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; /** * @title: 国内管道气采购 @@ -53,23 +57,23 @@ public class ContractPurPngController { @SaCheckPermission("contractPurPng:list") public R page(@Valid LngContractPageDto dto){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .eq(ObjectUtil.isNotNull(dto.getId()),LngContract::getId,dto.getId()) - .like(StrUtil.isNotBlank(dto.getKNo()),LngContract::getKNo,dto.getKNo()) - .like(StrUtil.isNotBlank(dto.getKName()),LngContract::getKName,dto.getKName()) - .like(StrUtil.isNotBlank(dto.getCpName()),LngContract::getCpName,dto.getCpName()) + .eq(ObjectUtil.isNotNull(dto.getId()),LngContractPur::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getKNo()),LngContractPur::getKNo,dto.getKNo()) + .like(StrUtil.isNotBlank(dto.getKName()),LngContractPur::getKName,dto.getKName()) + .like(StrUtil.isNotBlank(dto.getCpName()),LngContractPur::getCpName,dto.getCpName()) //.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngContract::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd()) //.between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngContract::getDateTo,dto.getDateToStart(),dto.getDateToEnd()) - .like(StrUtil.isNotBlank(dto.getApproCode()),LngContract::getApproCode,dto.getApproCode()) - .like(StrUtil.isNotBlank(dto.getCpTableName()),LngContract::getCpTableName,dto.getCpTableName()) - .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngContract::getOnlineSign,dto.getOnlineSign()) - .eq(ObjectUtil.isNotNull(dto.getComId()),LngContract::getComId,dto.getComId()) - .like(StrUtil.isNotBlank(dto.getNote()),LngContract::getNote,dto.getNote()) - .orderByDesc(LngContract::getId) - .select(LngContract.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPageVo.class).contains(x.getProperty())); - IPage page = contractPurPngService.page(ConventPage.getPage(dto), queryWrapper); - PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPageVo.class); + .like(StrUtil.isNotBlank(dto.getApproCode()),LngContractPur::getApproCode,dto.getApproCode()) + .like(StrUtil.isNotBlank(dto.getCpTableName()),LngContractPur::getCpTableName,dto.getCpTableName()) + .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngContractPur::getOnlineSign,dto.getOnlineSign()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngContractPur::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getNote()),LngContractPur::getNote,dto.getNote()) + .orderByDesc(LngContractPur::getId) + .select(LngContractPur.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPurPageVo.class).contains(x.getProperty())); + IPage page = contractPurPngService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPurPageVo.class); return R.ok(pageOutput); } @@ -77,18 +81,18 @@ public class ContractPurPngController { @ApiOperation(value="根据id查询LngContract信息") @SaCheckPermission("contractPurPng:detail") public R info(@RequestParam Long id){ - LngContract lngContract = contractPurPngService.getByIdDeep(id); + LngContractPur lngContract = contractPurPngService.getByIdDeep(id); if (lngContract == null) { return R.error("找不到此数据！"); } - return R.ok(BeanUtil.toBean(lngContract, LngContractVo.class)); + return R.ok(BeanUtil.toBean(lngContract, LngContractPurVo.class)); } @GetMapping(value = "/datalog") @ApiOperation(value="根据id查询LngContract数据详细日志") @SaCheckPermission("contractPurPng:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngContractDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngContractPurDto.class,id); return R.ok(logs); } @@ -96,15 +100,15 @@ public class ContractPurPngController { @PostMapping @ApiOperation(value = "新增LngContract") @SaCheckPermission("contractPurPng:add") - public R add(@Valid @RequestBody UpdateLngContractDto dto){ - UpdateLngContractDto res = dataService.insert(dto); + public R add(@Valid @RequestBody UpdateLngContractPurDto dto){ + UpdateLngContractPurDto res = dataService.insert(dto); return R.ok(res.getId()); } @PutMapping @ApiOperation(value = "修改LngContract") @SaCheckPermission("contractPurPng:edit") - public R update(@Valid @RequestBody UpdateLngContractDto dto){ + public R update(@Valid @RequestBody UpdateLngContractPurDto dto){ return R.ok(dataService.updateById(dto)); } @@ -112,7 +116,7 @@ public class ContractPurPngController { @ApiOperation(value = "删除") @SaCheckPermission("contractPurPng:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngContractDto.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/LngContract.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java similarity index 99% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java index 8bd5174..0289c33 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContract.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java @@ -27,7 +27,7 @@ import java.util.List; @Data @TableName("lng_contract") @ApiModel(value = "国内管道气采购对象", description = "国内管道气采购") -public class LngContract implements Serializable { +public class LngContractPur implements Serializable { private static final long serialVersionUID = 1L; @@ -138,9 +138,6 @@ public class LngContract implements Serializable { * 有效期开始 */ @ApiModelProperty("有效期开始") - - - @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime dateFrom; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java index dc303d3..da5b05d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java @@ -1,9 +1,10 @@ package com.xjrsoft.module.contract.mapper; +import org.apache.ibatis.annotations.Mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractFactRel; -import org.apache.ibatis.annotations.Mapper; /** * @title: mapper @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractFactRelMapper extends MPJBaseMapper { +public interface LngContractFactRelMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java similarity index 63% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java index f07d334..f961ec9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java @@ -2,7 +2,7 @@ package com.xjrsoft.module.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; -import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.entity.LngContractPur; import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractMapper extends MPJBaseMapper { +public interface LngContractPurMapper extends MPJBaseMapper, BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java index fbcf416..1fb8da7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractPurPngMapper extends MPJBaseMapper { +public interface LngContractPurPngMapper extends MPJBaseMapper , BaseMapper{ } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java index aeb7788..b17289a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngPointMapper.java @@ -3,6 +3,8 @@ package com.xjrsoft.module.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; +import com.xjrsoft.module.contract.entity.LngContractPurPngQty; + import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractPurPngPointMapper extends MPJBaseMapper { +public interface LngContractPurPngPointMapper extends MPJBaseMapper , BaseMapper{ } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java index 54cc961..0227a34 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurPngQtyMapper.java @@ -1,9 +1,10 @@ package com.xjrsoft.module.contract.mapper; +import org.apache.ibatis.annotations.Mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractPurPngQty; -import org.apache.ibatis.annotations.Mapper; /** * @title: mapper @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractPurPngQtyMapper extends MPJBaseMapper { +public interface LngContractPurPngQtyMapper extends MPJBaseMapper, BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/IContractPurPngService.java index 80ed4f9..240880b 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 @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; -import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.entity.LngContractPur; import lombok.Data; import java.util.List; @@ -15,28 +15,6 @@ import java.util.List; * @Version 1.0 */ -public interface IContractPurPngService extends MPJBaseService, MPJDeepService, MPJRelationService { - /** - * 新增 - * - * @param lngContract - * @return - */ - Boolean add(LngContract lngContract); - - /** - * 更新 - * - * @param lngContract - * @return - */ - Boolean update(LngContract lngContract); - - /** - * 删除 - * - * @param ids - * @return - */ - Boolean delete(List ids); +public interface IContractPurPngService extends MPJBaseService, MPJDeepService, MPJRelationService { + } 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 173af26..d60463e 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,26 +1,10 @@ package com.xjrsoft.module.contract.service.impl; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.contract.entity.LngContract; -import com.xjrsoft.module.contract.entity.LngContractApproRel; -import com.xjrsoft.module.contract.entity.LngContractFactRel; -import com.xjrsoft.module.contract.entity.LngContractPurPng; -import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; -import com.xjrsoft.module.contract.entity.LngContractPurPngQty; -import com.xjrsoft.module.contract.mapper.LngContractApproRelMapper; -import com.xjrsoft.module.contract.mapper.LngContractFactRelMapper; -import com.xjrsoft.module.contract.mapper.LngContractMapper; -import com.xjrsoft.module.contract.mapper.LngContractPurPngMapper; -import com.xjrsoft.module.contract.mapper.LngContractPurPngPointMapper; -import com.xjrsoft.module.contract.mapper.LngContractPurPngQtyMapper; +import com.xjrsoft.module.contract.entity.LngContractPur; +import com.xjrsoft.module.contract.mapper.LngContractPurMapper; import com.xjrsoft.module.contract.service.IContractPurPngService; import lombok.AllArgsConstructor; @@ -33,206 +17,6 @@ import lombok.AllArgsConstructor; */ @Service @AllArgsConstructor -public class ContractPurPngServiceImpl extends MPJBaseServiceImpl implements IContractPurPngService { - private final LngContractMapper contractPurPngLngContractMapper; - - private final LngContractPurPngMapper contractPurPngLngContractPurPngMapper; - private final LngContractPurPngPointMapper contractPurPngLngContractPurPngPointMapper; - private final LngContractPurPngQtyMapper contractPurPngLngContractPurPngQtyMapper; - private final LngContractApproRelMapper contractPurPngLngContractApproRelMapper; - private final LngContractFactRelMapper contractPurPngLngContractFactRelMapper; - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean add(LngContract lngContract) { - contractPurPngLngContractMapper.insert(lngContract); - for (LngContractPurPng lngContractPurPng : lngContract.getLngContractPurPngList()) { - lngContractPurPng.setKId(lngContract.getId()); - contractPurPngLngContractPurPngMapper.insert(lngContractPurPng); - } - for (LngContractPurPngPoint lngContractPurPngPoint : lngContract.getLngContractPurPngPointList()) { - lngContractPurPngPoint.setKId(lngContract.getId()); - contractPurPngLngContractPurPngPointMapper.insert(lngContractPurPngPoint); - } - for (LngContractPurPngQty lngContractPurPngQty : lngContract.getLngContractPurPngQtyList()) { - lngContractPurPngQty.setKId(lngContract.getId()); - contractPurPngLngContractPurPngQtyMapper.insert(lngContractPurPngQty); - } - for (LngContractApproRel lngContractApproRel : lngContract.getLngContractApproRelList()) { - lngContractApproRel.setTableId(lngContract.getId()); - contractPurPngLngContractApproRelMapper.insert(lngContractApproRel); - } - for (LngContractFactRel lngContractFactRel : lngContract.getLngContractFactRelList()) { - lngContractFactRel.setKId(lngContract.getId()); - contractPurPngLngContractFactRelMapper.insert(lngContractFactRel); - } - - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean update(LngContract lngContract) { - contractPurPngLngContractMapper.updateById(lngContract); - //********************************* LngContractPurPng 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngContractPurPngList = contractPurPngLngContractPurPngMapper.selectList(Wrappers.lambdaQuery(LngContractPurPng.class).eq(LngContractPurPng::getKId, lngContract.getId()).select(LngContractPurPng::getId)); - List lngContractPurPngIds = lngContractPurPngList.stream().map(LngContractPurPng::getId).collect(Collectors.toList()); - //原有子表单 没有被删除的主键 - List lngContractPurPngOldIds = lngContract.getLngContractPurPngList().stream().map(LngContractPurPng::getId).filter(Objects::nonNull).collect(Collectors.toList()); - //找到需要删除的id - List lngContractPurPngRemoveIds = lngContractPurPngIds.stream().filter(item -> !lngContractPurPngOldIds.contains(item)).collect(Collectors.toList()); - - for (LngContractPurPng lngContractPurPng : lngContract.getLngContractPurPngList()) { - //如果不等于空则修改 - if (lngContractPurPng.getId() != null) { - contractPurPngLngContractPurPngMapper.updateById(lngContractPurPng); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngContractPurPng.setKId(lngContract.getId()); - contractPurPngLngContractPurPngMapper.insert(lngContractPurPng); - } - } - //已经不存在的id 删除 - if(lngContractPurPngRemoveIds.size() > 0){ - contractPurPngLngContractPurPngMapper.deleteBatchIds(lngContractPurPngRemoveIds); - } - } - //********************************* LngContractPurPng 增删改 结束 *******************************************/ - - //********************************* LngContractPurPngPoint 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngContractPurPngPointList = contractPurPngLngContractPurPngPointMapper.selectList(Wrappers.lambdaQuery(LngContractPurPngPoint.class).eq(LngContractPurPngPoint::getKId, lngContract.getId()).select(LngContractPurPngPoint::getId)); - List lngContractPurPngPointIds = lngContractPurPngPointList.stream().map(LngContractPurPngPoint::getId).collect(Collectors.toList()); - //原有子表单 没有被删除的主键 - List lngContractPurPngPointOldIds = lngContract.getLngContractPurPngPointList().stream().map(LngContractPurPngPoint::getId).filter(Objects::nonNull).collect(Collectors.toList()); - //找到需要删除的id - List lngContractPurPngPointRemoveIds = lngContractPurPngPointIds.stream().filter(item -> !lngContractPurPngPointOldIds.contains(item)).collect(Collectors.toList()); - - for (LngContractPurPngPoint lngContractPurPngPoint : lngContract.getLngContractPurPngPointList()) { - //如果不等于空则修改 - if (lngContractPurPngPoint.getId() != null) { - contractPurPngLngContractPurPngPointMapper.updateById(lngContractPurPngPoint); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngContractPurPngPoint.setKId(lngContract.getId()); - contractPurPngLngContractPurPngPointMapper.insert(lngContractPurPngPoint); - } - } - //已经不存在的id 删除 - if(lngContractPurPngPointRemoveIds.size() > 0){ - contractPurPngLngContractPurPngPointMapper.deleteBatchIds(lngContractPurPngPointRemoveIds); - } - } - //********************************* LngContractPurPngPoint 增删改 结束 *******************************************/ - - //********************************* LngContractPurPngQty 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngContractPurPngQtyList = contractPurPngLngContractPurPngQtyMapper.selectList(Wrappers.lambdaQuery(LngContractPurPngQty.class).eq(LngContractPurPngQty::getKId, lngContract.getId()).select(LngContractPurPngQty::getId)); - List lngContractPurPngQtyIds = lngContractPurPngQtyList.stream().map(LngContractPurPngQty::getId).collect(Collectors.toList()); - //原有子表单 没有被删除的主键 - List lngContractPurPngQtyOldIds = lngContract.getLngContractPurPngQtyList().stream().map(LngContractPurPngQty::getId).filter(Objects::nonNull).collect(Collectors.toList()); - //找到需要删除的id - List lngContractPurPngQtyRemoveIds = lngContractPurPngQtyIds.stream().filter(item -> !lngContractPurPngQtyOldIds.contains(item)).collect(Collectors.toList()); - - for (LngContractPurPngQty lngContractPurPngQty : lngContract.getLngContractPurPngQtyList()) { - //如果不等于空则修改 - if (lngContractPurPngQty.getId() != null) { - contractPurPngLngContractPurPngQtyMapper.updateById(lngContractPurPngQty); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngContractPurPngQty.setKId(lngContract.getId()); - contractPurPngLngContractPurPngQtyMapper.insert(lngContractPurPngQty); - } - } - //已经不存在的id 删除 - if(lngContractPurPngQtyRemoveIds.size() > 0){ - contractPurPngLngContractPurPngQtyMapper.deleteBatchIds(lngContractPurPngQtyRemoveIds); - } - } - //********************************* LngContractPurPngQty 增删改 结束 *******************************************/ - - //********************************* LngContractApproRel 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngContractApproRelList = contractPurPngLngContractApproRelMapper.selectList(Wrappers.lambdaQuery(LngContractApproRel.class).eq(LngContractApproRel::getTableId, lngContract.getId()).select(LngContractApproRel::getId)); - List lngContractApproRelIds = lngContractApproRelList.stream().map(LngContractApproRel::getId).collect(Collectors.toList()); - //原有子表单 没有被删除的主键 - List lngContractApproRelOldIds = lngContract.getLngContractApproRelList().stream().map(LngContractApproRel::getId).filter(Objects::nonNull).collect(Collectors.toList()); - //找到需要删除的id - List lngContractApproRelRemoveIds = lngContractApproRelIds.stream().filter(item -> !lngContractApproRelOldIds.contains(item)).collect(Collectors.toList()); - - for (LngContractApproRel lngContractApproRel : lngContract.getLngContractApproRelList()) { - //如果不等于空则修改 - if (lngContractApproRel.getId() != null) { - contractPurPngLngContractApproRelMapper.updateById(lngContractApproRel); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngContractApproRel.setTableId(lngContract.getId()); - contractPurPngLngContractApproRelMapper.insert(lngContractApproRel); - } - } - //已经不存在的id 删除 - if(lngContractApproRelRemoveIds.size() > 0){ - contractPurPngLngContractApproRelMapper.deleteBatchIds(lngContractApproRelRemoveIds); - } - } - //********************************* LngContractApproRel 增删改 结束 *******************************************/ - - //********************************* LngContractFactRel 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngContractFactRelList = contractPurPngLngContractFactRelMapper.selectList(Wrappers.lambdaQuery(LngContractFactRel.class).eq(LngContractFactRel::getKId, lngContract.getId()).select(LngContractFactRel::getId)); - List lngContractFactRelIds = lngContractFactRelList.stream().map(LngContractFactRel::getId).collect(Collectors.toList()); - //原有子表单 没有被删除的主键 - List lngContractFactRelOldIds = lngContract.getLngContractFactRelList().stream().map(LngContractFactRel::getId).filter(Objects::nonNull).collect(Collectors.toList()); - //找到需要删除的id - List lngContractFactRelRemoveIds = lngContractFactRelIds.stream().filter(item -> !lngContractFactRelOldIds.contains(item)).collect(Collectors.toList()); - - for (LngContractFactRel lngContractFactRel : lngContract.getLngContractFactRelList()) { - //如果不等于空则修改 - if (lngContractFactRel.getId() != null) { - contractPurPngLngContractFactRelMapper.updateById(lngContractFactRel); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngContractFactRel.setKId(lngContract.getId()); - contractPurPngLngContractFactRelMapper.insert(lngContractFactRel); - } - } - //已经不存在的id 删除 - if(lngContractFactRelRemoveIds.size() > 0){ - contractPurPngLngContractFactRelMapper.deleteBatchIds(lngContractFactRelRemoveIds); - } - } - //********************************* LngContractFactRel 增删改 结束 *******************************************/ - - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean delete(List ids) { - contractPurPngLngContractMapper.deleteBatchIds(ids); - contractPurPngLngContractPurPngMapper.delete(Wrappers.lambdaQuery(LngContractPurPng.class).in(LngContractPurPng::getKId, ids)); - contractPurPngLngContractPurPngPointMapper.delete(Wrappers.lambdaQuery(LngContractPurPngPoint.class).in(LngContractPurPngPoint::getKId, ids)); - contractPurPngLngContractPurPngQtyMapper.delete(Wrappers.lambdaQuery(LngContractPurPngQty.class).in(LngContractPurPngQty::getKId, ids)); - contractPurPngLngContractApproRelMapper.delete(Wrappers.lambdaQuery(LngContractApproRel.class).in(LngContractApproRel::getTableId, ids)); - contractPurPngLngContractFactRelMapper.delete(Wrappers.lambdaQuery(LngContractFactRel.class).in(LngContractFactRel::getKId, ids)); - - return true; - } +public class ContractPurPngServiceImpl extends MPJBaseServiceImpl implements IContractPurPngService { + } 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 4/5] 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; + } } From 3d26c74d9a8829248e980f589b38e237fafd81f5 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Sun, 4 Jan 2026 11:37:00 +0800 Subject: [PATCH 5/5] update --- .../module/sales/vo/LngCustomerPageVo.java | 2 +- .../module/sales/vo/LngScorePageVo.java | 14 +++++--- .../module/supplier/vo/LngScorePageVo.java | 14 +++++--- .../controller/ContractPurPngController.java | 34 ++++++++++++++++--- 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java index b679e92..f301089 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java @@ -76,7 +76,7 @@ public class LngCustomerPageVo { */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") //@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") - @Trans(type = TransType.DIC, id = "1990669393069129729") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java index 7033474..eac9d2d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java @@ -59,12 +59,16 @@ public class LngScorePageVo { */ @ApiModelProperty("分数") private BigDecimal score; + /** - * 审批状态(未审批/审批中/已审批/已驳回) - */ - @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729") - private String approCode; + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + private String approCode; + + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approName; /** * 备注 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java index 5351b30..830ae09 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java @@ -59,12 +59,16 @@ public class LngScorePageVo { */ @ApiModelProperty("分数") private BigDecimal score; + /** - * 审批状态(未审批/审批中/已审批/已驳回) - */ - @ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729") - private String approCode; + * 状态(未提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + private String approCode; + + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approName; /** * 备注 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java index 11ac712..a6ff724 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 @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -24,12 +26,10 @@ import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto; import com.xjrsoft.module.contract.entity.LngContractPur; import com.xjrsoft.module.contract.service.IContractPurPngService; import com.xjrsoft.module.contract.vo.LngContractPurPageVo; -import com.xjrsoft.module.contract.vo.LngContractPurVo; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; @@ -97,15 +97,39 @@ public class ContractPurPngController { @ApiOperation(value = "新增LngContract") @SaCheckPermission("contractPurPng:add") public R add(@Valid @RequestBody UpdateLngContractPurDto dto){ - UpdateLngContractPurDto res = dataService.insert(dto); - return R.ok(res.getId()); + //UpdateLngContractPurDto res = dataService.insert(dto); + UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractPurDto after(DataOperationContent content) { + return null; + } + }); + + return R.ok(res); } @PutMapping @ApiOperation(value = "修改LngContract") @SaCheckPermission("contractPurPng:edit") public R update(@Valid @RequestBody UpdateLngContractPurDto dto){ - return R.ok(dataService.updateById(dto)); + //return R.ok(dataService.updateById(dto)); + UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractPurDto after(DataOperationContent content) { + return null; + } + }); + return R.ok(res); } @DeleteMapping