LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udpate 实体类增加确认收入状态，税额，未税金额

Browse Source
This commit is contained in:
lijiarao
2022-08-01 10:50:45 +08:00
parent f6ce0e10a5
commit 6ce83da943
10 changed files with 288 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/统计视图.sql
+14 -14
View File
@@ -240,7 +240,7 @@ alter table tb_certificate_payment
alter table pay_payment_record
add column tax decimal(12, 2) default 0 comment '税额',
add column no_tax_amount decimal(12, 2) default 0 comment '未税金额';
alter table pay_mail_bill
alter table pay_mail_bill_project
add column tax decimal(12, 2) default 0 comment '税额',
add column no_tax_amount decimal(12, 2) default 0 comment '未税金额';
alter table pay_confirm_payment_record
@@ -250,50 +250,50 @@ alter table pay_confirm_payment_record
alter table pay_common_project
add column affirm_income tinyint(1) null comment '确认收入',
add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column paid_tax decimal(12, 2) default 0 comment '到账金额税额',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额';
alter table pay_working_group_subitem
add column affirm_income tinyint(1) null comment '确认收入',
add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column paid_tax decimal(12, 2) default 0 comment '到账金额税额',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额';
alter table pay_member_project_subitem
add column affirm_income tinyint(1) null comment '确认收入',
add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column paid_tax decimal(12, 2) default 0 comment '到账金额税额',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额';
alter table pay_meeting_situation
add column affirm_income tinyint(1) null comment '确认收入',
add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column paid_tax decimal(12, 2) default 0 comment '到账金额税额',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额';
alter table tb_member_project_subitem
add column affirm_income tinyint(1) null comment '确认收入',
add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column paid_tax decimal(12, 2) default 0 comment '到账金额税额',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额';
alter table tb_certificate_payment
add column affirm_income tinyint(1) null comment '确认收入',
add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额',
add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税',
add column paid_tax decimal(12, 2) default 0 comment '到账金额税额',
add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税',
add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额';
-- 处理历史数据
update pay_payment_record
@@ -301,7 +301,7 @@ set no_tax_amount = amount_received / 1.06,
tax = amount_received - no_tax_amount
where amount_received is not null;
update pay_mail_bill
update pay_mail_bill_project
set no_tax_amount = invoice_amount / 1.06,
tax = invoice_amount - no_tax_amount
where invoice_amount is not null;
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java
+14
View File
@@ -52,6 +52,20 @@ public class PayMailBillProject implements Serializable {
@DecimalMax(value = "9999999999.99",message = "开票金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceAmount;
/**税额*/
@Excel(name = "税额", width = 15)
@ApiModelProperty(value = "税额")
@DecimalMax(value = "9999999999.99",message = "税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal tax;
/**未税金额*/
@Excel(name = "未税金额", width = 15)
@ApiModelProperty(value = "未税金额")
@DecimalMax(value = "9999999999.99",message = "未税金额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal noTaxAmount;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+40
View File
@@ -460,4 +460,44 @@ public class PayMeetingSituation implements Serializable {
@TableField(exist = false)
@Dict(dicCode = "sign_up_status")
private Integer signUpStatus;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+38
View File
@@ -297,4 +297,42 @@ public class PayMemberProjectSubitem implements Serializable {
@TableField(exist = false)
private String email;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
+38
View File
@@ -286,4 +286,42 @@ public class TbCertificatePayment implements Serializable {
@ApiModelProperty(value = "银行账户")
private String bankAccount;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+40
View File
@@ -258,4 +258,44 @@ public class TbMemberProjectSubitem implements Serializable {
/**入会申请表文件id*/
@ApiModelProperty(value = "银行账户")
private String bankAccount;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java
+14 -4
View File
@@ -18,13 +18,10 @@ import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.NotNull;
/**
*
*确认来款记录表
*@author liJiaRao
*@date 2022-06-08 17:22
*/
/**
* 确认来款记录表
*/
@ApiModel(value="确认来款记录表")
@Data
@TableName(value = "pay_confirm_payment_record")
@@ -108,6 +105,19 @@ public class PayConfirmPaymentRecord implements Serializable {
@ApiModelProperty(value="备注")
private String remark;
/**税额*/
@ApiModelProperty(value = "税额")
@DecimalMax(value = "9999999999.99",message = "税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal tax;
/**未税金额*/
@ApiModelProperty(value = "未税金额")
@DecimalMax(value = "9999999999.99",message = "未税金额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal noTaxAmount;
public static final String COL_ID = "id";
public static final String COL_CREATE_BY = "create_by";
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+12
View File
@@ -115,4 +115,16 @@ public class PayPaymentRecord implements Serializable {
@Dict(dicCode = "meeting_pay_type")
@TableField(exist = false)
private Integer paymentMethod;
/**税额*/
@ApiModelProperty(value = "税额")
@DecimalMax(value = "9999999999.99",message = "税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal tax;
/**未税金额*/
@ApiModelProperty(value = "未税金额")
@DecimalMax(value = "9999999999.99",message = "未税金额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal noTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+39
View File
@@ -262,4 +262,43 @@ public class PayCommonProject implements Serializable {
@TableField(exist = false)
private String endAmount;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+39
View File
@@ -399,4 +399,43 @@ public class PayWorkingGroupSubItem implements Serializable {
@Size(max = 50,message = "联系人10备注长度不能大于50个字符")
@TableField(exist = false)
private String remarksTen;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}