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,11 +55,13 @@ 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");
LocalDate localDate = dateToLocalDate(signdate); if(signdate != null){
int signdateYear = localDate.getYear(); LocalDate localDate = dateToLocalDate(signdate);
int currentYear = LocalDate.now().getYear(); int signdateYear = localDate.getYear();
if(signdateYear<currentYear) { int currentYear = LocalDate.now().getYear();
isMsg = true; if(signdateYear<currentYear) {
isMsg = true;
}
} }
} }
if(isMsg){ if(isMsg){