fix 88147 资料网元-编辑金额后,以下状态没有更新

This commit is contained in:
lijiarao
2024-08-07 11:04:16 +08:00
parent 4b28bb65c0
commit f13d9bc03a
5 changed files with 7 additions and 7 deletions
@@ -498,7 +498,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
} }
// 开票金额 > 0 && 开票金额 < 待确收金额 = 2 // 开票金额 > 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); projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2);
} }
} }
@@ -353,7 +353,7 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "到账") @ApiModelProperty(value = "到账")
private Integer inAccount; private Integer inAccount;
/**开票*/ /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/
//@Excel(name = "开票", width = 15) //@Excel(name = "开票", width = 15)
@ApiModelProperty(value = "开票") @ApiModelProperty(value = "开票")
private Integer makeInvoice; private Integer makeInvoice;
@@ -286,7 +286,7 @@ public class MeetingSituationContractVO {
@ApiModelProperty(value = "到账") @ApiModelProperty(value = "到账")
private Integer inAccount; private Integer inAccount;
/**开票*/ /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/
@ApiModelProperty(value = "开票") @ApiModelProperty(value = "开票")
private Integer makeInvoice; private Integer makeInvoice;
@@ -251,11 +251,8 @@ public class PayMemberProjectSubitem implements Serializable {
@ApiModelProperty(value = "到账") @ApiModelProperty(value = "到账")
private Integer inAccount; private Integer inAccount;
/** /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/
* 开票
*/
@ApiModelProperty(value = "开票") @ApiModelProperty(value = "开票")
@Dict(dicCode = "yn")
private Integer makeInvoice; private Integer makeInvoice;
/** /**
@@ -234,6 +234,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
if(!Objects.isNull(projectStatusVO.getMail())){ if(!Objects.isNull(projectStatusVO.getMail())){
payMemberProjectSubitem.setMail(projectStatusVO.getMail()); payMemberProjectSubitem.setMail(projectStatusVO.getMail());
} }
if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
payMemberProjectSubitem.setAffirmIncome(projectStatusVO.getAffirmIncome());
}
} }
// 选择无 // 选择无
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY1)){ if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY1)){