diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java index 23f1e50f..b36ee3dd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -17,6 +18,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; /** @@ -38,11 +40,9 @@ public class PayPackCompany implements Serializable { @ApiModelProperty(value = "id") private java.lang.String id; /**企业id*/ -// @Excel(name = "企业id", width = 15) @ApiModelProperty(value = "企业id") private java.lang.String companyId; /**企业id*/ -// @Excel(name = "企业id", width = 15) @ApiModelProperty(value = "企业id") private java.lang.String companyTemporaryId; /**企业名称*/ @@ -50,11 +50,9 @@ public class PayPackCompany implements Serializable { @ApiModelProperty(value = "企业名称") private java.lang.String companyTemporaryName; /**企业联系人id*/ -// @Excel(name = "企业联系人id", width = 15) @ApiModelProperty(value = "企业联系人id") private java.lang.String companyContactId; /**企业联系人id*/ -// @Excel(name = "企业联系人id", width = 15) @ApiModelProperty(value = "企业联系人id") private java.lang.String companyContactTemporaryId; /**企业联系人*/ @@ -66,11 +64,9 @@ public class PayPackCompany implements Serializable { @ApiModelProperty(value = "打包年份") private java.lang.String packYear; /**打包联系人id*/ -// @Excel(name = "打包联系人id", width = 15) @ApiModelProperty(value = "打包联系人id") private java.lang.String packContactId; /**打包联系人id*/ -// @Excel(name = "打包联系人id", width = 15) @ApiModelProperty(value = "打包联系人id") private java.lang.String packContactTemporaryId; /**打包联系人*/ @@ -91,34 +87,19 @@ public class PayPackCompany implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal packChargeTotal; /**打包费用备注*/ -// @Excel(name = "打包费用备注", width = 15) @ApiModelProperty(value = "打包费用备注") private java.lang.String packChargeRemark; /**备注*/ -// @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remark; - @Excel(name = "确认收入金额", width = 15) - @TableField(exist = false) - @ApiModelProperty(value = "确认收入金额") - @JsonFormat(shape = JsonFormat.Shape.STRING) - private BigDecimal confirmAmount; - /**实际到账费用*/ @Excel(name = "实际到账费用", width = 15) @ApiModelProperty(value = "实际到账费用") @DecimalMax(value = "9999999999.99",message = "实际到账费用格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receiptExpense; - /**开票金额*/ -// @Excel(name = "开票金额", width = 15) - @ApiModelProperty(value = "开票金额") - @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) @@ -142,14 +123,12 @@ public class PayPackCompany implements Serializable { /** * 手机号 */ -// @Excel(name = "联系人电话", width = 15) @TableField(exist = false) @ApiModelProperty(value = "手机号") private String phone; /** * 邮箱 */ -// @Excel(name = "邮箱", width = 15) @TableField(exist = false) @ApiModelProperty(value = "邮箱") private String email; @@ -158,5 +137,116 @@ public class PayPackCompany implements Serializable { @TableField("pack_principal_id") private java.lang.String packPrincipalId; + @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; + + /**税率*/ + @ApiModelProperty(value = "税率") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") + private BigDecimal taxRate; + + /**税额*/ + @ApiModelProperty(value = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @ApiModelProperty(value = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; + + /**开票金额*/ + @ApiModelProperty(value = "开票金额") + @DecimalMax(value = "9999999999.99",message = "开票金额格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceAmount; + + /**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/ + @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，0：否）") + @Dict(dicCode = "invoice_type") + @NotNull(message = "需要发票不能为空") + private java.lang.Integer needInvoice; + + /**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ + @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") + private java.lang.Integer inAccount; + + /**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ + @ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") + private java.lang.Integer makeInvoice; + + /**邮寄联系人id*/ + @ApiModelProperty(value = "邮寄联系人id") + @Size(max = 32,message = "邮寄联系人id长度不能大于32个字符") + private java.lang.String mailContactsId; + + /**来款方式（1：无，2：合同，3：收费通知）*/ + @Excel(name = "来款方式", width = 15,dicCode = "payment_type") + @Dict(dicCode = "payment_type") + @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") + @NotNull(message = "来款方式不能为空") + private java.lang.Integer chargeWay; + + /**待确收金额（元）*/ + @Excel(name = "待确收金额（元）", width = 15) + @ApiModelProperty(value = "待确收金额（元）") + @DecimalMax(value = "9999999999.99",message = "待确收金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal receivableAmount; + + /**预估到账日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "预估到账日期") + @Excel(name = "预估到账日期",width = 15,format = "yyyy-MM-dd") + private String estimatedArrivalDate; + + /**实收金额（元）*/ + @ApiModelProperty(value = "实收金额（元）") + @DecimalMax(value = "9999999999.99",message = "实收金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidAmount; + + @ApiModelProperty(value = "确认到账金额（元）") + @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index e30550b6..83f991b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -605,9 +605,10 @@ public class PayWorkingGroupSubItemController extends JeroController editAccount(@RequestParam(name = "workGroupId") String workGroupId, - @RequestParam(name = "companyId") String companyId) { + @RequestParam(name = "companyId") String companyId, + @RequestParam(name = "id") String id) { payWorkingGroupSubItemService.editAccount(workGroupId, companyId); - payWorkingGroupSubItemService.delete(companyId); + payWorkingGroupSubItemService.delete(id); return Result.OK("调账成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 231f9d23..8653951a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -1279,7 +1279,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl