修改
This commit is contained in:
张秉卓
@ -0,0 +1,53 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内LNG采购合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-03-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngContractPurLngDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-档案主键
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键")
|
||||
private Long kId;
|
||||
/**
|
||||
* 长协/现货/年度合同(长协/现货/年度……)
|
||||
*/
|
||||
@ApiModelProperty("长协/现货/年度合同(长协/现货/年度……)")
|
||||
private String longSpotCode;
|
||||
/**
|
||||
* 定价机制(固定价/公式价/对标价/无)
|
||||
*/
|
||||
@ApiModelProperty("定价机制(固定价/公式价/对标价/无)")
|
||||
private String prcTypeCode;
|
||||
/**
|
||||
* 计量单位(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("计量单位(隐藏)")
|
||||
private String uomCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
}
|
||||
@ -0,0 +1,212 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
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: 国内LNG采购合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-03-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="国内LNG采购合同")
|
||||
public class UpdateLngContractPLDto extends BaseModel 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;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractPurLng
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurLng子表")
|
||||
@LogJoin(name = "lngContractPurLng子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractPurLngDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractPurLngDto> lngContractPurLngList;
|
||||
/**
|
||||
* 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,67 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内LNG采购合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-03-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_pur_lng",name="国内LNG采购合同")
|
||||
public class UpdateLngContractPurLngDto extends BaseModel 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 longSpotCode;
|
||||
|
||||
/**
|
||||
* 定价机制(固定价/公式价/对标价/无)
|
||||
*/
|
||||
@LogField(name="定价机制",index=3)
|
||||
@ApiModelProperty("定价机制(固定价/公式价/对标价/无)")
|
||||
private String prcTypeCode;
|
||||
|
||||
/**
|
||||
* 计量单位(隐藏)
|
||||
*/
|
||||
@LogField(name="计量单位",index=4)
|
||||
@ApiModelProperty("计量单位(隐藏)")
|
||||
private String uomCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=5)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -0,0 +1,262 @@
|
||||
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 LngContractPLVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@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;
|
||||
|
||||
/**
|
||||
* lngContractPurLng
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurLng子表")
|
||||
private List<LngContractPurLngVo> lngContractPurLngList;
|
||||
/**
|
||||
* 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-03-10
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngContractPurLngVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-档案主键
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 长协/现货/年度合同(长协/现货/年度……)
|
||||
*/
|
||||
@ApiModelProperty("长协/现货/年度合同(长协/现货/年度……)")
|
||||
private String longSpotCode;
|
||||
|
||||
|
||||
/**
|
||||
* 定价机制(固定价/公式价/对标价/无)
|
||||
*/
|
||||
@ApiModelProperty("定价机制(固定价/公式价/对标价/无)")
|
||||
private String prcTypeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 计量单位(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("计量单位(隐藏)")
|
||||
private String uomCode;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
Reference in New Issue
Block a user