修改bug#40596
This commit is contained in:
+4
-4
@@ -310,16 +310,16 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
|||||||
if(Objects.equals(payCommonProject.getNeedInvoice(),ProjectCommon.NEED_INVOICE0)){
|
if(Objects.equals(payCommonProject.getNeedInvoice(),ProjectCommon.NEED_INVOICE0)){
|
||||||
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
|
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
|
||||||
}else{
|
}else{
|
||||||
// 开票金额 = 应收金额 || 开票金额 = 到账金额 = 1
|
// 开票金额 = 应收金额 = 1
|
||||||
if(invoice.compareTo(receivableAmount) == 0 || invoice.compareTo(payCommonProject.getPaidAmount()) == 0){
|
if(invoice.compareTo(receivableAmount) == 0 ){
|
||||||
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE1);
|
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE1);
|
||||||
}
|
}
|
||||||
// 开票金额 = 0 = 0
|
// 开票金额 = 0 = 0
|
||||||
if(invoice.compareTo(new BigDecimal("0.00")) == 0){
|
if(invoice.compareTo(new BigDecimal("0.00")) == 0){
|
||||||
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.getPaidAmount()) < 0){
|
if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){
|
||||||
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2);
|
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user