diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 7acbb801..4b25a881 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -498,7 +498,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); } // 开票金额 > 0 && 开票金额 < 待确收金额 = 2 - if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){ + if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(receivableAmount) < 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index e4b99893..3ff61d6a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -353,7 +353,7 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "到账") private Integer inAccount; - /**开票*/ + /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/ //@Excel(name = "开票", width = 15) @ApiModelProperty(value = "开票") private Integer makeInvoice; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java index 5e52455b..2a4dfd0a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java @@ -286,7 +286,7 @@ public class MeetingSituationContractVO { @ApiModelProperty(value = "到账") private Integer inAccount; - /**开票*/ + /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/ @ApiModelProperty(value = "开票") private Integer makeInvoice; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 6846005f..b84dd976 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -251,11 +251,8 @@ public class PayMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "到账") private Integer inAccount; - /** - * 开票 - */ + /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/ @ApiModelProperty(value = "开票") - @Dict(dicCode = "yn") private Integer makeInvoice; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index 96d32ceb..496bc406 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -234,6 +234,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl