Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@ -0,0 +1,74 @@
|
||||
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.math.BigDecimal;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngPriceProcDtlDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
/**
|
||||
* 价格-加工服务主键(lng_price_proc.id)
|
||||
*/
|
||||
@ApiModelProperty("价格-加工服务主键(lng_price_proc.id)")
|
||||
private Long ppId;
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@ApiModelProperty("阶梯")
|
||||
private Short sort;
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
/**
|
||||
* 比值(吨/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(吨/吉焦)")
|
||||
private BigDecimal rateTonGj;
|
||||
/**
|
||||
* 阶梯气量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(吉焦)")
|
||||
private BigDecimal qtyGj;
|
||||
/**
|
||||
* 管道气加工费率(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("管道气加工费率(元/吉焦)")
|
||||
private BigDecimal pricePngGj;
|
||||
/**
|
||||
* LNG加工费率(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("LNG加工费率(元/吉焦)")
|
||||
private BigDecimal priceLngGj;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
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.math.BigDecimal;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class AddLngPriceTransPngDtlDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
/**
|
||||
* 价格-管输主键(lng_price_trans_png.id)
|
||||
*/
|
||||
@ApiModelProperty("价格-管输主键(lng_price_trans_png.id)")
|
||||
private Long ppId;
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@ApiModelProperty("阶梯")
|
||||
private Short sort;
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
/**
|
||||
* 阶梯气量(方)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(方)")
|
||||
private BigDecimal qtyM3;
|
||||
/**
|
||||
* 阶梯气量(吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(吉焦)(隐藏)")
|
||||
private BigDecimal qtyGj;
|
||||
/**
|
||||
* 管输单价(元/方)
|
||||
*/
|
||||
@ApiModelProperty("管输单价(元/方)")
|
||||
private BigDecimal priceTransM3;
|
||||
/**
|
||||
* 管输单价(元/吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("管输单价(元/吉焦)(隐藏)")
|
||||
private BigDecimal priceTransGj;
|
||||
/**
|
||||
* 比值(方/吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)(隐藏)")
|
||||
private BigDecimal rateM3Gj;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -18,7 +19,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_appro_rel",name="合同-要素-签报-关联")
|
||||
public class UpdateLngContractApproRelDto implements Serializable {
|
||||
public class UpdateLngContractApproRelDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -56,13 +57,4 @@ public class UpdateLngContractApproRelDto implements Serializable {
|
||||
@LogField(name="显示顺序",index=4)
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=5)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
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;
|
||||
@ -19,7 +20,7 @@ import java.util.List;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="国内管道气销售")
|
||||
public class UpdateLngContractDto implements Serializable {
|
||||
public class UpdateLngContractDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -170,14 +171,6 @@ public class UpdateLngContractDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractSalesPng
|
||||
*/
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -18,7 +19,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_fact_cp",name="合同-要素管理-相对方")
|
||||
public class UpdateLngContractFactCpDto implements Serializable {
|
||||
public class UpdateLngContractFactCpDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -126,13 +127,4 @@ public class UpdateLngContractFactCpDto implements Serializable {
|
||||
@LogField(name="备注",index=14)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=15)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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;
|
||||
@ -21,7 +22,7 @@ import java.util.List;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_fact",name="合同要素")
|
||||
public class UpdateLngContractFactDto implements Serializable {
|
||||
public class UpdateLngContractFactDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -231,14 +232,6 @@ public class UpdateLngContractFactDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=29)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractFactCp
|
||||
*/
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -18,7 +19,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_fact_rel",name="国内管道气采购/销售")
|
||||
public class UpdateLngContractFactRelDto implements Serializable {
|
||||
public class UpdateLngContractFactRelDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -49,13 +50,4 @@ public class UpdateLngContractFactRelDto implements Serializable {
|
||||
@LogField(name="显示顺序",index=3)
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=4)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
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;
|
||||
@ -19,7 +20,7 @@ import java.util.List;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="加工合同")
|
||||
public class UpdateLngContractPDto implements Serializable {
|
||||
public class UpdateLngContractPDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -170,14 +171,6 @@ public class UpdateLngContractPDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractProc
|
||||
*/
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -18,7 +19,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_proc",name="加工合同")
|
||||
public class UpdateLngContractProcDto implements Serializable {
|
||||
public class UpdateLngContractProcDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -63,13 +64,4 @@ public class UpdateLngContractProcDto implements Serializable {
|
||||
@LogField(name="备注",index=5)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=6)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -12,6 +12,7 @@ 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.common.model.base.BaseModel;
|
||||
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@ -27,7 +28,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="国内管道气采购")
|
||||
public class UpdateLngContractPurDto implements Serializable {
|
||||
public class UpdateLngContractPurDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -178,14 +179,6 @@ public class UpdateLngContractPurDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractPurPng
|
||||
*/
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -19,7 +20,7 @@ import java.math.BigDecimal;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_pur_int",name="国际采购合同")
|
||||
public class UpdateLngContractPurIntDto implements Serializable {
|
||||
public class UpdateLngContractPurIntDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -253,13 +254,4 @@ public class UpdateLngContractPurIntDto implements Serializable {
|
||||
@LogField(name="备注",index=32)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=33)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_pur_png",name="国内管道气采购")
|
||||
public class UpdateLngContractPurPngDto implements Serializable {
|
||||
public class UpdateLngContractPurPngDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -74,13 +75,4 @@ public class UpdateLngContractPurPngDto implements Serializable {
|
||||
@LogField(name="",index=5)
|
||||
@ApiModelProperty("")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@LogField(name="",index=6)
|
||||
@ApiModelProperty("")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_pur_png_point",name="国内管道气采购")
|
||||
public class UpdateLngContractPurPngPointDto implements Serializable {
|
||||
public class UpdateLngContractPurPngPointDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -68,13 +69,6 @@ public class UpdateLngContractPurPngPointDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=5)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
private Boolean hasDel = false;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_pur_png_point_sales",name="国内管道气采购上载点-交割点")
|
||||
public class UpdateLngContractPurPngPointSalesDto implements Serializable {
|
||||
public class UpdateLngContractPurPngPointSalesDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -82,13 +83,4 @@ public class UpdateLngContractPurPngPointSalesDto implements Serializable {
|
||||
@LogField(name="备注",index=6)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
@ -29,7 +30,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_pur_png_qty",name="国内管道气采购")
|
||||
public class UpdateLngContractPurPngQtyDto implements Serializable {
|
||||
public class UpdateLngContractPurPngQtyDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -130,13 +131,4 @@ public class UpdateLngContractPurPngQtyDto implements Serializable {
|
||||
@LogField(name="备注",index=13)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=14)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ 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.common.model.base.BaseModel;
|
||||
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@ -28,7 +29,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="国内管道气采购")
|
||||
public class UpdateLngContractSalesDto implements Serializable {
|
||||
public class UpdateLngContractSalesDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -184,14 +185,6 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractSalesLng
|
||||
*/
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -19,7 +20,7 @@ import java.math.BigDecimal;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_int",name="国际销售合同")
|
||||
public class UpdateLngContractSalesIntDto implements Serializable {
|
||||
public class UpdateLngContractSalesIntDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -253,13 +254,4 @@ public class UpdateLngContractSalesIntDto implements Serializable {
|
||||
@LogField(name="备注",index=32)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=33)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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;
|
||||
|
||||
@ -21,7 +22,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_lng_disc",name="国内LNG销售合同")
|
||||
public class UpdateLngContractSalesLngDiscDto implements Serializable {
|
||||
public class UpdateLngContractSalesLngDiscDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -75,13 +76,4 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
|
||||
@LogField(name="备注",index=6)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
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;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_lng",name="国内LNG销售合同")
|
||||
public class UpdateLngContractSalesLngDto implements Serializable {
|
||||
public class UpdateLngContractSalesLngDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -71,13 +71,4 @@ public class UpdateLngContractSalesLngDto implements Serializable {
|
||||
@LogField(name="备注",index=6)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_lng_qty",name="国内LNG销售合同")
|
||||
public class UpdateLngContractSalesLngQtyDto implements Serializable {
|
||||
public class UpdateLngContractSalesLngQtyDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -125,13 +125,4 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
|
||||
@LogField(name="备注",index=13)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=14)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
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;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_lng_sta",name="国内LNG销售合同")
|
||||
public class UpdateLngContractSalesLngStaDto implements Serializable {
|
||||
public class UpdateLngContractSalesLngStaDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -50,13 +50,4 @@ public class UpdateLngContractSalesLngStaDto implements Serializable {
|
||||
@LogField(name="备注",index=3)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=4)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -18,7 +19,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_png",name="国内管道气销售")
|
||||
public class UpdateLngContractSalesPngDto implements Serializable {
|
||||
public class UpdateLngContractSalesPngDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -63,13 +64,4 @@ public class UpdateLngContractSalesPngDto implements Serializable {
|
||||
@LogField(name="备注",index=5)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=6)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -18,7 +19,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_png_point",name="国内管道气销售")
|
||||
public class UpdateLngContractSalesPngPointDto implements Serializable {
|
||||
public class UpdateLngContractSalesPngPointDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -64,12 +65,5 @@ public class UpdateLngContractSalesPngPointDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=6)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
private Boolean hasDel = false;
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ 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;
|
||||
|
||||
@ -20,7 +21,7 @@ import java.time.LocalDateTime;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_sales_png_qty",name="国内管道气销售")
|
||||
public class UpdateLngContractSalesPngQtyDto implements Serializable {
|
||||
public class UpdateLngContractSalesPngQtyDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -121,13 +122,4 @@ public class UpdateLngContractSalesPngQtyDto implements Serializable {
|
||||
@LogField(name="备注",index=13)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=14)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
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;
|
||||
@ -19,7 +20,7 @@ import java.util.List;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract",name="管输合同")
|
||||
public class UpdateLngContractTPDto implements Serializable {
|
||||
public class UpdateLngContractTPDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -170,14 +171,6 @@ public class UpdateLngContractTPDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=21)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractTransPng
|
||||
*/
|
||||
@ -189,16 +182,6 @@ public class UpdateLngContractTPDto implements Serializable {
|
||||
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子表")
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
@ -18,7 +17,7 @@ import java.io.Serializable;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_contract_trans_png",name="管输合同")
|
||||
public class UpdateLngContractTransPngDto implements Serializable {
|
||||
public class UpdateLngContractTransPngDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -71,12 +70,17 @@ public class UpdateLngContractTransPngDto implements Serializable {
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
private Boolean hasDel = false;
|
||||
|
||||
/**
|
||||
* lngPriceTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngPriceTransPng子表")
|
||||
@LogJoin(name = "lngPriceTransPng子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "ktpId", valueDirection = ValueDirectionType.RIGHT),
|
||||
@LogJoinColumn(field = "kId",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPriceTransPngDto> lngPriceTransPngList;
|
||||
}
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
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;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_price_proc_dtl",name="加工合同")
|
||||
public class UpdateLngPriceProcDtlDto extends BaseModel 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;
|
||||
|
||||
/**
|
||||
* 价格-加工服务主键(lng_price_proc.id)
|
||||
*/
|
||||
@LogField(name="价格-加工服务主键",index=2)
|
||||
@ApiModelProperty("价格-加工服务主键(lng_price_proc.id)")
|
||||
private Long ppId;
|
||||
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@LogField(name="阶梯",index=3)
|
||||
@ApiModelProperty("阶梯")
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@LogField(name="约定",index=4)
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
|
||||
/**
|
||||
* 比值(吨/吉焦)
|
||||
*/
|
||||
@LogField(name="比值",index=5)
|
||||
@ApiModelProperty("比值(吨/吉焦)")
|
||||
private BigDecimal rateTonGj;
|
||||
|
||||
/**
|
||||
* 阶梯气量(吉焦)
|
||||
*/
|
||||
@LogField(name="阶梯气量",index=6)
|
||||
@ApiModelProperty("阶梯气量(吉焦)")
|
||||
private BigDecimal qtyGj;
|
||||
|
||||
/**
|
||||
* 管道气加工费率(元/吉焦)
|
||||
*/
|
||||
@LogField(name="管道气加工费率",index=7)
|
||||
@ApiModelProperty("管道气加工费率(元/吉焦)")
|
||||
private BigDecimal pricePngGj;
|
||||
|
||||
/**
|
||||
* LNG加工费率(元/吉焦)
|
||||
*/
|
||||
@LogField(name="LNG加工费率",index=8)
|
||||
@ApiModelProperty("LNG加工费率(元/吉焦)")
|
||||
private BigDecimal priceLngGj;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=9)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -1,14 +1,13 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
@ -19,7 +18,7 @@ import java.time.LocalDateTime;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_price_proc",name="加工合同")
|
||||
public class UpdateLngPriceProcDto implements Serializable {
|
||||
public class UpdateLngPriceProcDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -42,7 +41,7 @@ public class UpdateLngPriceProcDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="公司编码",index=2)
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 服务商编码(惠州接收站/阳江接收站)
|
||||
@ -94,11 +93,15 @@ public class UpdateLngPriceProcDto implements Serializable {
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
* lngPriceProcDtl
|
||||
*/
|
||||
@LogField(name="租户id",index=10)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
@ApiModelProperty("lngPriceProcDtl子表")
|
||||
@LogJoin(name = "lngPriceProcDtl子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "ppId", valueDirection = ValueDirectionType.RIGHT),
|
||||
@LogJoinColumn(field = "kId",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPriceProcDtlDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPriceProcDtlDto> lngPriceProcDtlList;
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,103 @@
|
||||
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;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_price_trans_png_dtl",name="管输合同")
|
||||
public class UpdateLngPriceTransPngDtlDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@LogField(name="合同-主信息主键(lng_contract.id)",index=1)
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 价格-管输主键(lng_price_trans_png.id)
|
||||
*/
|
||||
@LogField(name="价格-管输主键(lng_price_trans_png.id)",index=2)
|
||||
@ApiModelProperty("价格-管输主键(lng_price_trans_png.id)")
|
||||
private Long ppId;
|
||||
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@LogField(name="阶梯",index=3)
|
||||
@ApiModelProperty("阶梯")
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@LogField(name="约定",index=4)
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
|
||||
/**
|
||||
* 阶梯气量(方)
|
||||
*/
|
||||
@LogField(name="阶梯气量(方)",index=5)
|
||||
@ApiModelProperty("阶梯气量(方)")
|
||||
private BigDecimal qtyM3;
|
||||
|
||||
/**
|
||||
* 阶梯气量(吉焦)(隐藏)
|
||||
*/
|
||||
@LogField(name="阶梯气量(吉焦)(隐藏)",index=6)
|
||||
@ApiModelProperty("阶梯气量(吉焦)(隐藏)")
|
||||
private BigDecimal qtyGj;
|
||||
|
||||
/**
|
||||
* 管输单价(元/方)
|
||||
*/
|
||||
@LogField(name="管输单价(元/方)",index=7)
|
||||
@ApiModelProperty("管输单价(元/方)")
|
||||
private BigDecimal priceTransM3;
|
||||
|
||||
/**
|
||||
* 管输单价(元/吉焦)(隐藏)
|
||||
*/
|
||||
@LogField(name="管输单价(元/吉焦)(隐藏)",index=8)
|
||||
@ApiModelProperty("管输单价(元/吉焦)(隐藏)")
|
||||
private BigDecimal priceTransGj;
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)(隐藏)
|
||||
*/
|
||||
@LogField(name="比值(方/吉焦)(隐藏)",index=9)
|
||||
@ApiModelProperty("比值(方/吉焦)(隐藏)")
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=10)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -1,14 +1,13 @@
|
||||
package com.xjrsoft.module.contract.dto;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import com.xjrsoft.common.model.base.BaseModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
@ -19,7 +18,7 @@ import java.time.LocalDateTime;
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_price_trans_png",name="管输合同")
|
||||
public class UpdateLngPriceTransPngDto implements Serializable {
|
||||
public class UpdateLngPriceTransPngDto extends BaseModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -37,61 +36,86 @@ public class UpdateLngPriceTransPngDto implements Serializable {
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-管输-上下载点主键
|
||||
*/
|
||||
@LogField(name="合同-管输-上下载点主键",index=2)
|
||||
@ApiModelProperty("合同-管输-上下载点主键")
|
||||
private Long ktpId;
|
||||
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@LogField(name="上载点",index=3)
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 交割点
|
||||
*/
|
||||
@LogField(name="交割点",index=4)
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@LogField(name="公司编码",index=2)
|
||||
@LogField(name="公司编码",index=5)
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 托运商编码(管道公司/管网)
|
||||
*/
|
||||
@LogField(name="托运商编码",index=3)
|
||||
@LogField(name="托运商编码",index=6)
|
||||
@ApiModelProperty("托运商编码(管道公司/管网)")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@LogField(name="有效期开始",index=4)
|
||||
@LogField(name="有效期开始",index=7)
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 结束日类型(F-固定日期，Y-每年)
|
||||
*/
|
||||
@LogField(name="结束日类型",index=5)
|
||||
@LogField(name="结束日类型",index=8)
|
||||
@ApiModelProperty("结束日类型(F-固定日期，Y-每年)")
|
||||
private String dateToCode;
|
||||
|
||||
/**
|
||||
* 固定结束日(date_to_code=F，必须录入，否则空着只读)
|
||||
*/
|
||||
@LogField(name="固定结束日",index=6)
|
||||
@LogField(name="固定结束日",index=9)
|
||||
@ApiModelProperty("固定结束日(date_to_code=F，必须录入，否则空着只读)")
|
||||
private LocalDateTime dateToF;
|
||||
|
||||
/**
|
||||
* 每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)
|
||||
*/
|
||||
@LogField(name="每年结束日",index=7)
|
||||
@LogField(name="每年结束日",index=10)
|
||||
@ApiModelProperty("每年结束日(date_to_code=Y，必须录入，否则空着只读；MM-DD格式)")
|
||||
private String dateToY;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=8)
|
||||
@LogField(name="备注",index=11)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
* lngPriceTransPngDtl
|
||||
*/
|
||||
@LogField(name="租户id",index=9)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
@ApiModelProperty("lngPriceTransPngDtl子表")
|
||||
@LogJoin(name = "lngPriceTransPngDtl子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "ppId", valueDirection = ValueDirectionType.RIGHT),
|
||||
@LogJoinColumn(field = "kId",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPriceTransPngDtlDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPriceTransPngDtlDto> lngPriceTransPngDtlList;
|
||||
}
|
||||
|
||||
@ -37,6 +37,7 @@ public class LngContractProcVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("气源地")
|
||||
private String staCode;
|
||||
private String staName;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -233,11 +233,6 @@ public class LngContractTPVo {
|
||||
*/
|
||||
@ApiModelProperty("lngContractTransPng子表")
|
||||
private List<LngContractTransPngVo> lngContractTransPngList;
|
||||
/**
|
||||
* lngPriceTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngPriceTransPng子表")
|
||||
private List<LngPriceTransPngVo> lngPriceTransPngList;
|
||||
/**
|
||||
* lngContractFact
|
||||
*/
|
||||
|
||||
@ -6,6 +6,8 @@ import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
@ -37,6 +39,7 @@ public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseMod
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
private String pointUpName;
|
||||
|
||||
|
||||
/**
|
||||
@ -44,6 +47,7 @@ public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseMod
|
||||
*/
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
private String pointDelyName;
|
||||
|
||||
|
||||
/**
|
||||
@ -65,4 +69,10 @@ public class LngContractTransPngVo extends com.xjrsoft.common.model.base.BaseMod
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* lngPriceTransPng
|
||||
*/
|
||||
@ApiModelProperty("lngPriceTransPng子表")
|
||||
private List<LngPriceTransPngVo> lngPriceTransPngList;
|
||||
}
|
||||
|
||||
@ -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.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngPriceProcDtlVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 价格-加工服务主键(lng_price_proc.id)
|
||||
*/
|
||||
@ApiModelProperty("价格-加工服务主键(lng_price_proc.id)")
|
||||
private Long ppId;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@ApiModelProperty("阶梯")
|
||||
private Short sort;
|
||||
|
||||
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 比值(吨/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(吨/吉焦)")
|
||||
private BigDecimal rateTonGj;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯气量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(吉焦)")
|
||||
private BigDecimal qtyGj;
|
||||
|
||||
|
||||
/**
|
||||
* 管道气加工费率(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("管道气加工费率(元/吉焦)")
|
||||
private BigDecimal pricePngGj;
|
||||
|
||||
|
||||
/**
|
||||
* LNG加工费率(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("LNG加工费率(元/吉焦)")
|
||||
private BigDecimal priceLngGj;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -7,6 +7,7 @@ import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
@ -38,7 +39,7 @@ public class LngPriceProcVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
private Long comId;
|
||||
|
||||
|
||||
/**
|
||||
@ -88,4 +89,11 @@ public class LngPriceProcVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
|
||||
/**
|
||||
* lngPriceProcDtl
|
||||
*/
|
||||
@ApiModelProperty("lngPriceProcDtl子表")
|
||||
private List<LngPriceProcDtlVo> lngPriceProcDtlList;
|
||||
}
|
||||
|
||||
@ -0,0 +1,98 @@
|
||||
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.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class LngPriceTransPngDtlVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 价格-管输主键(lng_price_trans_png.id)
|
||||
*/
|
||||
@ApiModelProperty("价格-管输主键(lng_price_trans_png.id)")
|
||||
private Long ppId;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@ApiModelProperty("阶梯")
|
||||
private Short sort;
|
||||
|
||||
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯气量(方)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(方)")
|
||||
private BigDecimal qtyM3;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯气量(吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(吉焦)(隐藏)")
|
||||
private BigDecimal qtyGj;
|
||||
|
||||
|
||||
/**
|
||||
* 管输单价(元/方)
|
||||
*/
|
||||
@ApiModelProperty("管输单价(元/方)")
|
||||
private BigDecimal priceTransM3;
|
||||
|
||||
|
||||
/**
|
||||
* 管输单价(元/吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("管输单价(元/吉焦)(隐藏)")
|
||||
private BigDecimal priceTransGj;
|
||||
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)(隐藏)")
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
}
|
||||
@ -7,6 +7,7 @@ import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
@ -34,11 +35,30 @@ public class LngPriceTransPngVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
private Long kId;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-管输-上下载点主键
|
||||
*/
|
||||
@ApiModelProperty("合同-管输-上下载点主键")
|
||||
private Long ktpId;
|
||||
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 交割点
|
||||
*/
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
private Long comId;
|
||||
|
||||
|
||||
/**
|
||||
@ -81,4 +101,10 @@ public class LngPriceTransPngVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* lngPriceTransPngDtl
|
||||
*/
|
||||
@ApiModelProperty("lngPriceTransPngDtl子表")
|
||||
private List<LngPriceTransPngDtlVo> lngPriceTransPngDtlList;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ public class LngPriceProc implements Serializable {
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 服务商编码(惠州接收站/阳江接收站)
|
||||
|
||||
@ -0,0 +1,143 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 加工合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_price_proc_dtl")
|
||||
@ApiModel(value = "加工合同对象", description = "加工合同")
|
||||
public class LngPriceProcDtl implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 价格-加工服务主键(lng_price_proc.id)
|
||||
*/
|
||||
@ApiModelProperty("价格-加工服务主键(lng_price_proc.id)")
|
||||
private Long ppId;
|
||||
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@ApiModelProperty("阶梯")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
|
||||
/**
|
||||
* 比值(吨/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(吨/吉焦)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal rateTonGj;
|
||||
|
||||
/**
|
||||
* 阶梯气量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(吉焦)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyGj;
|
||||
|
||||
/**
|
||||
* 管道气加工费率(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("管道气加工费率(元/吉焦)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal pricePngGj;
|
||||
|
||||
/**
|
||||
* LNG加工费率(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("LNG加工费率(元/吉焦)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal priceLngGj;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -35,11 +35,29 @@ public class LngPriceTransPng implements Serializable {
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 合同-管输-上下载点主键
|
||||
*/
|
||||
@ApiModelProperty("合同-管输-上下载点主键")
|
||||
private Long ktpId;
|
||||
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 交割点
|
||||
*/
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
|
||||
/**
|
||||
* 公司编码(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("公司编码(天然气公司/惠贸)")
|
||||
private String comCode;
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 托运商编码(管道公司/管网)
|
||||
|
||||
@ -0,0 +1,150 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管输合同
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_price_trans_png_dtl")
|
||||
@ApiModel(value = "管输合同对象", description = "管输合同")
|
||||
public class LngPriceTransPngDtl implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-主信息主键(lng_contract.id)
|
||||
*/
|
||||
@ApiModelProperty("合同-主信息主键(lng_contract.id)")
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 价格-管输主键(lng_price_trans_png.id)
|
||||
*/
|
||||
@ApiModelProperty("价格-管输主键(lng_price_trans_png.id)")
|
||||
private Long ppId;
|
||||
|
||||
/**
|
||||
* 阶梯
|
||||
*/
|
||||
@ApiModelProperty("阶梯")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 约定
|
||||
*/
|
||||
@ApiModelProperty("约定")
|
||||
private String sortDesc;
|
||||
|
||||
/**
|
||||
* 阶梯气量(方)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(方)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyM3;
|
||||
|
||||
/**
|
||||
* 阶梯气量(吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("阶梯气量(吉焦)(隐藏)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyGj;
|
||||
|
||||
/**
|
||||
* 管输单价(元/方)
|
||||
*/
|
||||
@ApiModelProperty("管输单价(元/方)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal priceTransM3;
|
||||
|
||||
/**
|
||||
* 管输单价(元/吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("管输单价(元/吉焦)(隐藏)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal priceTransGj;
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)(隐藏)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)(隐藏)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -3,7 +3,12 @@ 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.LngContractProc;
|
||||
import com.xjrsoft.module.contract.vo.LngContractProcVo;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
@ -14,4 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
@Mapper
|
||||
public interface LngContractProcMapper extends MPJBaseMapper<LngContractProc>, BaseMapper<LngContractProc> {
|
||||
|
||||
@Select("SELECT t1.*, t2.full_name AS staName" +
|
||||
" FROM lng_contract_proc t1" +
|
||||
" LEFT JOIN lng_b_station_lng t2 on t2.code = t1.sta_code" +
|
||||
" WHERE t1.k_id = #{contractId}")
|
||||
List<LngContractProcVo> selectByContractId(@Param("contractId") Long contractId);
|
||||
}
|
||||
|
||||
@ -3,7 +3,12 @@ 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.LngContractTransPng;
|
||||
import com.xjrsoft.module.contract.vo.LngContractTransPngVo;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
@ -14,4 +19,10 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
@Mapper
|
||||
public interface LngContractTransPngMapper extends MPJBaseMapper<LngContractTransPng>, BaseMapper<LngContractTransPng> {
|
||||
|
||||
@Select("SELECT t1.*, t2.full_name AS pointUpName, t3.full_name AS pointDelyName" +
|
||||
" FROM lng_contract_trans_png t1" +
|
||||
" LEFT JOIN lng_b_station_lng t2 on t2.code = t1.point_up_code" +
|
||||
" LEFT JOIN lng_b_station_png t3 on t3.code = t1.point_dely_code" +
|
||||
" WHERE t1.k_id = #{contractId}")
|
||||
List<LngContractTransPngVo> selectByContractId(@Param("contractId") Long contractId);
|
||||
}
|
||||
|
||||
@ -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.LngPriceProcDtl;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngPriceProcDtlMapper extends MPJBaseMapper<LngPriceProcDtl>, BaseMapper<LngPriceProcDtl> {
|
||||
|
||||
}
|
||||
@ -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.LngPriceTransPngDtl;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngPriceTransPngDtlMapper extends MPJBaseMapper<LngPriceTransPngDtl>, BaseMapper<LngPriceTransPngDtl> {
|
||||
|
||||
}
|
||||
@ -31,6 +31,7 @@ public class ContractProcServiceImpl extends MPJBaseServiceImpl<LngContractMappe
|
||||
|
||||
private final LngContractProcMapper lngContractProcMapper;
|
||||
private final LngPriceProcMapper lngPriceProcMapper;
|
||||
private final LngPriceProcDtlMapper lngPriceProcDtlMapper;
|
||||
private final LngContractFactMapper lngContractFactMapper;
|
||||
private final LngContractFactRelMapper lngContractFactRelMapper;
|
||||
private final LngContractApproRelMapper lngContractApproRelMapper;
|
||||
@ -43,19 +44,19 @@ public class ContractProcServiceImpl extends MPJBaseServiceImpl<LngContractMappe
|
||||
throw new BusinessException(BusinessCode.of(10500,"找不到此数据"));
|
||||
}
|
||||
LngContractPVo vo = BeanUtil.toBean(lngContract, LngContractPVo.class);
|
||||
List<LngContractProc> lngContractProcList = lngContractProcMapper.selectList(
|
||||
new LambdaQueryWrapper<LngContractProc>()
|
||||
.eq(LngContractProc::getKId, lngContract.getId()));
|
||||
if (CollectionUtils.isNotEmpty(lngContractProcList)) {
|
||||
vo.setLngContractProcList(BeanUtil.copyToList(lngContractProcList,
|
||||
LngContractProcVo.class));
|
||||
}
|
||||
List<LngContractProcVo> lngContractProcVoList = lngContractProcMapper.selectByContractId(lngContract.getId());
|
||||
vo.setLngContractProcList(lngContractProcVoList);
|
||||
List<LngPriceProc> lngPriceProcList = lngPriceProcMapper.selectList(
|
||||
new LambdaQueryWrapper<LngPriceProc>()
|
||||
.eq(LngPriceProc::getKId, lngContract.getId()));
|
||||
if (CollectionUtils.isNotEmpty(lngPriceProcList)) {
|
||||
vo.setLngPriceProcList(BeanUtil.copyToList(lngPriceProcList,
|
||||
LngPriceProcVo.class));
|
||||
List<LngPriceProcVo> lngPriceProcVoList = BeanUtil.copyToList(lngPriceProcList, LngPriceProcVo.class);
|
||||
vo.setLngPriceProcList(lngPriceProcVoList);
|
||||
lngPriceProcVoList.forEach(x -> {
|
||||
List<LngPriceProcDtl> lngPriceProcDtlList = lngPriceProcDtlMapper.selectList(
|
||||
new LambdaQueryWrapper<LngPriceProcDtl>().eq(LngPriceProcDtl::getPpId, x.getId()));
|
||||
x.setLngPriceProcDtlList(BeanUtil.copyToList(lngPriceProcDtlList, LngPriceProcDtlVo.class));
|
||||
});
|
||||
}
|
||||
List<LngContractFactRel> lngContractFactRelList = lngContractFactRelMapper.selectList(
|
||||
new LambdaQueryWrapper<LngContractFactRel>()
|
||||
|
||||
@ -31,6 +31,7 @@ public class ContractTransPngServiceImpl extends MPJBaseServiceImpl<LngContractM
|
||||
|
||||
private final LngContractTransPngMapper lngContractTransPngMapper;
|
||||
private final LngPriceTransPngMapper lngPriceTransPngMapper;
|
||||
private final LngPriceTransPngDtlMapper lngPriceTransPngDtlMapper;
|
||||
private final LngContractFactMapper lngContractFactMapper;
|
||||
private final LngContractFactRelMapper lngContractFactRelMapper;
|
||||
private final LngContractApproRelMapper lngContractApproRelMapper;
|
||||
@ -43,20 +44,31 @@ public class ContractTransPngServiceImpl extends MPJBaseServiceImpl<LngContractM
|
||||
throw new BusinessException(BusinessCode.of(10500,"找不到此数据"));
|
||||
}
|
||||
LngContractTPVo vo = BeanUtil.toBean(lngContract, LngContractTPVo.class);
|
||||
List<LngContractTransPng> lngContractTransPngList = lngContractTransPngMapper.selectList(
|
||||
new LambdaQueryWrapper<LngContractTransPng>()
|
||||
.eq(LngContractTransPng::getKId, lngContract.getId()));
|
||||
if (CollectionUtils.isNotEmpty(lngContractTransPngList)) {
|
||||
vo.setLngContractTransPngList(BeanUtil.copyToList(lngContractTransPngList,
|
||||
LngContractTransPngVo.class));
|
||||
}
|
||||
List<LngContractTransPngVo> lngContractTransPngVoList = lngContractTransPngMapper
|
||||
.selectByContractId(lngContract.getId());
|
||||
vo.setLngContractTransPngList(lngContractTransPngVoList);
|
||||
if (CollectionUtils.isNotEmpty(lngContractTransPngVoList)) {
|
||||
lngContractTransPngVoList.forEach(x -> {
|
||||
List<LngPriceTransPng> lngPriceTransPngList = lngPriceTransPngMapper.selectList(
|
||||
new LambdaQueryWrapper<LngPriceTransPng>()
|
||||
.eq(LngPriceTransPng::getKId, lngContract.getId()));
|
||||
.eq(LngPriceTransPng::getKtpId, x.getId()));
|
||||
if (CollectionUtils.isNotEmpty(lngPriceTransPngList)) {
|
||||
vo.setLngPriceTransPngList(BeanUtil.copyToList(lngPriceTransPngList,
|
||||
LngPriceTransPngVo.class));
|
||||
List<LngPriceTransPngVo> lngPriceTransPngVoList = BeanUtil.copyToList(lngPriceTransPngList,
|
||||
LngPriceTransPngVo.class);
|
||||
x.setLngPriceTransPngList(lngPriceTransPngVoList);
|
||||
lngPriceTransPngVoList.forEach(y -> {
|
||||
List<LngPriceTransPngDtl> lngPriceTransPngDtlList = lngPriceTransPngDtlMapper.selectList(
|
||||
new LambdaQueryWrapper<LngPriceTransPngDtl>().eq(LngPriceTransPngDtl::getPpId,
|
||||
y.getId()));
|
||||
y.setLngPriceTransPngDtlList(BeanUtil.copyToList(lngPriceTransPngDtlList,
|
||||
LngPriceTransPngDtlVo.class));
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
List<LngContractFactRel> lngContractFactRelList = lngContractFactRelMapper.selectList(
|
||||
new LambdaQueryWrapper<LngContractFactRel>()
|
||||
.eq(LngContractFactRel::getKId, lngContract.getId()));
|
||||
|
||||
@ -16,6 +16,7 @@ import com.pictc.enums.ExceptionCommonCode;
|
||||
import com.pictc.enums.ValidEnum;
|
||||
import com.pictc.utils.DataLogTools;
|
||||
import com.xjrsoft.common.advice.tran.CurrencyDataProvider;
|
||||
import com.xjrsoft.common.advice.tran.TranDataManager;
|
||||
import com.xjrsoft.common.enums.YesOrNoEnum;
|
||||
import com.xjrsoft.common.exception.BusinessException;
|
||||
import com.xjrsoft.module.common.db.service.CommonCallService;
|
||||
@ -39,9 +40,9 @@ public class CurrencyServiceImpl extends ServiceImpl<LngBCurrencyMapper, LngBCur
|
||||
|
||||
private final CommonCallService commonCallService;
|
||||
|
||||
|
||||
private final CurrencyDataProvider tranProvider;
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Long add(UpdateLngBCurrencyDto dto) {
|
||||
|
||||
@ -172,6 +172,8 @@ public class CustomerController {
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
UpdateLngCustomerDto obj =content.getObj();
|
||||
tranProvider.removeCacheData(obj.getCuCode());
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
@ -194,6 +196,8 @@ public class CustomerController {
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
UpdateLngCustomerDto obj =content.getObj();
|
||||
tranProvider.saveData(obj.getCuCode(), obj);
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
@ -216,6 +220,8 @@ public class CustomerController {
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
UpdateLngCustomerDto obj =content.getObj();
|
||||
tranProvider.saveData(obj.getCuCode(), obj);
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
|
||||
@ -178,6 +178,8 @@ public class GradeSystemController {
|
||||
|
||||
@Override
|
||||
public UpdateLngGradeSystemDto after(DataOperationContent<UpdateLngGradeSystemDto> content) {
|
||||
UpdateLngGradeSystemDto obj =content.getObj();
|
||||
tranProvider.saveData(obj.getId().toString(), obj);
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
@ -196,6 +198,8 @@ public class GradeSystemController {
|
||||
|
||||
@Override
|
||||
public UpdateLngGradeSystemDto after(DataOperationContent<UpdateLngGradeSystemDto> content) {
|
||||
UpdateLngGradeSystemDto obj =content.getObj();
|
||||
tranProvider.saveData(obj.getId().toString(), obj);
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
|
||||
@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.pictc.enums.ApproveCodeEnum;
|
||||
import com.pictc.enums.BusinessCode;
|
||||
import com.xjrsoft.common.advice.tran.CustomerDataProvider;
|
||||
import com.xjrsoft.common.exception.BusinessException;
|
||||
import com.xjrsoft.module.mdm.client.ILngBankClient;
|
||||
import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
|
||||
@ -50,13 +51,37 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl<LngCustomerMapper, L
|
||||
|
||||
private final LngCustomerMapper lngCustomerMapper;
|
||||
|
||||
private final LngCustomerAttrPowerMapper lngCustomerAttrPowerMapper;
|
||||
private final LngCustomerBankMapper lngCustomerBankMapper;
|
||||
private final LngCustomerDocMapper lngCustomerDocMapper;
|
||||
private final LngCustomerContactMapper lngCustomerContactMapper;
|
||||
|
||||
private final IFileClient fileClient;
|
||||
|
||||
private final ILngBankClient bankClient;
|
||||
|
||||
private final CustomerDataProvider tranProvider;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean delete(List<Long> ids) {
|
||||
List<LngCustomer> customerList = lngCustomerMapper.selectList(Wrappers.lambdaQuery(LngCustomer.class).in(LngCustomer::getId, ids));
|
||||
for(LngCustomer customer: customerList) {
|
||||
tranProvider.removeCacheData(customer.getCuCode());
|
||||
}
|
||||
List<String> cuCodeList = customerList.stream().map(LngCustomer::getCuCode).filter(Objects::nonNull).collect(Collectors.toList());
|
||||
lngCustomerMapper.deleteBatchIds(ids);
|
||||
if(CollectionUtil.isNotEmpty(cuCodeList)) {
|
||||
lngCustomerAttrPowerMapper.delete(Wrappers.lambdaQuery(LngCustomerAttrPower.class).in(LngCustomerAttrPower::getCuCode, cuCodeList));
|
||||
lngCustomerBankMapper.delete(Wrappers.lambdaQuery(LngCustomerBank.class).in(LngCustomerBank::getCuCode, cuCodeList));
|
||||
lngCustomerDocMapper.delete(Wrappers.lambdaQuery(LngCustomerDoc.class).in(LngCustomerDoc::getCuCode, cuCodeList));
|
||||
lngCustomerContactMapper.delete(Wrappers.lambdaQuery(LngCustomerContact.class).in(LngCustomerContact::getCuCode, cuCodeList));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LngCustomerVo getCustomerById(Long id) {
|
||||
|
||||
|
||||
@ -168,6 +168,8 @@ public class SupplierController {
|
||||
|
||||
@Override
|
||||
public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
UpdateLngSupplierDto obj =content.getObj();
|
||||
tranProvider.removeCacheData(obj.getSuCode());
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
@ -190,6 +192,8 @@ public class SupplierController {
|
||||
|
||||
@Override
|
||||
public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
UpdateLngSupplierDto obj =content.getObj();
|
||||
tranProvider.saveData(obj.getSuCode(), obj);
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
@ -212,6 +216,8 @@ public class SupplierController {
|
||||
|
||||
@Override
|
||||
public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
UpdateLngSupplierDto obj =content.getObj();
|
||||
tranProvider.saveData(obj.getSuCode(), obj);
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
|
||||
@ -45,7 +45,7 @@ spring:
|
||||
group: DNE
|
||||
|
||||
discovery:
|
||||
ip: 10.0.0.2
|
||||
ip: 10.0.0.3
|
||||
#network-interface: net7
|
||||
|
||||
xjrsoft:
|
||||
|
||||
Reference in New Issue
Block a user