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

修改bug#41057

Browse Source
This commit is contained in:
梁琦涛
2021-10-20 15:26:04 +08:00
parent 1c15c43a5e
commit 0a7770bdf0
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
*/
public enum CompanyMessageEnums {
MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName,busId"),//点击跳转到报名页面，meetingName，busId
MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName"),//点击跳转到报名页面，meetingName
MSG2("QY_2_HYTZ_WORK_GROUP_SIGN_UP","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
MSG3("QY_3_HYTZ_WORK_GROUP_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
MSG4("QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+3 -3
View File
@@ -139,7 +139,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
if(!Objects.isNull(payIncomeContract.getAccountsReceivableAmount()) && !Objects.isNull(payIncomeContract.getAmountReceived())
&& payIncomeContract.getAccountsReceivableAmount().compareTo(payIncomeContract.getAmountReceived()) < 0){
throw new JeroBootException("应收金额大于已收金额！");
throw new JeroBootException("已收金额大于应收金额！");
}
StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
if(!StringUtils.isBlank(msgPayIncomeContract)){
@@ -214,7 +214,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
&& p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
msgPayIncomeContractInstallment.append("第").append(listPayIncomeContractInstallment.indexOf(p) + 1).append("期应收金额大于已收金额！");
msgPayIncomeContractInstallment.append("第").append(listPayIncomeContractInstallment.indexOf(p) + 1).append("期实收金额大于应收金额！");
}
});
if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
@@ -236,7 +236,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
if(!Objects.isNull(payIncomeContract.getAccountsReceivableAmount()) && !Objects.isNull(payIncomeContract.getAmountReceived())
&& payIncomeContract.getAccountsReceivableAmount().compareTo(payIncomeContract.getAmountReceived()) < 0){
throw new JeroBootException("应收金额大于已收金额！");
throw new JeroBootException("已收金额大于应收金额！");
}
StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
if(!StringUtils.isBlank(msgPayIncomeContract)){
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+6 -6
View File
@@ -83,7 +83,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
&& paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
throw new JeroBootException("应收金额大于已收金额！");
throw new JeroBootException("已收金额大于应收金额！");
}
StringBuilder msgPayIncomeContract = ValidUtil.validateAll(paySpendingContract);
if(!StringUtils.isBlank(msgPayIncomeContract)){
@@ -123,7 +123,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
&& p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p) + 1).append("期应收金额大于已收金额！");
msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p) + 1).append("期实收金额大于应收金额！");
}
});
paySpendingContractInstallmentService.saveBatch(listPaySpendingContractInstallment);
@@ -146,7 +146,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
&& paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
throw new JeroBootException("应收金额大于已收金额！");
throw new JeroBootException("已收金额大于应收金额！");
}
StringBuilder msgPayIncomeContract = ValidUtil.validateAll(paySpendingContract);
if(!StringUtils.isBlank(msgPayIncomeContract)){
@@ -201,7 +201,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
if(!Objects.isNull(p.getAccountsReceivableAmount()) && !Objects.isNull(p.getPaidAmount())
&& p.getAccountsReceivableAmount().compareTo(p.getPaidAmount()) < 0){
msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p) + 1).append("期应收金额大于已收金额！");
msgPaySpendingContractInstallment.append("第").append(finalListPaySpendingContractInstallment.indexOf(p) + 1).append("期实收金额大于应收金额！");
}
});
paySpendingContractInstallmentService.saveBatch(listPaySpendingContractInstallment);
@@ -458,7 +458,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
&& paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
sb.append("第").append(n + 1).append("行，应收金额大于已收金额，请修改！<br/>");
sb.append("第").append(n + 1).append("行，已收金额大于应收金额，请修改！<br/>");
}
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
@@ -466,7 +466,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
int c = listPaySpendingContractInstallment.indexOf(item) + 1;
if(!Objects.isNull(item.getAccountsReceivableAmount()) && !Objects.isNull(item.getPaidAmount())
&& item.getAccountsReceivableAmount().compareTo(item.getPaidAmount()) < 0){
sb.append("第").append(n + 1).append("行，").append(c).append("期应收金额大于已收金额，请修改！<br/>");
sb.append("第").append(n + 1).append("行，").append(c).append("期实收金额大于应收金额，请修改！<br/>");
}
StringBuilder msg = ValidUtil.validateExcel(item,n + 1);
if(!StringUtils.isBlank(msg)){