Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
This commit is contained in:
张秉卓
@ -4,6 +4,7 @@ import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.LogAttrField;
|
||||
@ -106,6 +107,7 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="合同签订日期",index=10)
|
||||
@ApiModelProperty("合同签订日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
/**
|
||||
@ -113,6 +115,7 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="有效期开始",index=11)
|
||||
@ApiModelProperty("有效期开始")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
@ -120,6 +123,7 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="有效期结束",index=12)
|
||||
@ApiModelProperty("有效期结束")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
@ -127,6 +131,7 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="确认函开始日",index=13)
|
||||
@ApiModelProperty("确认函开始日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
/**
|
||||
@ -134,6 +139,7 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="确认函结束日",index=14)
|
||||
@ApiModelProperty("确认函结束日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
/**
|
||||
@ -187,35 +193,46 @@ public class UpdateLngContractSalesDto implements Serializable {
|
||||
|
||||
|
||||
/**
|
||||
* lngContractPurPng
|
||||
* lngContractSalesLng
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPng子表")
|
||||
@LogJoin(name = "lngContractPurPng子表",
|
||||
@ApiModelProperty("lngContractSalesLng子表")
|
||||
@LogJoin(name = "lngContractSalesLng子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractPurPngDto> lngContractPurPngList;
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractSalesLngDto> lngContractSalesLngList;
|
||||
/**
|
||||
* lngContractPurPngPoint
|
||||
* LngContractSalesLngSta
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPngPoint子表")
|
||||
@LogJoin(name = "lngContractPurPngPoint子表",
|
||||
@ApiModelProperty("LngContractSalesLngSta子表")
|
||||
@LogJoin(name = "LngContractSalesLngSta子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractPurPngPointDto> lngContractPurPngPointList;
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngStaDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractSalesLngStaDto> lngContractSalesLngStaList;
|
||||
|
||||
/**
|
||||
* lngContractPurPngQty
|
||||
* LngContractSalesLngSta
|
||||
*/
|
||||
@ApiModelProperty("LngContractSalesLngDisc子表")
|
||||
@LogJoin(name = "LngContractSalesLngDisc子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDiscDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractSalesLngDiscDto> lngContractSalesLngDiscList;
|
||||
/**
|
||||
* lngContractSalesLngQty
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPngQty子表")
|
||||
@LogJoin(name = "lngContractPurPngQty子表",
|
||||
@ApiModelProperty("LngContractSalesLngQty子表")
|
||||
@LogJoin(name = "LngContractSalesLngQty子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractPurPngQtyDto> lngContractPurPngQtyList;
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngQtyDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngContractSalesLngQtyDto> lngContractSalesLngQtyList;
|
||||
/**
|
||||
* lngContractApproRel
|
||||
*/
|
||||
|
||||
@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.dto;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
|
||||
@ -50,6 +51,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="开始日期",index=3)
|
||||
@ApiModelProperty("开始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
@ -57,6 +59,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="结束日期",index=4)
|
||||
@ApiModelProperty("结束日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
|
||||
@ -4,6 +4,7 @@ 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;
|
||||
|
||||
@ -44,6 +45,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="开始日期",index=2)
|
||||
@ApiModelProperty("开始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
@ -51,6 +53,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
|
||||
*/
|
||||
@LogField(name="结束日期",index=3)
|
||||
@ApiModelProperty("结束日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
|
||||
@ -88,6 +88,7 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
@ -146,6 +147,20 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
|
||||
*/
|
||||
@ApiModelProperty("联系电话")
|
||||
private String tel;
|
||||
|
||||
/**
|
||||
* 业务部门ID
|
||||
*/
|
||||
@ApiModelProperty("业务部门ID")
|
||||
@Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
|
||||
private Long bDeptId;
|
||||
|
||||
|
||||
/**
|
||||
* 业务部门名称
|
||||
*/
|
||||
@ApiModelProperty("业务部门名称")
|
||||
private String bDeptName;
|
||||
|
||||
/**
|
||||
* lngFileUpload
|
||||
|
||||
@ -2,6 +2,10 @@ package com.xjrsoft.module.contract.vo;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.xjrsoft.common.annotation.Trans;
|
||||
import com.xjrsoft.common.enums.TransType;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@ -32,13 +36,17 @@ public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.Bas
|
||||
* 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)
|
||||
*/
|
||||
@ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)")
|
||||
|
||||
@Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "discTypeName")
|
||||
private String discTypeCode;
|
||||
private String discTypeName;
|
||||
|
||||
|
||||
/**
|
||||
* 开始日期
|
||||
*/
|
||||
@ApiModelProperty("开始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
@ -46,6 +54,7 @@ public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.Bas
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.vo;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.xjrsoft.common.annotation.Trans;
|
||||
import com.xjrsoft.common.enums.TransType;
|
||||
|
||||
@ -36,6 +37,7 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
|
||||
* 开始日期
|
||||
*/
|
||||
@ApiModelProperty("开始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
@ -43,6 +45,7 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.vo;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.pictc.annotations.datalog.LogAttrField;
|
||||
import com.xjrsoft.common.annotation.Trans;
|
||||
import com.xjrsoft.common.enums.TransType;
|
||||
@ -97,6 +98,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
* 合同签订日期
|
||||
*/
|
||||
@ApiModelProperty("合同签订日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
|
||||
@ -104,6 +106,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
@ -111,6 +114,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
@ -118,6 +122,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
* 确认函开始日
|
||||
*/
|
||||
@ApiModelProperty("确认函开始日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
|
||||
@ -125,6 +130,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
* 确认函结束日
|
||||
*/
|
||||
@ApiModelProperty("确认函结束日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,113 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管道气销售结算
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngPngSettleHdrDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 结算月
|
||||
*/
|
||||
@ApiModelProperty("结算月")
|
||||
private LocalDateTime settleMonth;
|
||||
/**
|
||||
* 结算月开始日期
|
||||
*/
|
||||
@ApiModelProperty("结算月开始日期")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结算月结束日期
|
||||
*/
|
||||
@ApiModelProperty("结算月结束日期")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
|
||||
*/
|
||||
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
|
||||
private String settleTypeCode;
|
||||
/**
|
||||
* 供应商/客户(根据结算类型关联供应商/客户)
|
||||
*/
|
||||
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
|
||||
private String cpCode;
|
||||
/**
|
||||
* 交易主体(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("交易主体(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
/**
|
||||
* 结算总数量(吉焦)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleGj;
|
||||
/**
|
||||
* 结算总数量(方)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleM3;
|
||||
/**
|
||||
* 结算总金额
|
||||
*/
|
||||
@ApiModelProperty("结算总金额")
|
||||
private BigDecimal amount;
|
||||
/**
|
||||
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
|
||||
*/
|
||||
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
|
||||
private String rpSign;
|
||||
/**
|
||||
* 对账单(不显示，挂对账单附件用)
|
||||
*/
|
||||
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
|
||||
private String billAccount;
|
||||
/**
|
||||
* 审批状态
|
||||
*/
|
||||
@ApiModelProperty("审批状态")
|
||||
private String approCode;
|
||||
/**
|
||||
* 结算说明
|
||||
*/
|
||||
@ApiModelProperty("结算说明")
|
||||
private String settleDesc;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* lngPngSettleSales
|
||||
*/
|
||||
@ApiModelProperty("lngPngSettleSales子表")
|
||||
private List<AddLngPngSettleSalesDto> lngPngSettleSalesList;
|
||||
/**
|
||||
* lngPngSettleSalesDtl
|
||||
*/
|
||||
@ApiModelProperty("lngPngSettleSalesDtl子表")
|
||||
private List<AddLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
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-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngPngSettleSalesDtlDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 管道气销售日计划-销售结算主键
|
||||
*/
|
||||
@ApiModelProperty("管道气销售日计划-销售结算主键")
|
||||
private Long settleId;
|
||||
/**
|
||||
* 价格类型(基础量/增量)
|
||||
*/
|
||||
@ApiModelProperty("价格类型(基础量/增量)")
|
||||
private String priceCode;
|
||||
/**
|
||||
* 优先级
|
||||
*/
|
||||
@ApiModelProperty("优先级")
|
||||
private Byte sort;
|
||||
/**
|
||||
* 主计量单位(从lng_png_settle_sales带)
|
||||
*/
|
||||
@ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
|
||||
private String uomCode;
|
||||
/**
|
||||
* 阶梯量（吉焦）
|
||||
*/
|
||||
@ApiModelProperty("阶梯量（吉焦）")
|
||||
private BigDecimal rateQtyGj;
|
||||
/**
|
||||
* 阶梯量（方）
|
||||
*/
|
||||
@ApiModelProperty("阶梯量（方）")
|
||||
private BigDecimal rateQtyM3;
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
private BigDecimal rateM3Gj;
|
||||
/**
|
||||
* 结算数量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("结算数量(吉焦)")
|
||||
private BigDecimal qtySettleGj;
|
||||
/**
|
||||
* 结算数量(方)
|
||||
*/
|
||||
@ApiModelProperty("结算数量(方)")
|
||||
private BigDecimal qtySettleM3;
|
||||
/**
|
||||
* 价格(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("价格(元/吉焦)")
|
||||
private BigDecimal priceGj;
|
||||
/**
|
||||
* 价格(元/方)
|
||||
*/
|
||||
@ApiModelProperty("价格(元/方)")
|
||||
private BigDecimal priceM3;
|
||||
/**
|
||||
* 金额(自动计算)
|
||||
*/
|
||||
@ApiModelProperty("金额(自动计算)")
|
||||
private BigDecimal amount;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,148 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
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-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngPngSettleSalesDto extends com.xjrsoft.common.model.base.BaseModel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
|
||||
*/
|
||||
@ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
|
||||
private Long settleHdrId;
|
||||
/**
|
||||
* 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
|
||||
*/
|
||||
@ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
|
||||
private Long salesId;
|
||||
/**
|
||||
* 结算月(从主表带)
|
||||
*/
|
||||
@ApiModelProperty("结算月(从主表带)")
|
||||
private LocalDateTime settleMonth;
|
||||
/**
|
||||
* 结算类型(I-气费收入)
|
||||
*/
|
||||
@ApiModelProperty("结算类型(I-气费收入)")
|
||||
private String settleTypeCode;
|
||||
/**
|
||||
* 计划日期(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("计划日期(从lng_png_sales带)")
|
||||
private LocalDateTime datePlan;
|
||||
/**
|
||||
* 计量日期(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("计量日期(从lng_png_sales带)")
|
||||
private LocalDateTime dateMea;
|
||||
/**
|
||||
* 客户(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("客户(从lng_png_sales带)")
|
||||
private String cuCode;
|
||||
/**
|
||||
* 合同主键(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("合同主键(从lng_png_sales带)")
|
||||
private Long ksId;
|
||||
/**
|
||||
* 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
|
||||
private Long ksppId;
|
||||
/**
|
||||
* 交割点(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("交割点(从lng_png_sales带)")
|
||||
private String pointDelyCode;
|
||||
/**
|
||||
* 主计量单位(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("主计量单位(从lng_png_sales带)")
|
||||
private String uomCode;
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
private BigDecimal rateM3Gj;
|
||||
/**
|
||||
* 完成量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("完成量(吉焦)")
|
||||
private BigDecimal qtyMeaGj;
|
||||
/**
|
||||
* 完成量(方)
|
||||
*/
|
||||
@ApiModelProperty("完成量(方)")
|
||||
private BigDecimal qtyMeaM3;
|
||||
/**
|
||||
* 结算量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("结算量(吉焦)")
|
||||
private BigDecimal qtySettleGj;
|
||||
/**
|
||||
* 结算量(方)
|
||||
*/
|
||||
@ApiModelProperty("结算量(方)")
|
||||
private BigDecimal qtySettleM3;
|
||||
/**
|
||||
* 结算价格(元/吉焦)(金额/总量)
|
||||
*/
|
||||
@ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
|
||||
private BigDecimal priceGj;
|
||||
/**
|
||||
* 结算价格(元/方)(金额/总量)
|
||||
*/
|
||||
@ApiModelProperty("结算价格(元/方)(金额/总量)")
|
||||
private BigDecimal priceM3;
|
||||
/**
|
||||
* 结算金额(自动计算，子表合计)
|
||||
*/
|
||||
@ApiModelProperty("结算金额(自动计算，子表合计)")
|
||||
private BigDecimal amount;
|
||||
/**
|
||||
* 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
|
||||
*/
|
||||
@ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
|
||||
private String priceDesc;
|
||||
/**
|
||||
* 结算次数(第一次结算1，第二次结算2……)
|
||||
*/
|
||||
@ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
|
||||
private Byte settleTimes;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,88 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import com.xjrsoft.common.page.PageInput;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 分页查询入参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class LngPngSettleHdrPageDto extends PageInput {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
/**
|
||||
* 结算月
|
||||
*/
|
||||
@ApiModelProperty("结算月")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime settleMonth;
|
||||
/**
|
||||
* 结算月开始日期
|
||||
*/
|
||||
@ApiModelProperty("结算月开始日期")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结算月结束日期
|
||||
*/
|
||||
@ApiModelProperty("结算月结束日期")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 供应商/客户(根据结算类型关联供应商/客户)
|
||||
*/
|
||||
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
|
||||
private String cpCode;
|
||||
/**
|
||||
* 结算总数量(吉焦)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleGj;
|
||||
/**
|
||||
* 结算总数量(方)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleM3;
|
||||
/**
|
||||
* 结算总金额
|
||||
*/
|
||||
@ApiModelProperty("结算总金额")
|
||||
private BigDecimal amount;
|
||||
/**
|
||||
* 交易主体(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("交易主体(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
/**
|
||||
* 结算说明
|
||||
*/
|
||||
@ApiModelProperty("结算说明")
|
||||
private String settleDesc;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
private Long deptId;
|
||||
/**
|
||||
* 审批状态
|
||||
*/
|
||||
@ApiModelProperty("审批状态")
|
||||
private String approCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,166 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管道气销售结算
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_png_settle_hdr",name="管道气销售结算")
|
||||
public class UpdateLngPngSettleHdrDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 结算月
|
||||
*/
|
||||
@LogField(name="结算月",index=1)
|
||||
@ApiModelProperty("结算月")
|
||||
private LocalDateTime settleMonth;
|
||||
|
||||
/**
|
||||
* 结算月开始日期
|
||||
*/
|
||||
@LogField(name="结算月开始日期",index=2)
|
||||
@ApiModelProperty("结算月开始日期")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 结算月结束日期
|
||||
*/
|
||||
@LogField(name="结算月结束日期",index=3)
|
||||
@ApiModelProperty("结算月结束日期")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
|
||||
*/
|
||||
@LogField(name="结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)",index=4)
|
||||
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
|
||||
private String settleTypeCode;
|
||||
|
||||
/**
|
||||
* 供应商/客户(根据结算类型关联供应商/客户)
|
||||
*/
|
||||
@LogField(name="供应商/客户(根据结算类型关联供应商/客户)",index=5)
|
||||
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
|
||||
private String cpCode;
|
||||
|
||||
/**
|
||||
* 交易主体(天然气公司/惠贸)
|
||||
*/
|
||||
@LogField(name="交易主体(天然气公司/惠贸)",index=6)
|
||||
@ApiModelProperty("交易主体(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 结算总数量(吉焦)(不包含二次结算的数量)
|
||||
*/
|
||||
@LogField(name="结算总数量(吉焦)(不包含二次结算的数量)",index=7)
|
||||
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleGj;
|
||||
|
||||
/**
|
||||
* 结算总数量(方)(不包含二次结算的数量)
|
||||
*/
|
||||
@LogField(name="结算总数量(方)(不包含二次结算的数量)",index=8)
|
||||
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleM3;
|
||||
|
||||
/**
|
||||
* 结算总金额
|
||||
*/
|
||||
@LogField(name="结算总金额",index=9)
|
||||
@ApiModelProperty("结算总金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
|
||||
*/
|
||||
@LogField(name="账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)",index=10)
|
||||
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
|
||||
private String rpSign;
|
||||
|
||||
/**
|
||||
* 对账单(不显示，挂对账单附件用)
|
||||
*/
|
||||
@LogField(name="对账单(不显示，挂对账单附件用)",index=11)
|
||||
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
|
||||
private String billAccount;
|
||||
|
||||
/**
|
||||
* 审批状态
|
||||
*/
|
||||
@LogField(name="审批状态",index=12)
|
||||
@ApiModelProperty("审批状态")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 结算说明
|
||||
*/
|
||||
@LogField(name="结算说明",index=13)
|
||||
@ApiModelProperty("结算说明")
|
||||
private String settleDesc;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=14)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=15)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngPngSettleSales
|
||||
*/
|
||||
@ApiModelProperty("lngPngSettleSales子表")
|
||||
@LogJoin(name = "lngPngSettleSales子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPngSettleSalesDto> lngPngSettleSalesList;
|
||||
/**
|
||||
* lngPngSettleSalesDtl
|
||||
*/
|
||||
@ApiModelProperty("lngPngSettleSalesDtl子表")
|
||||
@LogJoin(name = "lngPngSettleSalesDtl子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
|
||||
}
|
||||
@ -0,0 +1,142 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.util.List;
|
||||
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管道气销售结算
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_png_settle_sales_dtl",name="管道气销售结算")
|
||||
public class UpdateLngPngSettleSalesDtlDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 管道气销售日计划-销售结算主键
|
||||
*/
|
||||
@LogField(name="管道气销售日计划-销售结算主键",index=1)
|
||||
@ApiModelProperty("管道气销售日计划-销售结算主键")
|
||||
private Long settleId;
|
||||
|
||||
/**
|
||||
* 价格类型(基础量/增量)
|
||||
*/
|
||||
@LogField(name="价格类型(基础量/增量)",index=2)
|
||||
@ApiModelProperty("价格类型(基础量/增量)")
|
||||
private String priceCode;
|
||||
|
||||
/**
|
||||
* 优先级
|
||||
*/
|
||||
@LogField(name="优先级",index=3)
|
||||
@ApiModelProperty("优先级")
|
||||
private Byte sort;
|
||||
|
||||
/**
|
||||
* 主计量单位(从lng_png_settle_sales带)
|
||||
*/
|
||||
@LogField(name="主计量单位(从lng_png_settle_sales带)",index=4)
|
||||
@ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
|
||||
private String uomCode;
|
||||
|
||||
/**
|
||||
* 阶梯量（吉焦）
|
||||
*/
|
||||
@LogField(name="阶梯量（吉焦）",index=5)
|
||||
@ApiModelProperty("阶梯量（吉焦）")
|
||||
private BigDecimal rateQtyGj;
|
||||
|
||||
/**
|
||||
* 阶梯量（方）
|
||||
*/
|
||||
@LogField(name="阶梯量（方）",index=6)
|
||||
@ApiModelProperty("阶梯量（方）")
|
||||
private BigDecimal rateQtyM3;
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@LogField(name="比值(方/吉焦)",index=7)
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
/**
|
||||
* 结算数量(吉焦)
|
||||
*/
|
||||
@LogField(name="结算数量(吉焦)",index=8)
|
||||
@ApiModelProperty("结算数量(吉焦)")
|
||||
private BigDecimal qtySettleGj;
|
||||
|
||||
/**
|
||||
* 结算数量(方)
|
||||
*/
|
||||
@LogField(name="结算数量(方)",index=9)
|
||||
@ApiModelProperty("结算数量(方)")
|
||||
private BigDecimal qtySettleM3;
|
||||
|
||||
/**
|
||||
* 价格(元/吉焦)
|
||||
*/
|
||||
@LogField(name="价格(元/吉焦)",index=10)
|
||||
@ApiModelProperty("价格(元/吉焦)")
|
||||
private BigDecimal priceGj;
|
||||
|
||||
/**
|
||||
* 价格(元/方)
|
||||
*/
|
||||
@LogField(name="价格(元/方)",index=11)
|
||||
@ApiModelProperty("价格(元/方)")
|
||||
private BigDecimal priceM3;
|
||||
|
||||
/**
|
||||
* 金额(自动计算)
|
||||
*/
|
||||
@LogField(name="金额(自动计算)",index=12)
|
||||
@ApiModelProperty("金额(自动计算)")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=13)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=14)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,205 @@
|
||||
package com.xjrsoft.module.dayPlan.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.util.List;
|
||||
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 管道气销售结算
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_png_settle_sales",name="管道气销售结算")
|
||||
public class UpdateLngPngSettleSalesDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
|
||||
*/
|
||||
@LogField(name="结算-管道气-销售-主表主键(lng_png_settle_hdr.id)",index=1)
|
||||
@ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
|
||||
private Long settleHdrId;
|
||||
|
||||
/**
|
||||
* 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
|
||||
*/
|
||||
@LogField(name="日计划-管道气-销售主键(lng_png_sales_pur.sales_id)",index=2)
|
||||
@ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
|
||||
private Long salesId;
|
||||
|
||||
/**
|
||||
* 结算月(从主表带)
|
||||
*/
|
||||
@LogField(name="结算月(从主表带)",index=3)
|
||||
@ApiModelProperty("结算月(从主表带)")
|
||||
private LocalDateTime settleMonth;
|
||||
|
||||
/**
|
||||
* 结算类型(I-气费收入)
|
||||
*/
|
||||
@LogField(name="结算类型(I-气费收入)",index=4)
|
||||
@ApiModelProperty("结算类型(I-气费收入)")
|
||||
private String settleTypeCode;
|
||||
|
||||
/**
|
||||
* 计划日期(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="计划日期(从lng_png_sales带)",index=5)
|
||||
@ApiModelProperty("计划日期(从lng_png_sales带)")
|
||||
private LocalDateTime datePlan;
|
||||
|
||||
/**
|
||||
* 计量日期(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="计量日期(从lng_png_sales带)",index=6)
|
||||
@ApiModelProperty("计量日期(从lng_png_sales带)")
|
||||
private LocalDateTime dateMea;
|
||||
|
||||
/**
|
||||
* 客户(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="客户(从lng_png_sales带)",index=7)
|
||||
@ApiModelProperty("客户(从lng_png_sales带)")
|
||||
private String cuCode;
|
||||
|
||||
/**
|
||||
* 合同主键(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="合同主键(从lng_png_sales带)",index=8)
|
||||
@ApiModelProperty("合同主键(从lng_png_sales带)")
|
||||
private Long ksId;
|
||||
|
||||
/**
|
||||
* 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="合同-国内销售-管道气-交割点主键(从lng_png_sales带)",index=9)
|
||||
@ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
|
||||
private Long ksppId;
|
||||
|
||||
/**
|
||||
* 交割点(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="交割点(从lng_png_sales带)",index=10)
|
||||
@ApiModelProperty("交割点(从lng_png_sales带)")
|
||||
private String pointDelyCode;
|
||||
|
||||
/**
|
||||
* 主计量单位(从lng_png_sales带)
|
||||
*/
|
||||
@LogField(name="主计量单位(从lng_png_sales带)",index=11)
|
||||
@ApiModelProperty("主计量单位(从lng_png_sales带)")
|
||||
private String uomCode;
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@LogField(name="比值(方/吉焦)",index=12)
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
/**
|
||||
* 完成量(吉焦)
|
||||
*/
|
||||
@LogField(name="完成量(吉焦)",index=13)
|
||||
@ApiModelProperty("完成量(吉焦)")
|
||||
private BigDecimal qtyMeaGj;
|
||||
|
||||
/**
|
||||
* 完成量(方)
|
||||
*/
|
||||
@LogField(name="完成量(方)",index=14)
|
||||
@ApiModelProperty("完成量(方)")
|
||||
private BigDecimal qtyMeaM3;
|
||||
|
||||
/**
|
||||
* 结算量(吉焦)
|
||||
*/
|
||||
@LogField(name="结算量(吉焦)",index=15)
|
||||
@ApiModelProperty("结算量(吉焦)")
|
||||
private BigDecimal qtySettleGj;
|
||||
|
||||
/**
|
||||
* 结算量(方)
|
||||
*/
|
||||
@LogField(name="结算量(方)",index=16)
|
||||
@ApiModelProperty("结算量(方)")
|
||||
private BigDecimal qtySettleM3;
|
||||
|
||||
/**
|
||||
* 结算价格(元/吉焦)(金额/总量)
|
||||
*/
|
||||
@LogField(name="结算价格(元/吉焦)(金额/总量)",index=17)
|
||||
@ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
|
||||
private BigDecimal priceGj;
|
||||
|
||||
/**
|
||||
* 结算价格(元/方)(金额/总量)
|
||||
*/
|
||||
@LogField(name="结算价格(元/方)(金额/总量)",index=18)
|
||||
@ApiModelProperty("结算价格(元/方)(金额/总量)")
|
||||
private BigDecimal priceM3;
|
||||
|
||||
/**
|
||||
* 结算金额(自动计算，子表合计)
|
||||
*/
|
||||
@LogField(name="结算金额(自动计算，子表合计)",index=19)
|
||||
@ApiModelProperty("结算金额(自动计算，子表合计)")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
|
||||
*/
|
||||
@LogField(name="价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)",index=20)
|
||||
@ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
|
||||
private String priceDesc;
|
||||
|
||||
/**
|
||||
* 结算次数(第一次结算1，第二次结算2……)
|
||||
*/
|
||||
@LogField(name="结算次数(第一次结算1，第二次结算2……)",index=21)
|
||||
@ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
|
||||
private Byte settleTimes;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=22)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=23)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package com.xjrsoft.module.dayPlan.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @title: 分页列表出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngPngSettleHdrPageVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private String id;
|
||||
/**
|
||||
* 结算月
|
||||
*/
|
||||
@ApiModelProperty("结算月")
|
||||
private LocalDateTime settleMonth;
|
||||
/**
|
||||
* 结算月开始日期
|
||||
*/
|
||||
@ApiModelProperty("结算月开始日期")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结算月结束日期
|
||||
*/
|
||||
@ApiModelProperty("结算月结束日期")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 供应商/客户(根据结算类型关联供应商/客户)
|
||||
*/
|
||||
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
|
||||
private String cpCode;
|
||||
/**
|
||||
* 交易主体(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("交易主体(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
/**
|
||||
* 结算总数量(吉焦)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleGj;
|
||||
/**
|
||||
* 结算总数量(方)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleM3;
|
||||
/**
|
||||
* 结算总金额
|
||||
*/
|
||||
@ApiModelProperty("结算总金额")
|
||||
private BigDecimal amount;
|
||||
/**
|
||||
* 审批状态
|
||||
*/
|
||||
@ApiModelProperty("审批状态")
|
||||
private String approCode;
|
||||
/**
|
||||
* 结算说明
|
||||
*/
|
||||
@ApiModelProperty("结算说明")
|
||||
private String settleDesc;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,186 @@
|
||||
package com.xjrsoft.module.dayPlan.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 结算月
|
||||
*/
|
||||
@ApiModelProperty("结算月")
|
||||
private LocalDateTime settleMonth;
|
||||
|
||||
|
||||
/**
|
||||
* 结算月开始日期
|
||||
*/
|
||||
@ApiModelProperty("结算月开始日期")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 结算月结束日期
|
||||
*/
|
||||
@ApiModelProperty("结算月结束日期")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
/**
|
||||
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
|
||||
*/
|
||||
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
|
||||
private String settleTypeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商/客户(根据结算类型关联供应商/客户)
|
||||
*/
|
||||
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
|
||||
private String cpCode;
|
||||
|
||||
|
||||
/**
|
||||
* 交易主体(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("交易主体(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
|
||||
|
||||
/**
|
||||
* 结算总数量(吉焦)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleGj;
|
||||
|
||||
|
||||
/**
|
||||
* 结算总数量(方)(不包含二次结算的数量)
|
||||
*/
|
||||
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
|
||||
private BigDecimal qtySettleM3;
|
||||
|
||||
|
||||
/**
|
||||
* 结算总金额
|
||||
*/
|
||||
@ApiModelProperty("结算总金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
|
||||
/**
|
||||
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
|
||||
*/
|
||||
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
|
||||
private String rpSign;
|
||||
|
||||
|
||||
/**
|
||||
* 对账单(不显示，挂对账单附件用)
|
||||
*/
|
||||
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
|
||||
private String billAccount;
|
||||
|
||||
|
||||
/**
|
||||
* 审批状态
|
||||
*/
|
||||
@ApiModelProperty("审批状态")
|
||||
private String approCode;
|
||||
|
||||
|
||||
/**
|
||||
* 结算说明
|
||||
*/
|
||||
@ApiModelProperty("结算说明")
|
||||
private String settleDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* lngPngSettleSales
|
||||
*/
|
||||
@ApiModelProperty("lngPngSettleSales子表")
|
||||
private List<LngPngSettleSalesVo> lngPngSettleSalesList;
|
||||
/**
|
||||
* lngPngSettleSalesDtl
|
||||
*/
|
||||
@ApiModelProperty("lngPngSettleSalesDtl子表")
|
||||
private List<LngPngSettleSalesDtlVo> lngPngSettleSalesDtlList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,168 @@
|
||||
package com.xjrsoft.module.dayPlan.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngPngSettleSalesDtlVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 管道气销售日计划-销售结算主键
|
||||
*/
|
||||
@ApiModelProperty("管道气销售日计划-销售结算主键")
|
||||
private Long settleId;
|
||||
|
||||
|
||||
/**
|
||||
* 价格类型(基础量/增量)
|
||||
*/
|
||||
@ApiModelProperty("价格类型(基础量/增量)")
|
||||
private String priceCode;
|
||||
|
||||
|
||||
/**
|
||||
* 优先级
|
||||
*/
|
||||
@ApiModelProperty("优先级")
|
||||
private Byte sort;
|
||||
|
||||
|
||||
/**
|
||||
* 主计量单位(从lng_png_settle_sales带)
|
||||
*/
|
||||
@ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
|
||||
private String uomCode;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯量（吉焦）
|
||||
*/
|
||||
@ApiModelProperty("阶梯量（吉焦）")
|
||||
private BigDecimal rateQtyGj;
|
||||
|
||||
|
||||
/**
|
||||
* 阶梯量（方）
|
||||
*/
|
||||
@ApiModelProperty("阶梯量（方）")
|
||||
private BigDecimal rateQtyM3;
|
||||
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
|
||||
/**
|
||||
* 结算数量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("结算数量(吉焦)")
|
||||
private BigDecimal qtySettleGj;
|
||||
|
||||
|
||||
/**
|
||||
* 结算数量(方)
|
||||
*/
|
||||
@ApiModelProperty("结算数量(方)")
|
||||
private BigDecimal qtySettleM3;
|
||||
|
||||
|
||||
/**
|
||||
* 价格(元/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("价格(元/吉焦)")
|
||||
private BigDecimal priceGj;
|
||||
|
||||
|
||||
/**
|
||||
* 价格(元/方)
|
||||
*/
|
||||
@ApiModelProperty("价格(元/方)")
|
||||
private BigDecimal priceM3;
|
||||
|
||||
|
||||
/**
|
||||
* 金额(自动计算)
|
||||
*/
|
||||
@ApiModelProperty("金额(自动计算)")
|
||||
private BigDecimal amount;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,231 @@
|
||||
package com.xjrsoft.module.dayPlan.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2026-02-03
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
|
||||
*/
|
||||
@ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
|
||||
private Long settleHdrId;
|
||||
|
||||
|
||||
/**
|
||||
* 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
|
||||
*/
|
||||
@ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
|
||||
private Long salesId;
|
||||
|
||||
|
||||
/**
|
||||
* 结算月(从主表带)
|
||||
*/
|
||||
@ApiModelProperty("结算月(从主表带)")
|
||||
private LocalDateTime settleMonth;
|
||||
|
||||
|
||||
/**
|
||||
* 结算类型(I-气费收入)
|
||||
*/
|
||||
@ApiModelProperty("结算类型(I-气费收入)")
|
||||
private String settleTypeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 计划日期(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("计划日期(从lng_png_sales带)")
|
||||
private LocalDateTime datePlan;
|
||||
|
||||
|
||||
/**
|
||||
* 计量日期(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("计量日期(从lng_png_sales带)")
|
||||
private LocalDateTime dateMea;
|
||||
|
||||
|
||||
/**
|
||||
* 客户(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("客户(从lng_png_sales带)")
|
||||
private String cuCode;
|
||||
|
||||
|
||||
/**
|
||||
* 合同主键(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("合同主键(从lng_png_sales带)")
|
||||
private Long ksId;
|
||||
|
||||
|
||||
/**
|
||||
* 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
|
||||
private Long ksppId;
|
||||
|
||||
|
||||
/**
|
||||
* 交割点(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("交割点(从lng_png_sales带)")
|
||||
private String pointDelyCode;
|
||||
|
||||
|
||||
/**
|
||||
* 主计量单位(从lng_png_sales带)
|
||||
*/
|
||||
@ApiModelProperty("主计量单位(从lng_png_sales带)")
|
||||
private String uomCode;
|
||||
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
|
||||
/**
|
||||
* 完成量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("完成量(吉焦)")
|
||||
private BigDecimal qtyMeaGj;
|
||||
|
||||
|
||||
/**
|
||||
* 完成量(方)
|
||||
*/
|
||||
@ApiModelProperty("完成量(方)")
|
||||
private BigDecimal qtyMeaM3;
|
||||
|
||||
|
||||
/**
|
||||
* 结算量(吉焦)
|
||||
*/
|
||||
@ApiModelProperty("结算量(吉焦)")
|
||||
private BigDecimal qtySettleGj;
|
||||
|
||||
|
||||
/**
|
||||
* 结算量(方)
|
||||
*/
|
||||
@ApiModelProperty("结算量(方)")
|
||||
private BigDecimal qtySettleM3;
|
||||
|
||||
|
||||
/**
|
||||
* 结算价格(元/吉焦)(金额/总量)
|
||||
*/
|
||||
@ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
|
||||
private BigDecimal priceGj;
|
||||
|
||||
|
||||
/**
|
||||
* 结算价格(元/方)(金额/总量)
|
||||
*/
|
||||
@ApiModelProperty("结算价格(元/方)(金额/总量)")
|
||||
private BigDecimal priceM3;
|
||||
|
||||
|
||||
/**
|
||||
* 结算金额(自动计算，子表合计)
|
||||
*/
|
||||
@ApiModelProperty("结算金额(自动计算，子表合计)")
|
||||
private BigDecimal amount;
|
||||
|
||||
|
||||
/**
|
||||
* 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
|
||||
*/
|
||||
@ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
|
||||
private String priceDesc;
|
||||
|
||||
|
||||
/**
|
||||
* 结算次数(第一次结算1，第二次结算2……)
|
||||
*/
|
||||
@ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
|
||||
private Byte settleTimes;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user