Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xiaoshi 2024-12-16 17:48:24 +08:00
commit 2b4ef29849
1 changed files with 7 additions and 5 deletions

View File

@ -55,6 +55,7 @@ public class PrepaybillContractPlugin extends AbstractBillPlugIn implements Plug
for (DynamicObject entryObj : goodsEntities) { for (DynamicObject entryObj : goodsEntities) {
//获取合同签订日期 //获取合同签订日期
Date signdate = entryObj.getDate("signdate"); Date signdate = entryObj.getDate("signdate");
if(signdate != null){
LocalDate localDate = dateToLocalDate(signdate); LocalDate localDate = dateToLocalDate(signdate);
int signdateYear = localDate.getYear(); int signdateYear = localDate.getYear();
int currentYear = LocalDate.now().getYear(); int currentYear = LocalDate.now().getYear();
@ -62,6 +63,7 @@ public class PrepaybillContractPlugin extends AbstractBillPlugIn implements Plug
isMsg = true; isMsg = true;
} }
} }
}
if(isMsg){ if(isMsg){
this.getView().showTipNotification("去年合同不占用本年预算"); this.getView().showTipNotification("去年合同不占用本年预算");
} }