Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@ -0,0 +1,60 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
import java.io.Serializable;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngContractProcDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-档案主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
/**
|
||||
* 气源地
|
||||
*/
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
/**
|
||||
* 超期存储费说明
|
||||
*/
|
||||
@ApiModelProperty("超期存储费说明")
|
||||
private String periodDesc;
|
||||
/**
|
||||
* 损耗说明
|
||||
*/
|
||||
@ApiModelProperty("损耗说明")
|
||||
private String wasteDesc;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
import java.io.Serializable;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngContractTransPngDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-档案主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
/**
|
||||
* 交割点
|
||||
*/
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
/**
|
||||
* 路径(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("路径(隐藏)")
|
||||
private String routing;
|
||||
/**
|
||||
* 计量单位(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("计量单位(隐藏)")
|
||||
private String uomCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngPriceProcDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
/**
|
||||
* 服务商编码(惠州接收站/阳江接收站)
|
||||
*/
|
||||
@ApiModelProperty("服务商编码(惠州接收站/阳江接收站)")
|
||||
private String suCode;
|
||||
/**
|
||||
* 气源地
|
||||
*/
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngPriceTransPngDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
/**
|
||||
* 托运商编码(管道公司/管网)
|
||||
*/
|
||||
@ApiModelProperty("托运商编码(管道公司/管网)")
|
||||
private String suCode;
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
}
|
||||
@ -0,0 +1,228 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="加工合同")
|
||||
public class UpdateLngContractPDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同主体ID(天然气公司/惠贸)
|
||||
*/
|
||||
@LogField(name="合同主体ID",index=1)
|
||||
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@LogField(name="合同号",index=2)
|
||||
@ApiModelProperty("合同号")
|
||||
private String kNo;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@LogField(name="合同名称",index=3)
|
||||
@ApiModelProperty("合同名称")
|
||||
private String kName;
|
||||
|
||||
/**
|
||||
* 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)
|
||||
*/
|
||||
@LogField(name="业务类型",index=4)
|
||||
@ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)")
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)
|
||||
*/
|
||||
@LogField(name="是否线上(竞拍)合同",index=5)
|
||||
@ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)")
|
||||
private String onlineSign;
|
||||
|
||||
/**
|
||||
* 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)
|
||||
*/
|
||||
@LogField(name="交易对手类型",index=6)
|
||||
@ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)")
|
||||
private String cpTableName;
|
||||
|
||||
/**
|
||||
* 主交易对手编码
|
||||
*/
|
||||
@LogField(name="主交易对手编码",index=7)
|
||||
@ApiModelProperty("主交易对手编码")
|
||||
private String cpCode;
|
||||
|
||||
/**
|
||||
* 主交易对手名称
|
||||
*/
|
||||
@LogField(name="主交易对手名称",index=8)
|
||||
@ApiModelProperty("主交易对手名称")
|
||||
private String cpName;
|
||||
|
||||
/**
|
||||
* 合同期限
|
||||
*/
|
||||
@LogField(name="合同期限",index=9)
|
||||
@ApiModelProperty("合同期限")
|
||||
private String kPeriod;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@LogField(name="合同签订日期",index=10)
|
||||
@ApiModelProperty("合同签订日期")
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@LogField(name="有效期开始",index=11)
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@LogField(name="有效期结束",index=12)
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 确认函开始日
|
||||
*/
|
||||
@LogField(name="确认函开始日",index=13)
|
||||
@ApiModelProperty("确认函开始日")
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
/**
|
||||
* 确认函结束日
|
||||
*/
|
||||
@LogField(name="确认函结束日",index=14)
|
||||
@ApiModelProperty("确认函结束日")
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
/**
|
||||
* 币种
|
||||
*/
|
||||
@LogField(name="币种",index=15)
|
||||
@ApiModelProperty("币种")
|
||||
private String curCode;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@LogField(name="合同金额",index=16)
|
||||
@ApiModelProperty("合同金额")
|
||||
private String amountDesc;
|
||||
|
||||
/**
|
||||
* 我方联系人
|
||||
*/
|
||||
@LogField(name="我方联系人",index=17)
|
||||
@ApiModelProperty("我方联系人")
|
||||
private Long empId;
|
||||
|
||||
/**
|
||||
* 业务部门ID
|
||||
*/
|
||||
@LogField(name="业务部门ID",index=18)
|
||||
@ApiModelProperty("业务部门ID")
|
||||
private Long bDeptId;
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@LogField(name="状态",index=19)
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=20)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractProc
|
||||
*/
|
||||
@ApiModelProperty("lngContractProc子表")
|
||||
@LogJoin(name = "lngContractProc子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractProcDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractProcDto> lngContractProcList;
|
||||
/**
|
||||
* lngPriceProc
|
||||
*/
|
||||
@ApiModelProperty("lngPriceProc子表")
|
||||
@LogJoin(name = "lngPriceProc子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPriceProcDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPriceProcDto> lngPriceProcList;
|
||||
/**
|
||||
* lngContractFactRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractFactRel子表")
|
||||
@LogJoin(name = "lngContractFactRel子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractFactRelDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractFactRelDto> lngContractFactRelList;
|
||||
/**
|
||||
* lngContractApproRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractApproRel子表")
|
||||
@LogJoin(name = "lngContractApproRel子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractApproRelDto> lngContractApproRelList;
|
||||
|
||||
/**
|
||||
* lngFileUpload
|
||||
*/
|
||||
@ApiModelProperty("lngFileUpload子表")
|
||||
@LogAttrField
|
||||
private List<UpdateLngFileUploadDto> lngFileUploadList;
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_proc",name="加工合同")
|
||||
public class UpdateLngContractProcDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-档案主键(lng_contract.id)
|
||||
*/
|
||||
@LogField(name="合同-档案主键",index=1)
|
||||
@ApiModelProperty("合同-档案主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 气源地
|
||||
*/
|
||||
@LogField(name="气源地",index=2)
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
|
||||
/**
|
||||
* 超期存储费说明
|
||||
*/
|
||||
@LogField(name="超期存储费说明",index=3)
|
||||
@ApiModelProperty("超期存储费说明")
|
||||
private String periodDesc;
|
||||
|
||||
/**
|
||||
* 损耗说明
|
||||
*/
|
||||
@LogField(name="损耗说明",index=4)
|
||||
@ApiModelProperty("损耗说明")
|
||||
private String wasteDesc;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=5)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=6)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,228 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="管输合同")
|
||||
public class UpdateLngContractTPDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同主体ID(天然气公司/惠贸)
|
||||
*/
|
||||
@LogField(name="合同主体ID",index=1)
|
||||
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@LogField(name="合同号",index=2)
|
||||
@ApiModelProperty("合同号")
|
||||
private String kNo;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@LogField(name="合同名称",index=3)
|
||||
@ApiModelProperty("合同名称")
|
||||
private String kName;
|
||||
|
||||
/**
|
||||
* 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)
|
||||
*/
|
||||
@LogField(name="业务类型",index=4)
|
||||
@ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)")
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)
|
||||
*/
|
||||
@LogField(name="是否线上(竞拍)合同",index=5)
|
||||
@ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)")
|
||||
private String onlineSign;
|
||||
|
||||
/**
|
||||
* 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)
|
||||
*/
|
||||
@LogField(name="交易对手类型",index=6)
|
||||
@ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)")
|
||||
private String cpTableName;
|
||||
|
||||
/**
|
||||
* 主交易对手编码
|
||||
*/
|
||||
@LogField(name="主交易对手编码",index=7)
|
||||
@ApiModelProperty("主交易对手编码")
|
||||
private String cpCode;
|
||||
|
||||
/**
|
||||
* 主交易对手名称
|
||||
*/
|
||||
@LogField(name="主交易对手名称",index=8)
|
||||
@ApiModelProperty("主交易对手名称")
|
||||
private String cpName;
|
||||
|
||||
/**
|
||||
* 合同期限
|
||||
*/
|
||||
@LogField(name="合同期限",index=9)
|
||||
@ApiModelProperty("合同期限")
|
||||
private String kPeriod;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@LogField(name="合同签订日期",index=10)
|
||||
@ApiModelProperty("合同签订日期")
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@LogField(name="有效期开始",index=11)
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@LogField(name="有效期结束",index=12)
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 确认函开始日
|
||||
*/
|
||||
@LogField(name="确认函开始日",index=13)
|
||||
@ApiModelProperty("确认函开始日")
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
/**
|
||||
* 确认函结束日
|
||||
*/
|
||||
@LogField(name="确认函结束日",index=14)
|
||||
@ApiModelProperty("确认函结束日")
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
/**
|
||||
* 币种
|
||||
*/
|
||||
@LogField(name="币种",index=15)
|
||||
@ApiModelProperty("币种")
|
||||
private String curCode;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@LogField(name="合同金额",index=16)
|
||||
@ApiModelProperty("合同金额")
|
||||
private String amountDesc;
|
||||
|
||||
/**
|
||||
* 我方联系人
|
||||
*/
|
||||
@LogField(name="我方联系人",index=17)
|
||||
@ApiModelProperty("我方联系人")
|
||||
private Long empId;
|
||||
|
||||
/**
|
||||
* 业务部门ID
|
||||
*/
|
||||
@LogField(name="业务部门ID",index=18)
|
||||
@ApiModelProperty("业务部门ID")
|
||||
private Long bDeptId;
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@LogField(name="状态",index=19)
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=20)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngContractTransPng子表")
|
||||
@LogJoin(name = "lngContractTransPng子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractTransPngDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractTransPngDto> lngContractTransPngList;
|
||||
/**
|
||||
* lngPriceTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngPriceTransPng子表")
|
||||
@LogJoin(name = "lngPriceTransPng子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPriceTransPngDto> lngPriceTransPngList;
|
||||
/**
|
||||
* lngContractFactRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractFactRel子表")
|
||||
@LogJoin(name = "lngContractFactRel子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractFactRelDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractFactRelDto> lngContractFactRelList;
|
||||
/**
|
||||
* lngContractApproRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractApproRel子表")
|
||||
@LogJoin(name = "lngContractApproRel子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractApproRelDto> lngContractApproRelList;
|
||||
|
||||
/**
|
||||
* lngFileUpload
|
||||
*/
|
||||
@ApiModelProperty("lngFileUpload子表")
|
||||
@LogAttrField
|
||||
private List<UpdateLngFileUploadDto> lngFileUploadList;
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_trans_png",name="管输合同")
|
||||
public class UpdateLngContractTransPngDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-档案主键(lng_contract.id)
|
||||
*/
|
||||
@LogField(name="合同-档案主键",index=1)
|
||||
@ApiModelProperty("合同-档案主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@LogField(name="上载点",index=2)
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 交割点
|
||||
*/
|
||||
@LogField(name="交割点",index=3)
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
|
||||
/**
|
||||
* 路径(隐藏)
|
||||
*/
|
||||
@LogField(name="路径",index=4)
|
||||
@ApiModelProperty("路径(隐藏)")
|
||||
private String routing;
|
||||
|
||||
/**
|
||||
* 计量单位(隐藏)
|
||||
*/
|
||||
@LogField(name="计量单位",index=5)
|
||||
@ApiModelProperty("计量单位(隐藏)")
|
||||
private String uomCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=6)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
private Boolean hasDel = false;
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_price_proc",name="加工合同")
|
||||
public class UpdateLngPriceProcDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@LogField(name="合同-主信息主键",index=1)
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@LogField(name="公司编码",index=2)
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
|
||||
/**
|
||||
* 服务商编码(惠州接收站/阳江接收站)
|
||||
*/
|
||||
@LogField(name="服务商编码",index=3)
|
||||
@ApiModelProperty("服务商编码(惠州接收站/阳江接收站)")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 气源地
|
||||
*/
|
||||
@LogField(name="气源地",index=4)
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@LogField(name="有效期开始",index=5)
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@LogField(name="结束日类型",index=6)
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@LogField(name="固定结束日",index=7)
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@LogField(name="每年结束日",index=8)
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=9)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=10)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_price_trans_png",name="管输合同")
|
||||
public class UpdateLngPriceTransPngDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@LogField(name="合同-主信息主键",index=1)
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@LogField(name="公司编码",index=2)
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
|
||||
/**
|
||||
* 托运商编码(管道公司/管网)
|
||||
*/
|
||||
@LogField(name="托运商编码",index=3)
|
||||
@ApiModelProperty("托运商编码(管道公司/管网)")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@LogField(name="有效期开始",index=4)
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@LogField(name="结束日类型",index=5)
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@LogField(name="固定结束日",index=6)
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@LogField(name="每年结束日",index=7)
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=8)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=9)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,266 @@
|
||||
package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import com.xjrsoft.common.annotation.Trans;
|
||||
import com.xjrsoft.common.enums.TransType;
|
||||
import com.xjrsoft.module.sales.vo.LngApproVo;
|
||||
import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngContractPVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同主体ID(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
|
||||
@Trans(type = TransType.DEPT, transToFieldName = "comName")
|
||||
private Long comId;
|
||||
|
||||
private String comName;
|
||||
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@ApiModelProperty("合同号")
|
||||
private String kNo;
|
||||
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@ApiModelProperty("合同名称")
|
||||
private String kName;
|
||||
|
||||
|
||||
/**
|
||||
* 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)
|
||||
*/
|
||||
@ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)")
|
||||
private String typeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)
|
||||
*/
|
||||
@ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)")
|
||||
private String onlineSign;
|
||||
|
||||
|
||||
/**
|
||||
* 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)
|
||||
*/
|
||||
@ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)")
|
||||
private String cpTableName;
|
||||
|
||||
|
||||
/**
|
||||
* 主交易对手编码
|
||||
*/
|
||||
@ApiModelProperty("主交易对手编码")
|
||||
private String cpCode;
|
||||
|
||||
|
||||
/**
|
||||
* 主交易对手名称
|
||||
*/
|
||||
@ApiModelProperty("主交易对手名称")
|
||||
private String cpName;
|
||||
|
||||
|
||||
/**
|
||||
* 合同期限
|
||||
*/
|
||||
@ApiModelProperty("合同期限")
|
||||
private String kPeriod;
|
||||
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@ApiModelProperty("合同签订日期")
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
/**
|
||||
* 确认函开始日
|
||||
*/
|
||||
@ApiModelProperty("确认函开始日")
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 确认函结束日
|
||||
*/
|
||||
@ApiModelProperty("确认函结束日")
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
|
||||
/**
|
||||
* 币种
|
||||
*/
|
||||
@ApiModelProperty("币种")
|
||||
@Trans(type = TransType.CURRENCY, transToFieldName = "curName")
|
||||
private String curCode;
|
||||
private String curName;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@ApiModelProperty("合同金额")
|
||||
private String amountDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 我方联系人
|
||||
*/
|
||||
@ApiModelProperty("我方联系人")
|
||||
@Trans(type = TransType.USER, transToFieldName = "empName")
|
||||
private Long empId;
|
||||
private String empName;
|
||||
|
||||
|
||||
/**
|
||||
* 业务部门ID
|
||||
*/
|
||||
@ApiModelProperty("业务部门ID")
|
||||
@Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
|
||||
private Long bDeptId;
|
||||
private String bDeptName;
|
||||
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
private Long createUserId;
|
||||
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
private LocalDateTime createDate;
|
||||
|
||||
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
private Long modifyUserId;
|
||||
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
||||
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
private Long ruleUserId;
|
||||
|
||||
/**
|
||||
* lngContractProc
|
||||
*/
|
||||
@ApiModelProperty("lngContractProc子表")
|
||||
private List<LngContractProcVo> lngContractProcList;
|
||||
/**
|
||||
* lngPriceProc
|
||||
*/
|
||||
@ApiModelProperty("lngPriceProc子表")
|
||||
private List<LngPriceProcVo> lngPriceProcList;
|
||||
/**
|
||||
* lngContractFact
|
||||
*/
|
||||
@ApiModelProperty("lngContractFac子表")
|
||||
private List<LngContractFactVo> lngContractFactList;
|
||||
/**
|
||||
* lngContractFactRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractFactRel子表")
|
||||
private List<LngContractFactRelVo> lngContractFactRelList;
|
||||
/**
|
||||
* lngApproVoList
|
||||
*/
|
||||
@ApiModelProperty("lngAppro子表")
|
||||
private List<LngApproVo> lngApproVoList;
|
||||
/**
|
||||
* lngContractApproRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractApproRel子表")
|
||||
private List<LngContractApproRelVo> lngContractApproRelList;
|
||||
/**
|
||||
* lngFileUpload
|
||||
*/
|
||||
@ApiModelProperty("lngFileUpload子表")
|
||||
private List<LngFileUploadVo> lngFileUploadList;
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngContractProcVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-档案主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 气源地
|
||||
*/
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
|
||||
|
||||
/**
|
||||
* 超期存储费说明
|
||||
*/
|
||||
@ApiModelProperty("超期存储费说明")
|
||||
private String periodDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 损耗说明
|
||||
*/
|
||||
@ApiModelProperty("损耗说明")
|
||||
private String wasteDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -0,0 +1,266 @@
|
||||
package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import com.xjrsoft.common.annotation.Trans;
|
||||
import com.xjrsoft.common.enums.TransType;
|
||||
import com.xjrsoft.module.sales.vo.LngApproVo;
|
||||
import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngContractTPVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同主体ID(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
|
||||
@Trans(type = TransType.DEPT, transToFieldName = "comName")
|
||||
private Long comId;
|
||||
|
||||
private String comName;
|
||||
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@ApiModelProperty("合同号")
|
||||
private String kNo;
|
||||
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@ApiModelProperty("合同名称")
|
||||
private String kName;
|
||||
|
||||
|
||||
/**
|
||||
* 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)
|
||||
*/
|
||||
@ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)")
|
||||
private String typeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)
|
||||
*/
|
||||
@ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)")
|
||||
private String onlineSign;
|
||||
|
||||
|
||||
/**
|
||||
* 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)
|
||||
*/
|
||||
@ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)")
|
||||
private String cpTableName;
|
||||
|
||||
|
||||
/**
|
||||
* 主交易对手编码
|
||||
*/
|
||||
@ApiModelProperty("主交易对手编码")
|
||||
private String cpCode;
|
||||
|
||||
|
||||
/**
|
||||
* 主交易对手名称
|
||||
*/
|
||||
@ApiModelProperty("主交易对手名称")
|
||||
private String cpName;
|
||||
|
||||
|
||||
/**
|
||||
* 合同期限
|
||||
*/
|
||||
@ApiModelProperty("合同期限")
|
||||
private String kPeriod;
|
||||
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@ApiModelProperty("合同签订日期")
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
/**
|
||||
* 确认函开始日
|
||||
*/
|
||||
@ApiModelProperty("确认函开始日")
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 确认函结束日
|
||||
*/
|
||||
@ApiModelProperty("确认函结束日")
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
|
||||
/**
|
||||
* 币种
|
||||
*/
|
||||
@ApiModelProperty("币种")
|
||||
@Trans(type = TransType.CURRENCY, transToFieldName = "curName")
|
||||
private String curCode;
|
||||
private String curName;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@ApiModelProperty("合同金额")
|
||||
private String amountDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 我方联系人
|
||||
*/
|
||||
@ApiModelProperty("我方联系人")
|
||||
@Trans(type = TransType.USER, transToFieldName = "empName")
|
||||
private Long empId;
|
||||
private String empName;
|
||||
|
||||
|
||||
/**
|
||||
* 业务部门ID
|
||||
*/
|
||||
@ApiModelProperty("业务部门ID")
|
||||
@Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
|
||||
private Long bDeptId;
|
||||
private String bDeptName;
|
||||
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
private Long createUserId;
|
||||
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
private LocalDateTime createDate;
|
||||
|
||||
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
private Long modifyUserId;
|
||||
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
||||
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
private Long ruleUserId;
|
||||
|
||||
/**
|
||||
* lngContractTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngContractTransPng子表")
|
||||
private List<LngContractTransPngVo> lngContractTransPngList;
|
||||
/**
|
||||
* lngPriceTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngPriceTransPng子表")
|
||||
private List<LngPriceTransPngVo> lngPriceTransPngList;
|
||||
/**
|
||||
* lngContractFact
|
||||
*/
|
||||
@ApiModelProperty("lngContractFac子表")
|
||||
private List<LngContractFactVo> lngContractFactList;
|
||||
/**
|
||||
* lngContractFactRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractFactRel子表")
|
||||
private List<LngContractFactRelVo> lngContractFactRelList;
|
||||
/**
|
||||
* lngApproVoList
|
||||
*/
|
||||
@ApiModelProperty("lngAppro子表")
|
||||
private List<LngApproVo> lngApproVoList;
|
||||
/**
|
||||
* lngContractApproRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractApproRel子表")
|
||||
private List<LngContractApproRelVo> lngContractApproRelList;
|
||||
/**
|
||||
* lngFileUpload
|
||||
*/
|
||||
@ApiModelProperty("lngFileUpload子表")
|
||||
private List<LngFileUploadVo> lngFileUploadList;
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-档案主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
|
||||
|
||||
/**
|
||||
* 交割点
|
||||
*/
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
|
||||
|
||||
/**
|
||||
* 路径(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("路径(隐藏)")
|
||||
private String routing;
|
||||
|
||||
|
||||
/**
|
||||
* 计量单位(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("计量单位(隐藏)")
|
||||
private String uomCode;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngPriceProcVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
|
||||
|
||||
/**
|
||||
* 服务商编码(惠州接收站/阳江接收站)
|
||||
*/
|
||||
@ApiModelProperty("服务商编码(惠州接收站/阳江接收站)")
|
||||
private String suCode;
|
||||
|
||||
|
||||
/**
|
||||
* 气源地
|
||||
*/
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
|
||||
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
|
||||
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngPriceTransPngVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
|
||||
|
||||
/**
|
||||
* 托运商编码(管道公司/管网)
|
||||
*/
|
||||
@ApiModelProperty("托运商编码(管道公司/管网)")
|
||||
private String suCode;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
|
||||
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
|
||||
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
Reference in New Issue
Block a user