geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
shunyi.kuang
2025-12-31 17:05:57 +08:00
parent e7d0f4b167
commit 839da1d831
13 changed files with 460 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java
View File

@ -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<UpdateLngContractPurPngDto> 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<UpdateLngContractPurPngPointDto> 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<UpdateLngContractPurPngQtyDto> 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<UpdateLngContractApproRelDto> 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<UpdateLngContractFactRelDto> lngContractFactRelList;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
@LogAttrField
private List<UpdateLngFileUploadDto> lngFileUploadList;
}

12
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointDto.java
View File

@ -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<UpdateLngContractPurPngPointSalesDto> lngContractPurPngPointSalesList;
}

94
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngPointSalesDto.java Normal file
View File

@ -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;
}

72
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointSalesVo.java Normal file
View File

@ -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;
}

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngPointVo.java
View File

@ -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<LngContractPurPngPointSalesVo> lngContractPurPngPointSalesList;
}

11
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java
View File

@ -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<LngContractPurPngQtyVo> lngContractPurPngQtyList;
/**
*
* lngContractApproRel
*/
@ApiModelProperty("lngContractApproRel子表")
@ -238,5 +242,12 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{
*/
@ApiModelProperty("lngContractFactRel子表")
private List<LngContractFactRelVo> lngContractFactRelList;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
@LogAttrField
private List<LngFileUploadVo> lngFileUploadList;
}